New file api/video/BUILD.gn
Build targets involving files under api/video/ are moved into this
file, from api/BUILD.gn. In addition, drop "_api" part of target
names, and move the header file api/videosinkinterface.h to
api/video/video_sink_interface.h.
Bug: webrtc:9253
Change-Id: I2896d3f063db8dff902bc29738578395b2fcc155
Reviewed-on: https://webrtc-review.googlesource.com/75500
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23207}diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn
index 7e3dcfb..eea2090 100644
--- a/sdk/BUILD.gn
+++ b/sdk/BUILD.gn
@@ -134,8 +134,8 @@
":native_video",
":videoframebuffer_objc",
"../api:libjingle_peerconnection_api",
- "../api:video_frame_api",
- "../api:video_frame_api_i420",
+ "../api/video:video_frame",
+ "../api/video:video_frame_i420",
"../common_video",
"../media:rtc_media_base",
"../rtc_base:checks",
@@ -162,8 +162,8 @@
]
deps = [
":common_objc",
- "//api:video_frame_api",
- "//api:video_frame_api_i420",
+ "//api/video:video_frame",
+ "//api/video:video_frame_i420",
"//common_video",
"//rtc_base:checks",
"//rtc_base:rtc_base_approved",
@@ -212,7 +212,7 @@
":videosource_objc",
"../api:libjingle_peerconnection_api",
"../api:optional",
- "../api:video_frame_api",
+ "../api/video:video_frame",
"../common_video",
"../media:rtc_media_base",
"../rtc_base:checks",
@@ -297,7 +297,7 @@
":video_objc",
":videoframebuffer_objc",
":videorenderer_objc",
- "../api:video_frame_api",
+ "../api/video:video_frame",
"../rtc_base:checks",
"../rtc_base:rtc_base_approved",
]
@@ -677,8 +677,8 @@
":videorendereradapter_objc",
":videosource_objc",
"../api:libjingle_peerconnection_api",
- "../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory",
+ "../api/video:video_frame",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../media:rtc_media_base",
@@ -720,7 +720,7 @@
":videosource_objc",
":videotoolbox_objc",
"../../system_wrappers:system_wrappers_default",
- "../api:video_frame_api_i420",
+ "../api/video:video_frame_i420",
"../common_video:common_video",
"../media:rtc_media_base",
"../media:rtc_media_tests_utils",
@@ -1023,7 +1023,7 @@
":videoframebuffer_objc",
":videorenderer_objc",
"../api:libjingle_peerconnection_api",
- "../api:video_frame_api",
+ "../api/video:video_frame",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../rtc_base:rtc_base",
@@ -1063,8 +1063,8 @@
":videoframebuffer_objc",
":videorenderer_objc",
":wrapped_native_codec_objc",
- "../api:video_frame_api",
- "../api:video_frame_api_i420",
+ "../api/video:video_frame",
+ "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../media:rtc_audio_video",
@@ -1119,7 +1119,7 @@
":videocodec_objc",
":videoframebuffer_objc",
":videosource_objc",
- "../api:video_frame_api",
+ "../api/video:video_frame",
"../api/video_codecs:video_codecs_api",
"../common_video",
"../media:rtc_audio_video",
diff --git a/sdk/android/BUILD.gn b/sdk/android/BUILD.gn
index 0bdccd6..7035286 100644
--- a/sdk/android/BUILD.gn
+++ b/sdk/android/BUILD.gn
@@ -373,7 +373,7 @@
":native_api_jni",
"../..:webrtc_common",
"../../api:libjingle_peerconnection_api",
- "../../api:video_frame_api",
+ "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api",
"../../common_video:common_video",
"../../media:rtc_audio_video",
@@ -1232,7 +1232,7 @@
":native_api_jni",
":video_jni",
"//api:libjingle_peerconnection_api",
- "//api:video_frame_api",
+ "//api/video:video_frame",
"//rtc_base:rtc_base_approved",
]
}
diff --git a/sdk/android/src/jni/video_renderer.cc b/sdk/android/src/jni/video_renderer.cc
index 0271bd1..889012a 100644
--- a/sdk/android/src/jni/video_renderer.cc
+++ b/sdk/android/src/jni/video_renderer.cc
@@ -11,7 +11,7 @@
#include <jni.h>
#include "api/video/video_frame.h"
-#include "api/videosinkinterface.h"
+#include "api/video/video_sink_interface.h"
#include "sdk/android/generated_video_jni/jni/VideoRenderer_jni.h"
#include "sdk/android/src/jni/jni_helpers.h"
#include "sdk/android/src/jni/videoframe.h"
diff --git a/sdk/objc/Framework/Native/api/video_renderer.h b/sdk/objc/Framework/Native/api/video_renderer.h
index 712a3de..ffba02b 100644
--- a/sdk/objc/Framework/Native/api/video_renderer.h
+++ b/sdk/objc/Framework/Native/api/video_renderer.h
@@ -16,7 +16,7 @@
#include <memory>
#include "api/video/video_frame.h"
-#include "api/videosinkinterface.h"
+#include "api/video/video_sink_interface.h"
namespace webrtc {
diff --git a/sdk/objc/Framework/Native/src/objc_video_renderer.h b/sdk/objc/Framework/Native/src/objc_video_renderer.h
index a71f6fd..9b7c9b0 100644
--- a/sdk/objc/Framework/Native/src/objc_video_renderer.h
+++ b/sdk/objc/Framework/Native/src/objc_video_renderer.h
@@ -15,7 +15,7 @@
#import <Foundation/Foundation.h>
#include "api/video/video_frame.h"
-#include "api/videosinkinterface.h"
+#include "api/video/video_sink_interface.h"
@protocol RTCVideoRenderer;