New build target api:media_interface

Bug: webrtc:8733
Change-Id: I84bbefb1a5ef8e592db29b79499d60ac80c23464
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/153180
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29234}

api/BUILD.gn

@@ -99,9 +99,22 @@ rtc_source_set("rtp_packet_info") {
 
 rtc_source_set("media_stream_interface") {
   visibility = [ "*" ]
-  # TODO(bugs.webrtc.org/8733): The files "media_stream_interface.cc",
-  # "media_stream_interface.h", and "notifier.h" should be moved into
-  # this target.
+  sources = [
+    "media_stream_interface.cc",
+    "media_stream_interface.h",
+    "notifier.h",
+  ]
+  deps = [
+    ":audio_options_api",
+    ":rtp_parameters",
+    ":scoped_refptr",
+    "../modules/audio_processing:audio_processing_statistics",
+    "../rtc_base:checks",
+    "../rtc_base:refcount",
+    "../rtc_base/system:rtc_export",
+    "video:video_frame",
+    "//third_party/abseil-cpp/absl/types:optional",
+  ]
 }
 
 rtc_static_library("libjingle_peerconnection_api") {
@@ -125,13 +138,10 @@ rtc_static_library("libjingle_peerconnection_api") {
     "jsep_ice_candidate.cc",
     "jsep_ice_candidate.h",
     "jsep_session_description.h",
-    "media_stream_interface.cc",
-    "media_stream_interface.h",
     "media_stream_proxy.h",
     "media_stream_track_proxy.h",
     "media_transport_config.h",
     "media_transport_interface.h",
-    "notifier.h",
     "peer_connection_factory_proxy.h",
     "peer_connection_interface.cc",
     "peer_connection_interface.h",
@@ -159,6 +169,7 @@ rtc_static_library("libjingle_peerconnection_api") {
     ":callfactory_api",
     ":fec_controller_api",
     ":libjingle_logging_api",
+    ":media_stream_interface",
     ":network_state_predictor_api",
     ":packet_socket_factory",
     ":rtc_error",

api/media_stream_interface.h

@@ -11,8 +11,7 @@
 // This file contains interfaces for MediaStream, MediaTrack and MediaSource.
 // These interfaces are used for implementing MediaStream and MediaTrack as
 // defined in http://dev.w3.org/2011/webrtc/editor/webrtc.html#stream-api. These
-// interfaces must be used only with PeerConnection. PeerConnectionManager
-// interface provides the factory methods to create MediaStream and MediaTracks.
+// interfaces must be used only with PeerConnection.
 
 #ifndef API_MEDIA_STREAM_INTERFACE_H_
 #define API_MEDIA_STREAM_INTERFACE_H_

examples/BUILD.gn

@@ -651,6 +651,7 @@ if (is_linux || is_win) {
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
+      "../api:media_stream_interface",
       "../api:scoped_refptr",
       "../api/audio:audio_mixer_api",
       "../api/audio_codecs:audio_codecs_api",
@@ -808,6 +809,7 @@ if (is_win || is_android) {
     deps = [
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
+      "../api:media_stream_interface",
       "../api/audio_codecs:builtin_audio_decoder_factory",
       "../api/audio_codecs:builtin_audio_encoder_factory",
       "../api/video:video_frame",

media/BUILD.gn

@@ -74,7 +74,7 @@ rtc_static_library("rtc_media_base") {
     "..:webrtc_common",
     "../api:array_view",
     "../api:audio_options_api",
-    "../api:libjingle_peerconnection_api",
+    "../api:media_stream_interface",
     "../api:rtc_error",
     "../api:rtp_parameters",
     "../api:scoped_refptr",

pc/BUILD.gn

@@ -222,6 +222,7 @@ rtc_static_library("peerconnection") {
     "../api:call_api",
     "../api:fec_controller_api",
     "../api:libjingle_peerconnection_api",
+    "../api:media_stream_interface",
     "../api:network_state_predictor_api",
     "../api:rtc_error",
     "../api:rtc_event_log_output_file",
@@ -364,6 +365,7 @@ if (rtc_include_tests) {
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
+      "../api:media_stream_interface",
       "../api:rtc_stats_api",
       "../api:scoped_refptr",
       "../api/audio:audio_mixer_api",
@@ -400,6 +402,7 @@ if (rtc_include_tests) {
       ":pc_test_utils",
       "../api:function_view",
       "../api:libjingle_peerconnection_api",
+      "../api:media_stream_interface",
       "../api:rtc_error",
       "../api:rtc_stats_api",
       "../api:rtp_parameters",
@@ -446,6 +449,7 @@ if (rtc_include_tests) {
       "../api:audio_options_api",
       "../api:create_peerconnection_factory",
       "../api:libjingle_peerconnection_api",
+      "../api:media_stream_interface",
       "../api:rtc_error",
       "../api:rtc_stats_api",
       "../api:scoped_refptr",
@@ -544,6 +548,7 @@ if (rtc_include_tests) {
       "../api:libjingle_logging_api",
       "../api:libjingle_peerconnection_api",
       "../api:loopback_media_transport",
+      "../api:media_stream_interface",
       "../api:mock_rtp",
       "../api:rtc_error",
       "../api:scoped_refptr",

sdk/BUILD.gn

@@ -330,6 +330,7 @@ if (is_ios || is_mac) {
         ":native_video",
         ":videoframebuffer_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
         "../api/video:video_frame",
         "../api/video:video_frame_i420",
         "../api/video:video_rtp_headers",
@@ -732,6 +733,7 @@ if (is_ios || is_mac) {
         ":native_api",
         ":videoframebuffer_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
       ]
     }
 
@@ -750,7 +752,7 @@ if (is_ios || is_mac) {
 
       deps = [
         ":base_objc",
-        "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
         "../rtc_base:checks",
       ]
     }
@@ -920,6 +922,7 @@ if (is_ios || is_mac) {
         ":videosource_objc",
         ":videotoolbox_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
         "../api:rtc_event_log_output_file",
         "../api:rtc_stats_api",
         "../api:rtp_parameters",
@@ -1566,6 +1569,7 @@ if (is_ios || is_mac) {
         ":native_video",
         ":videoframebuffer_objc",
         "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
         "../api:scoped_refptr",
         "../api/video:video_frame",
         "../api/video:video_rtp_headers",

sdk/android/BUILD.gn

@@ -673,6 +673,7 @@ if (current_os == "linux" || is_android) {
       ":native_api_jni",
       ":videoframe_jni",
       "../../api:libjingle_peerconnection_api",
+      "../../api:media_stream_interface",
       "../../api/task_queue",
       "../../api/video:encoded_image",
       "../../api/video:video_frame",
@@ -758,6 +759,7 @@ if (current_os == "linux" || is_android) {
       "..:media_constraints",
       "../../api:callfactory_api",
       "../../api:libjingle_peerconnection_api",
+      "../../api:media_stream_interface",
       "../../api:rtc_event_log_output_file",
       "../../api:rtp_parameters",
       "../../api/crypto:options",
@@ -990,6 +992,7 @@ if (current_os == "linux" || is_android) {
       ":video_jni",
       ":videoframe_jni",
       "//api:libjingle_peerconnection_api",
+      "//api:media_stream_interface",
       "//api/video:video_frame",
       "//api/video:video_rtp_headers",
       "//rtc_base",

test/BUILD.gn

@@ -83,6 +83,7 @@ if (!build_with_chromium) {
       deps = [
         ":video_test_common",
         "../api:libjingle_peerconnection_api",
+        "../api:media_stream_interface",
         "../api:scoped_refptr",
         "../modules/video_capture:video_capture_module",
         "../rtc_base",

test/pc/e2e/BUILD.gn

@@ -277,6 +277,7 @@ if (rtc_include_tests) {
       "../..:field_trial",
       "../../../api:audio_quality_analyzer_api",
       "../../../api:libjingle_peerconnection_api",
+      "../../../api:media_stream_interface",
       "../../../api:peer_connection_quality_test_fixture_api",
       "../../../api:rtc_event_log_output_file",
       "../../../api:scoped_refptr",