zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New file api/video/BUILD.gn

Browse Source 
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}
This commit is contained in:
Niels Möller
2018-05-11 11:15:30 +02:00
committed by Commit Bot
parent bc0b37c08a
commit c6ce9c5938
39 changed files with 259 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.gn
View File

@ -345,7 +345,7 @@ if (!build_with_chromium) {
if (build_with_mozilla) { if (build_with_mozilla) {
deps += [ deps += [
"api:video_frame_api", "api/video:video_frame",
"system_wrappers:field_trial_default", "system_wrappers:field_trial_default",
"system_wrappers:metrics_default", "system_wrappers:metrics_default",
] ]
@ -381,7 +381,7 @@ rtc_static_library("webrtc_common") {
":typedefs", ":typedefs",
"api:array_view", "api:array_view",
"api:optional", "api:optional",
"api:video_bitrate_allocation", "api/video:video_bitrate_allocation",
"rtc_base:checks", "rtc_base:checks",
"rtc_base:deprecation", "rtc_base:deprecation",
"rtc_base:stringutils", "rtc_base:stringutils",

80
api/BUILD.gn
View File

@ -105,10 +105,10 @@ rtc_static_library("libjingle_peerconnection_api") {
":libjingle_logging_api", ":libjingle_logging_api",
":optional", ":optional",
":rtc_stats_api", ":rtc_stats_api",
":video_frame_api",
"audio:audio_mixer_api", "audio:audio_mixer_api",
"audio_codecs:audio_codecs_api", "audio_codecs:audio_codecs_api",
"transport:bitrate_settings", "transport:bitrate_settings",
"video:video_frame",
# Basically, don't add stuff here. You might break sensitive downstream # Basically, don't add stuff here. You might break sensitive downstream
# targets like pnacl. API should not depend on anything outside of this # targets like pnacl. API should not depend on anything outside of this
@ -220,80 +220,56 @@ rtc_source_set("fec_controller_api") {
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:video_frame.
# Delete after downstream users are updated.
rtc_source_set("video_frame_api") { rtc_source_set("video_frame_api") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ sources = [
"video/video_content_type.cc",
"video/video_content_type.h",
"video/video_frame.cc",
"video/video_frame.h",
"video/video_frame_buffer.cc",
"video/video_frame_buffer.h",
"video/video_rotation.h",
"video/video_timing.cc",
"video/video_timing.h",
"videosinkinterface.h", "videosinkinterface.h",
] ]
deps = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
"../rtc_base:checks", "video:video_frame",
"../rtc_base:rtc_base_approved",
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:encoded_frame.
# Delete after downstream users are updated.
rtc_source_set("encoded_frame_api") { rtc_source_set("encoded_frame_api") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [
"video/encoded_frame.cc",
"video/encoded_frame.h",
]
deps = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
"../modules/video_coding:encoded_frame", "video:encoded_frame",
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:video_stream_decoder.
# Delete after downstream users are updated.
rtc_source_set("video_stream_decoder") { rtc_source_set("video_stream_decoder") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [
"video/video_stream_decoder.h",
]
deps = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
":encoded_frame_api", "video:video_stream_decoder",
":optional",
":video_frame_api",
"../api/video_codecs:video_codecs_api",
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:video_stream_decoder_create.
# Delete after downstream users are updated.
rtc_source_set("video_stream_decoder_create") { rtc_source_set("video_stream_decoder_create") {
visibility = [ "*" ] visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove. allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
sources = [
"video/video_stream_decoder_create.cc",
"video/video_stream_decoder_create.h",
]
deps = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
":video_stream_decoder", "video:video_stream_decoder_create",
"../rtc_base:rtc_base_approved",
"../video:video_stream_decoder_impl",
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:video_frame_i420.
# Delete after downstream users are updated.
rtc_source_set("video_frame_api_i420") { rtc_source_set("video_frame_api_i420") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
"video/i420_buffer.cc", "video:video_frame_i420",
"video/i420_buffer.h",
]
deps = [
":video_frame_api",
"../rtc_base:checks",
"../rtc_base:rtc_base",
"../rtc_base/memory:aligned_malloc",
"//third_party/libyuv",
] ]
} }
@ -344,18 +320,12 @@ rtc_source_set("libjingle_peerconnection_test_api") {
] ]
} }
# TODO(bugs.webrtc.org/9253): Deprecated, replaced by video:video_bitrate_allocation.
# Delete after downstream users are updated.
rtc_source_set("video_bitrate_allocation") { rtc_source_set("video_bitrate_allocation") {
visibility = [ "*" ] visibility = [ "*" ]
sources = [ public_deps = [ # no-presubmit-check TODO(webrtc:8603)
"video/video_bitrate_allocation.cc", "video:video_bitrate_allocation",
"video/video_bitrate_allocation.h",
]
deps = [
":optional",
"..:typedefs",
"../rtc_base:checks",
"../rtc_base:safe_conversions",
"../rtc_base:stringutils",
] ]
} }

2
api/mediastreaminterface.h
View File

@ -27,7 +27,7 @@
// TODO(zhihuang): Remove unrelated headers once downstream applications stop // TODO(zhihuang): Remove unrelated headers once downstream applications stop
// relying on them; they were previously transitively included by // relying on them; they were previously transitively included by
// mediachannel.h, which is no longer a dependency of this file. // mediachannel.h, which is no longer a dependency of this file.
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "api/videosourceinterface.h" #include "api/videosourceinterface.h"
#include "modules/audio_processing/include/audio_processing_statistics.h" #include "modules/audio_processing/include/audio_processing_statistics.h"
#include "rtc_base/ratetracker.h" #include "rtc_base/ratetracker.h"

101
api/video/BUILD.gn Normal file
View File

@ -0,0 +1,101 @@
# Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
#
# Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source
# tree. An additional intellectual property rights grant can be found
# in the file PATENTS. All contributing project authors may
# be found in the AUTHORS file in the root of the source tree.
import("../../webrtc.gni")
rtc_source_set("video_frame") {
visibility = [ "*" ]
sources = [
"video_content_type.cc",
"video_content_type.h",
"video_frame.cc",
"video_frame.h",
"video_frame_buffer.cc",
"video_frame_buffer.h",
"video_rotation.h",
"video_sink_interface.h",
"video_timing.cc",
"video_timing.h",
]
deps = [
"../../rtc_base:checks",
"../../rtc_base:rtc_base_approved",
]
}
rtc_source_set("video_frame_i420") {
visibility = [ "*" ]
sources = [
"i420_buffer.cc",
"i420_buffer.h",
]
deps = [
":video_frame",
"../../rtc_base:checks",
"../../rtc_base:rtc_base",
"../../rtc_base/memory:aligned_malloc",
"//third_party/libyuv",
]
}
rtc_source_set("encoded_frame") {
visibility = [ "*" ]
sources = [
"encoded_frame.cc",
"encoded_frame.h",
]
deps = [
"../../modules/video_coding:encoded_frame",
]
}
rtc_source_set("video_bitrate_allocation") {
visibility = [ "*" ]
sources = [
"video_bitrate_allocation.cc",
"video_bitrate_allocation.h",
]
deps = [
"..:optional",
"../..:typedefs",
"../../rtc_base:checks",
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
]
}
rtc_source_set("video_stream_decoder") {
visibility = [ "*" ]
sources = [
"video_stream_decoder.h",
]
deps = [
":encoded_frame",
":video_frame",
"..:optional",
"../video_codecs:video_codecs_api",
]
}
rtc_source_set("video_stream_decoder_create") {
visibility = [ "*" ]
allow_poison = [ "software_video_codecs" ] # TODO(bugs.webrtc.org/7925): Remove.
sources = [
"video_stream_decoder_create.cc",
"video_stream_decoder_create.h",
]
deps = [
":video_stream_decoder",
"../../rtc_base:rtc_base_approved",
"../../video:video_stream_decoder_impl",
]
}

32
api/video/video_sink_interface.h Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef API_VIDEO_VIDEO_SINK_INTERFACE_H_
#define API_VIDEO_VIDEO_SINK_INTERFACE_H_
#include <rtc_base/checks.h>
namespace rtc {
template <typename VideoFrameT>
class VideoSinkInterface {
public:
virtual ~VideoSinkInterface() = default;
virtual void OnFrame(const VideoFrameT& frame) = 0;
// Should be called by the source when it discards the frame due to rate
// limiting.
virtual void OnDiscardedFrame() {}
};
} // namespace rtc
#endif // API_VIDEO_VIDEO_SINK_INTERFACE_H_

2
api/video_codecs/BUILD.gn
View File

@ -27,12 +27,12 @@ rtc_source_set("video_codecs_api") {
deps = [ deps = [
"..:optional", "..:optional",
"..:video_frame_api",
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../common_video", "../../common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../video:video_frame",
] ]
} }

20
api/videosinkinterface.h
View File

@ -11,22 +11,8 @@
#ifndef API_VIDEOSINKINTERFACE_H_ #ifndef API_VIDEOSINKINTERFACE_H_
#define API_VIDEOSINKINTERFACE_H_ #define API_VIDEOSINKINTERFACE_H_
#include <rtc_base/checks.h> // TODO(nisse): Place holder for moved file. Delete after applications are
// updated.
namespace rtc { #include "api/video/video_sink_interface.h"
template <typename VideoFrameT>
class VideoSinkInterface {
public:
virtual ~VideoSinkInterface() {}
virtual void OnFrame(const VideoFrameT& frame) = 0;
// Should be called by the source when it discards the frame due to rate
// limiting.
virtual void OnDiscardedFrame() {}
};
} // namespace rtc
#endif // API_VIDEOSINKINTERFACE_H_ #endif // API_VIDEOSINKINTERFACE_H_

2
api/videosourceinterface.h
View File

@ -14,7 +14,7 @@
#include <limits> #include <limits>
#include "api/optional.h" #include "api/optional.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
namespace rtc { namespace rtc {

2
call/BUILD.gn
View File

@ -222,7 +222,7 @@ rtc_source_set("video_stream_api") {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:transport_api", "../api:transport_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video:common_video", "../common_video:common_video",
"../modules/rtp_rtcp:rtp_rtcp_format", "../modules/rtp_rtcp:rtp_rtcp_format",

2
call/video_receive_stream.h
View File

@ -21,7 +21,7 @@
#include "api/rtpparameters.h" #include "api/rtpparameters.h"
#include "api/video/video_content_type.h" #include "api/video/video_content_type.h"
#include "api/video/video_timing.h" #include "api/video/video_timing.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "call/rtp_config.h" #include "call/rtp_config.h"
#include "common_types.h" // NOLINT(build/include) #include "common_types.h" // NOLINT(build/include)
#include "common_video/include/frame_callback.h" #include "common_video/include/frame_callback.h"

2
call/video_send_stream.h
View File

@ -19,7 +19,7 @@
#include "api/call/transport.h" #include "api/call/transport.h"
#include "api/rtpparameters.h" #include "api/rtpparameters.h"
#include "api/rtp_headers.h" #include "api/rtp_headers.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "api/videosourceinterface.h" #include "api/videosourceinterface.h"
#include "api/video_codecs/video_encoder_factory.h" #include "api/video_codecs/video_encoder_factory.h"
#include "call/rtp_config.h" #include "call/rtp_config.h"

8
common_video/BUILD.gn
View File

@ -58,8 +58,8 @@ rtc_static_library("common_video") {
"..:webrtc_common", "..:webrtc_common",
"../:typedefs", "../:typedefs",
"../api:optional", "../api:optional",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../media:rtc_h264_profile_id", "../media:rtc_h264_profile_id",
"../modules:module_api", "../modules:module_api",
"../rtc_base:checks", "../rtc_base:checks",
@ -108,8 +108,8 @@ if (rtc_include_tests) {
deps = [ deps = [
":common_video", ":common_video",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../modules/video_capture:video_capture", "../modules/video_capture:video_capture",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",

2
common_video/include/incoming_video_stream.h
View File

@ -11,7 +11,7 @@
#ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ #ifndef COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
#define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_ #define COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "common_video/video_render_frames.h" #include "common_video/video_render_frames.h"
#include "rtc_base/race_checker.h" #include "rtc_base/race_checker.h"
#include "rtc_base/task_queue.h" #include "rtc_base/task_queue.h"

6
examples/BUILD.gn
View File

@ -632,7 +632,7 @@ if (is_linux || is_win) {
} }
deps = [ deps = [
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:stringutils", "../rtc_base:stringutils",
] ]
@ -667,9 +667,9 @@ if (is_linux || is_win) {
deps += [ deps += [
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:libjingle_peerconnection_test_api", "../api:libjingle_peerconnection_test_api",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory",
"../api/video:video_frame",
"../api/video_codecs:builtin_video_decoder_factory", "../api/video_codecs:builtin_video_decoder_factory",
"../api/video_codecs:builtin_video_encoder_factory", "../api/video_codecs:builtin_video_encoder_factory",
"../media:rtc_audio_video", "../media:rtc_audio_video",
@ -803,9 +803,9 @@ if (is_win || is_android) {
deps = [ deps = [
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:libjingle_peerconnection_test_api", "../api:libjingle_peerconnection_test_api",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory",
"../api/video:video_frame",
"../media:rtc_audio_video", "../media:rtc_audio_video",
"../media:rtc_internal_video_codecs", "../media:rtc_internal_video_codecs",
"../media:rtc_media", "../media:rtc_media",

2
examples/unityplugin/video_observer.h
View File

@ -14,7 +14,7 @@
#include <mutex> #include <mutex>
#include "api/mediastreaminterface.h" #include "api/mediastreaminterface.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "examples/unityplugin/unity_plugin_apis.h" #include "examples/unityplugin/unity_plugin_apis.h"
class VideoObserver : public rtc::VideoSinkInterface<webrtc::VideoFrame> { class VideoObserver : public rtc::VideoSinkInterface<webrtc::VideoFrame> {

18
media/BUILD.gn
View File

@ -121,9 +121,9 @@ rtc_static_library("rtc_media_base") {
"..:webrtc_common", "..:webrtc_common",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:audio_codecs_api",
"../api/video:video_frame",
"../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../call:video_stream_api", "../call:video_stream_api",
@ -206,7 +206,7 @@ rtc_static_library("rtc_internal_video_codecs") {
":rtc_media_base", ":rtc_media_base",
":rtc_software_fallback_wrappers", ":rtc_software_fallback_wrappers",
"..:webrtc_common", "..:webrtc_common",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../call:video_stream_api", "../call:video_stream_api",
@ -347,9 +347,9 @@ rtc_static_library("rtc_audio_video") {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:transport_api", "../api:transport_api",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../api/audio_codecs:audio_codecs_api", "../api/audio_codecs:audio_codecs_api",
"../api/video:video_frame",
"../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call", "../call",
"../call:call_interfaces", "../call:call_interfaces",
@ -452,7 +452,7 @@ if (rtc_include_tests) {
deps = [ deps = [
":rtc_audio_video", ":rtc_audio_video",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../call:video_stream_api", "../call:video_stream_api",
"../common_video:common_video", "../common_video:common_video",
"../modules/audio_coding:rent_a_codec", "../modules/audio_coding:rent_a_codec",
@ -499,7 +499,7 @@ if (rtc_include_tests) {
":rtc_media_base", ":rtc_media_base",
"..:webrtc_common", "..:webrtc_common",
"../api:call_api", "../api:call_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../call:mock_rtp_interfaces", "../call:mock_rtp_interfaces",
@ -558,7 +558,7 @@ if (rtc_include_tests) {
":rtc_audio_video", ":rtc_audio_video",
":rtc_constants", ":rtc_constants",
":rtc_data", ":rtc_data",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../modules/audio_processing:mocks", "../modules/audio_processing:mocks",
"../modules/video_coding:video_codec_interface", "../modules/video_coding:video_codec_interface",
"../pc:rtc_pc", "../pc:rtc_pc",
@ -651,9 +651,9 @@ if (rtc_include_tests) {
":rtc_software_fallback_wrappers", ":rtc_software_fallback_wrappers",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:mock_video_codec_factory", "../api:mock_video_codec_factory",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory",
"../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../audio", "../audio",
"../call:call_interfaces", "../call:call_interfaces",

2
media/base/fakevideorenderer.h
View File

@ -12,7 +12,7 @@
#define MEDIA_BASE_FAKEVIDEORENDERER_H_ #define MEDIA_BASE_FAKEVIDEORENDERER_H_
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "rtc_base/criticalsection.h" #include "rtc_base/criticalsection.h"
#include "rtc_base/logging.h" #include "rtc_base/logging.h"

2
media/base/mediachannel.h
View File

@ -25,7 +25,7 @@
#include "api/rtpreceiverinterface.h" #include "api/rtpreceiverinterface.h"
#include "api/video/video_content_type.h" #include "api/video/video_content_type.h"
#include "api/video/video_timing.h" #include "api/video/video_timing.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "api/videosourceinterface.h" #include "api/videosourceinterface.h"
#include "call/video_config.h" #include "call/video_config.h"
#include "media/base/codec.h" #include "media/base/codec.h"

2
media/base/videobroadcaster.h
View File

@ -16,7 +16,7 @@
#include <vector> #include <vector>
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "media/base/videosourcebase.h" #include "media/base/videosourcebase.h"
#include "rtc_base/criticalsection.h" #include "rtc_base/criticalsection.h"
#include "rtc_base/thread_checker.h" #include "rtc_base/thread_checker.h"

2
media/engine/webrtcvideoengine.h
View File

@ -21,7 +21,7 @@
#include "api/optional.h" #include "api/optional.h"
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/video_codecs/sdp_video_format.h" #include "api/video_codecs/sdp_video_format.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "api/videosourceinterface.h" #include "api/videosourceinterface.h"
#include "call/call.h" #include "call/call.h"
#include "call/flexfec_receive_stream.h" #include "call/flexfec_receive_stream.h"

4
modules/BUILD.gn
View File

@ -54,9 +54,9 @@ rtc_source_set("module_api") {
"../:typedefs", "../:typedefs",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../api/transport:network_control", "../api/transport:network_control",
"../api/video:video_frame",
"../api/video:video_frame_i420",
"../rtc_base:deprecation", "../rtc_base:deprecation",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"video_coding:codec_globals_headers", "video_coding:codec_globals_headers",

4
modules/rtp_rtcp/BUILD.gn
View File

@ -87,8 +87,8 @@ rtc_source_set("rtp_rtcp_format") {
"../../api:array_view", "../../api:array_view",
"../../api:libjingle_peerconnection_api", "../../api:libjingle_peerconnection_api",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api",
"../../api/audio_codecs:audio_codecs_api", "../../api/audio_codecs:audio_codecs_api",
"../../api/video:video_frame",
"../../common_video", "../../common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:deprecation", "../../rtc_base:deprecation",
@ -405,7 +405,7 @@ if (rtc_include_tests) {
"../../api:libjingle_peerconnection_api", "../../api:libjingle_peerconnection_api",
"../../api:optional", "../../api:optional",
"../../api:transport_api", "../../api:transport_api",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../call:rtp_receiver", "../../call:rtp_receiver",
"../../common_video:common_video", "../../common_video:common_video",
"../../logging:mocks", "../../logging:mocks",

8
modules/video_capture/BUILD.gn
View File

@ -31,8 +31,8 @@ rtc_static_library("video_capture_module") {
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:libjingle_peerconnection_api", "../../api:libjingle_peerconnection_api",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../common_video", "../../common_video",
"../../media:rtc_media_base", "../../media:rtc_media_base",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -231,8 +231,8 @@ if (!build_with_chromium) {
deps = [ deps = [
":video_capture_internal_impl", ":video_capture_internal_impl",
":video_capture_module", ":video_capture_module",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../common_video:common_video", "../../common_video:common_video",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
"../../system_wrappers:system_wrappers", "../../system_wrappers:system_wrappers",

2
modules/video_capture/video_capture.h
View File

@ -12,7 +12,7 @@
#define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_ #define MODULES_VIDEO_CAPTURE_VIDEO_CAPTURE_H_
#include "api/video/video_rotation.h" #include "api/video/video_rotation.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "modules/include/module.h" #include "modules/include/module.h"
#include "modules/video_capture/video_capture_defines.h" #include "modules/video_capture/video_capture_defines.h"

38
modules/video_coding/BUILD.gn
View File

@ -18,7 +18,7 @@ rtc_static_library("encoded_frame") {
":video_codec_interface", ":video_codec_interface",
"../../:webrtc_common", "../../:webrtc_common",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../common_video:common_video", "../../common_video:common_video",
"../../modules:module_api", "../../modules:module_api",
"../../modules:module_api_public", "../../modules:module_api_public",
@ -139,11 +139,11 @@ rtc_static_library("video_coding") {
"..:module_api_public", "..:module_api_public",
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:encoded_frame_api",
"../../api:fec_controller_api", "../../api:fec_controller_api",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api", "../../api/video:encoded_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../call:video_stream_api", "../../call:video_stream_api",
"../../common_video", "../../common_video",
@ -176,7 +176,7 @@ rtc_source_set("video_codec_interface") {
"..:module_api", "..:module_api",
"../..:typedefs", "../..:typedefs",
"../..:webrtc_common", "../..:webrtc_common",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video:common_video", "../../common_video:common_video",
] ]
@ -265,7 +265,7 @@ rtc_static_library("webrtc_h264") {
deps = [ deps = [
":video_codec_interface", ":video_codec_interface",
":video_coding_utility", ":video_coding_utility",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../media:rtc_h264_profile_id", "../../media:rtc_h264_profile_id",
"../../media:rtc_media_base", "../../media:rtc_media_base",
@ -319,7 +319,7 @@ rtc_static_library("webrtc_i420") {
":video_coding_utility", ":video_coding_utility",
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../common_video:common_video", "../../common_video:common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -348,8 +348,8 @@ rtc_static_library("webrtc_multiplex") {
":video_coding_utility", ":video_coding_utility",
"..:module_api", "..:module_api",
"../..:webrtc_common", "../..:webrtc_common",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video:common_video", "../../common_video:common_video",
"../../rtc_base:rtc_base", "../../rtc_base:rtc_base",
@ -389,7 +389,7 @@ rtc_static_library("webrtc_vp8_helpers") {
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video", "../../common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
@ -431,7 +431,7 @@ rtc_static_library("webrtc_vp8") {
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video", "../../common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
@ -540,7 +540,7 @@ if (rtc_include_tests) {
] ]
deps = [ deps = [
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../media:rtc_audio_video", "../../media:rtc_audio_video",
"../../media:rtc_media_base", "../../media:rtc_media_base",
@ -577,8 +577,8 @@ if (rtc_include_tests) {
":video_codec_interface", ":video_codec_interface",
":video_coding", ":video_coding",
":webrtc_vp8_helpers", ":webrtc_vp8_helpers",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../common_video:common_video", "../../common_video:common_video",
"../../rtc_base:checks", "../../rtc_base:checks",
"../../rtc_base:rtc_base_approved", "../../rtc_base:rtc_base_approved",
@ -613,8 +613,8 @@ if (rtc_include_tests) {
":webrtc_vp9_helpers", ":webrtc_vp9_helpers",
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video:common_video", "../../common_video:common_video",
"../../media:rtc_audio_video", "../../media:rtc_audio_video",
@ -734,8 +734,8 @@ if (rtc_include_tests) {
"../../api:create_videocodec_test_fixture_api", "../../api:create_videocodec_test_fixture_api",
"../../api:mock_video_codec_factory", "../../api:mock_video_codec_factory",
"../../api:optional", "../../api:optional",
"../../api:video_frame_api_i420",
"../../api:videocodec_test_fixture_api", "../../api:videocodec_test_fixture_api",
"../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video", "../../common_video",
"../../media:rtc_h264_profile_id", "../../media:rtc_h264_profile_id",
@ -839,8 +839,8 @@ if (rtc_include_tests) {
"..:module_api", "..:module_api",
"../..:webrtc_common", "../..:webrtc_common",
"../../:typedefs", "../../:typedefs",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api:video_frame_api_i420", "../../api/video:video_frame_i420",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video:common_video", "../../common_video:common_video",
"../../media:rtc_media_base", "../../media:rtc_media_base",

4
pc/BUILD.gn
View File

@ -73,7 +73,7 @@ rtc_static_library("rtc_pc_base") {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:ortc_api", "../api:ortc_api",
"../api:video_frame_api", "../api/video:video_frame",
"../call:rtp_interfaces", "../call:rtp_interfaces",
"../call:rtp_receiver", "../call:rtp_receiver",
"../common_video:common_video", "../common_video:common_video",
@ -195,7 +195,7 @@ rtc_static_library("peerconnection") {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:rtc_stats_api", "../api:rtc_stats_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../common_video:common_video", "../common_video:common_video",

2
pc/channel.h
View File

@ -21,7 +21,7 @@
#include "api/call/audio_sink.h" #include "api/call/audio_sink.h"
#include "api/jsep.h" #include "api/jsep.h"
#include "api/rtpreceiverinterface.h" #include "api/rtpreceiverinterface.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "api/videosourceinterface.h" #include "api/videosourceinterface.h"
#include "call/rtp_packet_sink_interface.h" #include "call/rtp_packet_sink_interface.h"
#include "media/base/mediachannel.h" #include "media/base/mediachannel.h"

2
pc/videotracksource.h
View File

@ -13,7 +13,7 @@
#include "api/mediastreaminterface.h" #include "api/mediastreaminterface.h"
#include "api/notifier.h" #include "api/notifier.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "media/base/mediachannel.h" #include "media/base/mediachannel.h"
#include "rtc_base/thread_checker.h" #include "rtc_base/thread_checker.h"

24
sdk/BUILD.gn
View File

@ -134,8 +134,8 @@ if (is_ios || is_mac) {
":native_video", ":native_video",
":videoframebuffer_objc", ":videoframebuffer_objc",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../common_video", "../common_video",
"../media:rtc_media_base", "../media:rtc_media_base",
"../rtc_base:checks", "../rtc_base:checks",
@ -162,8 +162,8 @@ if (is_ios || is_mac) {
] ]
deps = [ deps = [
":common_objc", ":common_objc",
"//api:video_frame_api", "//api/video:video_frame",
"//api:video_frame_api_i420", "//api/video:video_frame_i420",
"//common_video", "//common_video",
"//rtc_base:checks", "//rtc_base:checks",
"//rtc_base:rtc_base_approved", "//rtc_base:rtc_base_approved",
@ -212,7 +212,7 @@ if (is_ios || is_mac) {
":videosource_objc", ":videosource_objc",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:video_frame_api", "../api/video:video_frame",
"../common_video", "../common_video",
"../media:rtc_media_base", "../media:rtc_media_base",
"../rtc_base:checks", "../rtc_base:checks",
@ -297,7 +297,7 @@ if (is_ios || is_mac) {
":video_objc", ":video_objc",
":videoframebuffer_objc", ":videoframebuffer_objc",
":videorenderer_objc", ":videorenderer_objc",
"../api:video_frame_api", "../api/video:video_frame",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
] ]
@ -677,8 +677,8 @@ if (is_ios || is_mac) {
":videorendereradapter_objc", ":videorendereradapter_objc",
":videosource_objc", ":videosource_objc",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:video_frame_api",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video", "../common_video",
"../media:rtc_media_base", "../media:rtc_media_base",
@ -720,7 +720,7 @@ if (is_ios || is_mac) {
":videosource_objc", ":videosource_objc",
":videotoolbox_objc", ":videotoolbox_objc",
"../../system_wrappers:system_wrappers_default", "../../system_wrappers:system_wrappers_default",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../common_video:common_video", "../common_video:common_video",
"../media:rtc_media_base", "../media:rtc_media_base",
"../media:rtc_media_tests_utils", "../media:rtc_media_tests_utils",
@ -1023,7 +1023,7 @@ if (is_ios || is_mac) {
":videoframebuffer_objc", ":videoframebuffer_objc",
":videorenderer_objc", ":videorenderer_objc",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video", "../common_video",
"../rtc_base:rtc_base", "../rtc_base:rtc_base",
@ -1063,8 +1063,8 @@ if (is_ios || is_mac) {
":videoframebuffer_objc", ":videoframebuffer_objc",
":videorenderer_objc", ":videorenderer_objc",
":wrapped_native_codec_objc", ":wrapped_native_codec_objc",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video", "../common_video",
"../media:rtc_audio_video", "../media:rtc_audio_video",
@ -1119,7 +1119,7 @@ if (is_ios || is_mac) {
":videocodec_objc", ":videocodec_objc",
":videoframebuffer_objc", ":videoframebuffer_objc",
":videosource_objc", ":videosource_objc",
"../api:video_frame_api", "../api/video:video_frame",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../common_video", "../common_video",
"../media:rtc_audio_video", "../media:rtc_audio_video",

4
sdk/android/BUILD.gn
View File

@ -373,7 +373,7 @@ rtc_static_library("video_jni") {
":native_api_jni", ":native_api_jni",
"../..:webrtc_common", "../..:webrtc_common",
"../../api:libjingle_peerconnection_api", "../../api:libjingle_peerconnection_api",
"../../api:video_frame_api", "../../api/video:video_frame",
"../../api/video_codecs:video_codecs_api", "../../api/video_codecs:video_codecs_api",
"../../common_video:common_video", "../../common_video:common_video",
"../../media:rtc_audio_video", "../../media:rtc_audio_video",
@ -1232,7 +1232,7 @@ rtc_static_library("native_api_video") {
":native_api_jni", ":native_api_jni",
":video_jni", ":video_jni",
"//api:libjingle_peerconnection_api", "//api:libjingle_peerconnection_api",
"//api:video_frame_api", "//api/video:video_frame",
"//rtc_base:rtc_base_approved", "//rtc_base:rtc_base_approved",
] ]
} }

2
sdk/android/src/jni/video_renderer.cc
View File

@ -11,7 +11,7 @@
#include <jni.h> #include <jni.h>
#include "api/video/video_frame.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/generated_video_jni/jni/VideoRenderer_jni.h"
#include "sdk/android/src/jni/jni_helpers.h" #include "sdk/android/src/jni/jni_helpers.h"
#include "sdk/android/src/jni/videoframe.h" #include "sdk/android/src/jni/videoframe.h"

2
sdk/objc/Framework/Native/api/video_renderer.h
View File

@ -16,7 +16,7 @@
#include <memory> #include <memory>
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
namespace webrtc { namespace webrtc {

2
sdk/objc/Framework/Native/src/objc_video_renderer.h
View File

@ -15,7 +15,7 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
@protocol RTCVideoRenderer; @protocol RTCVideoRenderer;

16
test/BUILD.gn
View File

@ -64,8 +64,8 @@ rtc_source_set("video_test_common") {
"../:typedefs", "../:typedefs",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:video_stream_api", "../call:video_stream_api",
"../common_video", "../common_video",
@ -241,8 +241,8 @@ if (rtc_include_tests) {
":video_test_common", ":video_test_common",
"..:webrtc_common", "..:webrtc_common",
"../:typedefs", "../:typedefs",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../common_video", "../common_video",
"../rtc_base:checks", "../rtc_base:checks",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
@ -319,7 +319,7 @@ if (rtc_include_tests) {
":test_support_test_artifacts", ":test_support_test_artifacts",
":video_test_common", ":video_test_common",
":video_test_support", ":video_test_support",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../modules/rtp_rtcp:rtp_rtcp", "../modules/rtp_rtcp:rtp_rtcp",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
"../test:single_threaded_task_queue", "../test:single_threaded_task_queue",
@ -553,10 +553,10 @@ rtc_source_set("test_common") {
"../:typedefs", "../:typedefs",
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:transport_api", "../api:transport_api",
"../api:video_frame_api",
"../api:video_frame_api_i420",
"../api/audio_codecs:builtin_audio_decoder_factory", "../api/audio_codecs:builtin_audio_decoder_factory",
"../api/audio_codecs:builtin_audio_encoder_factory", "../api/audio_codecs:builtin_audio_encoder_factory",
"../api/video:video_frame",
"../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../audio", "../audio",
"../call", "../call",
@ -660,7 +660,7 @@ rtc_source_set("test_renderer_generic") {
":test_support", ":test_support",
"..:webrtc_common", "..:webrtc_common",
"../:typedefs", "../:typedefs",
"../api:video_frame_api", "../api/video:video_frame",
"../common_video", "../common_video",
"../media:rtc_media_base", "../media:rtc_media_base",
"../rtc_base:checks", "../rtc_base:checks",

2
test/fake_videorenderer.h
View File

@ -12,7 +12,7 @@
#define TEST_FAKE_VIDEORENDERER_H_ #define TEST_FAKE_VIDEORENDERER_H_
#include "api/video/video_frame.h" #include "api/video/video_frame.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
namespace webrtc { namespace webrtc {
namespace test { namespace test {

2
test/video_renderer.h
View File

@ -12,7 +12,7 @@
#include <stddef.h> #include <stddef.h>
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
namespace webrtc { namespace webrtc {
class VideoFrame; class VideoFrame;

14
video/BUILD.gn
View File

@ -62,8 +62,8 @@ rtc_static_library("video") {
"../api:libjingle_peerconnection_api", "../api:libjingle_peerconnection_api",
"../api:optional", "../api:optional",
"../api:transport_api", "../api:transport_api",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:bitrate_allocator", "../call:bitrate_allocator",
"../call:call_interfaces", "../call:call_interfaces",
@ -116,10 +116,10 @@ rtc_source_set("video_stream_decoder_impl") {
] ]
deps = [ deps = [
"../api:encoded_frame_api",
"../api:optional", "../api:optional",
"../api:video_frame_api", "../api/video:encoded_frame",
"../api:video_stream_decoder", "../api/video:video_frame",
"../api/video:video_stream_decoder",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../modules/video_coding:video_coding", "../modules/video_coding:video_coding",
"../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_approved",
@ -358,8 +358,8 @@ if (rtc_include_tests) {
":video", ":video",
":video_mocks", ":video_mocks",
"../api:optional", "../api:optional",
"../api:video_frame_api", "../api/video:video_frame",
"../api:video_frame_api_i420", "../api/video:video_frame_i420",
"../api/video_codecs:video_codecs_api", "../api/video_codecs:video_codecs_api",
"../call:call_interfaces", "../call:call_interfaces",
"../call:mock_bitrate_allocator", "../call:mock_bitrate_allocator",

2
video/video_stream_decoder.h
View File

@ -16,7 +16,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "modules/video_coding/include/video_coding_defines.h" #include "modules/video_coding/include/video_coding_defines.h"
#include "rtc_base/criticalsection.h" #include "rtc_base/criticalsection.h"

2
video/video_stream_encoder.h
View File

@ -19,7 +19,7 @@
#include "api/video/video_rotation.h" #include "api/video/video_rotation.h"
#include "api/video_codecs/video_encoder.h" #include "api/video_codecs/video_encoder.h"
#include "api/videosinkinterface.h" #include "api/video/video_sink_interface.h"
#include "call/call.h" #include "call/call.h"
#include "common_types.h" // NOLINT(build/include) #include "common_types.h" // NOLINT(build/include)
#include "common_video/include/video_bitrate_allocator.h" #include "common_video/include/video_bitrate_allocator.h"