Audio: proto refactor

modules/audio/proto/BUILD

@@ -6,53 +6,47 @@ load("//tools:python_rules.bzl", "py_proto_library")
 package(default_visibility = ["//visibility:public"])
 
 cc_proto_library(
-    name = "audio_cc_proto",
+    name = "audio_conf_cc_proto",
     deps = [
-        ":audio_proto",
+        ":audio_conf_proto",
     ],
 )
 
 proto_library(
-    name = "audio_proto",
-    srcs = ["audio.proto"],
-    deps = [
-        ":audio_common_proto",
-        "//modules/common/proto:geometry_proto",
-        "//modules/common/proto:header_proto",
-    ],
+    name = "audio_conf_proto",
+    srcs = ["audio_conf.proto"],
 )
 
 py_proto_library(
-    name = "audio_py_pb2",
+    name = "audio_conf_py_pb2",
     deps = [
-        ":audio_common_py_pb2",
-        ":audio_proto",
-        "//modules/common/proto:geometry_py_pb2",
-        "//modules/common/proto:header_py_pb2",
+        ":audio_conf_proto",
     ],
 )
 
 cc_proto_library(
-    name = "audio_event_cc_proto",
+    name = "audio_cc_proto",
     deps = [
-        ":audio_event_proto",
+        ":audio_proto",
     ],
 )
 
 proto_library(
-    name = "audio_event_proto",
-    srcs = ["audio_event.proto"],
+    name = "audio_proto",
+    srcs = ["audio.proto"],
     deps = [
         ":audio_common_proto",
+        "//modules/common/proto:geometry_proto",
         "//modules/common/proto:header_proto",
     ],
 )
 
 py_proto_library(
-    name = "audio_event_py_pb2",
+    name = "audio_py_pb2",
     deps = [
         ":audio_common_py_pb2",
-        ":audio_event_proto",
+        ":audio_proto",
+        "//modules/common/proto:geometry_py_pb2",
         "//modules/common/proto:header_py_pb2",
     ],
 )
@@ -77,20 +71,28 @@ py_proto_library(
 )
 
 cc_proto_library(
-    name = "audio_conf_cc_proto",
+    name = "audio_event_cc_proto",
     deps = [
-        ":audio_conf_proto",
+        ":audio_event_proto",
     ],
 )
 
 proto_library(
-    name = "audio_conf_proto",
-    srcs = ["audio_conf.proto"],
+    name = "audio_event_proto",
+    srcs = ["audio_event.proto"],
+    deps = [
+        ":audio_common_proto",
+        "//modules/common/proto:header_proto",
+        "//modules/localization/proto:pose_proto",
+    ],
 )
 
 py_proto_library(
-    name = "audio_conf_py_pb2",
+    name = "audio_event_py_pb2",
     deps = [
-        ":audio_conf_proto",
+        ":audio_common_py_pb2",
+        ":audio_event_proto",
+        "//modules/common/proto:header_py_pb2",
+        "//modules/localization/proto:pose_py_pb2",
     ],
 )

modules/audio/proto/audio.proto

 /******************************************************************************
- * Copyright 2017 The Apollo Authors. All Rights Reserved.
+ * Copyright 2020 The Apollo Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/audio/proto/audio_common.proto

 /******************************************************************************
- * Copyright 2017 The Apollo Authors. All Rights Reserved.
+ * Copyright 2020 The Apollo Authors. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

modules/audio/proto/audio_event.proto

+/******************************************************************************
+ * Copyright 2020 The Apollo Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *****************************************************************************/
+
 syntax = "proto2";
 
-package apollo.common;
+package apollo.audio;
 
 import "modules/audio/proto/audio_common.proto";
 import "modules/common/proto/header.proto";
+import "modules/localization/proto/pose.proto";
 
 message AudioEvent {
   optional apollo.common.Header header = 1;
@@ -12,4 +29,5 @@ message AudioEvent {
   optional apollo.audio.AudioType audio_type = 4 [default = UNKNOWN_TYPE];
   optional bool siren_is_on = 5;
   optional apollo.audio.AudioDirection audio_direction = 6 [default = UNKNOWN_DIRECTION];
+  optional apollo.localization.Pose pose = 7;
 }