From a96b60b3a6e1bafa7cbf63f5cb325ded83880137 Mon Sep 17 00:00:00 2001 From: pbos Date: Mon, 18 Apr 2016 21:12:48 -0700 Subject: [PATCH] Move frame_callback.h to common_video/include. BUG=webrtc:4243 R=kjellander@webrtc.org, tommi@webrtc.org Review URL: https://codereview.webrtc.org/1902543002 Cr-Commit-Position: refs/heads/master@{#12419} --- webrtc/BUILD.gn | 1 - webrtc/DEPS | 3 ++- webrtc/common_video/BUILD.gn | 1 + webrtc/common_video/common_video.gyp | 1 + webrtc/{ => common_video/include}/frame_callback.h | 6 +++--- webrtc/modules/video_coding/video_coding_impl.h | 2 +- webrtc/video/encoded_frame_callback_adapter.h | 2 +- webrtc/video/end_to_end_tests.cc | 2 +- webrtc/video/overuse_frame_detector.cc | 2 +- webrtc/video/receive_statistics_proxy.h | 2 +- webrtc/video/video_send_stream_tests.cc | 2 +- webrtc/video/vie_channel.cc | 2 +- webrtc/video/vie_encoder.cc | 2 +- webrtc/video_receive_stream.h | 4 ++-- webrtc/video_send_stream.h | 2 +- webrtc/webrtc.gyp | 1 - 16 files changed, 18 insertions(+), 17 deletions(-) rename webrtc/{ => common_video/include}/frame_callback.h (89%) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 9f4fd5c7a6..03785fba71 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -169,7 +169,6 @@ source_set("webrtc") { sources = [ "call.h", "config.h", - "frame_callback.h", "transport.h", ] diff --git a/webrtc/DEPS b/webrtc/DEPS index 7f15817e37..992c32aeb3 100644 --- a/webrtc/DEPS +++ b/webrtc/DEPS @@ -19,7 +19,6 @@ include_rules = [ "+webrtc/common_types.h", "+webrtc/config.h", "+webrtc/engine_configurations.h", - "+webrtc/frame_callback.h", "+webrtc/stream.h", "+webrtc/transport.h", "+webrtc/typedefs.h", @@ -45,9 +44,11 @@ specific_include_rules = { "+webrtc/common_video", ], "video_receive_stream\.h": [ + "+webrtc/common_video/include", "+webrtc/media/base", ], "video_send_stream\.h": [ + "+webrtc/common_video/include", "+webrtc/media/base", ], } diff --git a/webrtc/common_video/BUILD.gn b/webrtc/common_video/BUILD.gn index ed877bd344..832d6ee4de 100644 --- a/webrtc/common_video/BUILD.gn +++ b/webrtc/common_video/BUILD.gn @@ -18,6 +18,7 @@ config("common_video_config") { source_set("common_video") { sources = [ "i420_buffer_pool.cc", + "include/frame_callback.h", "include/i420_buffer_pool.h", "include/incoming_video_stream.h", "include/video_frame_buffer.h", diff --git a/webrtc/common_video/common_video.gyp b/webrtc/common_video/common_video.gyp index b392bd2aa4..0318d67de2 100644 --- a/webrtc/common_video/common_video.gyp +++ b/webrtc/common_video/common_video.gyp @@ -55,6 +55,7 @@ 'i420_buffer_pool.cc', 'video_frame.cc', 'incoming_video_stream.cc', + 'include/frame_callback.h', 'include/i420_buffer_pool.h', 'include/incoming_video_stream.h', 'include/video_frame_buffer.h', diff --git a/webrtc/frame_callback.h b/webrtc/common_video/include/frame_callback.h similarity index 89% rename from webrtc/frame_callback.h rename to webrtc/common_video/include/frame_callback.h index 2bae25036d..81737c6b96 100644 --- a/webrtc/frame_callback.h +++ b/webrtc/common_video/include/frame_callback.h @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#ifndef WEBRTC_FRAME_CALLBACK_H_ -#define WEBRTC_FRAME_CALLBACK_H_ +#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ +#define WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ #include #include @@ -52,4 +52,4 @@ class EncodedFrameObserver { } // namespace webrtc -#endif // WEBRTC_FRAME_CALLBACK_H_ +#endif // WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_ diff --git a/webrtc/modules/video_coding/video_coding_impl.h b/webrtc/modules/video_coding/video_coding_impl.h index 667598382e..40352b02dc 100644 --- a/webrtc/modules/video_coding/video_coding_impl.h +++ b/webrtc/modules/video_coding/video_coding_impl.h @@ -16,10 +16,10 @@ #include #include -#include "webrtc/frame_callback.h" #include "webrtc/base/onetimeevent.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_checker.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/codec_database.h" #include "webrtc/modules/video_coding/frame_buffer.h" #include "webrtc/modules/video_coding/generic_decoder.h" diff --git a/webrtc/video/encoded_frame_callback_adapter.h b/webrtc/video/encoded_frame_callback_adapter.h index b10c4f1645..fa824953c1 100644 --- a/webrtc/video/encoded_frame_callback_adapter.h +++ b/webrtc/video/encoded_frame_callback_adapter.h @@ -11,8 +11,8 @@ #ifndef WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_ #define WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_ +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" -#include "webrtc/frame_callback.h" namespace webrtc { namespace internal { diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc index 8c7d09d22a..f1f2f1b4fb 100644 --- a/webrtc/video/end_to_end_tests.cc +++ b/webrtc/video/end_to_end_tests.cc @@ -22,7 +22,7 @@ #include "webrtc/base/timeutils.h" #include "webrtc/call.h" #include "webrtc/call/transport_adapter.h" -#include "webrtc/frame_callback.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/include/module_common_types.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h" diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc index 1ce97771ee..96e21596bb 100644 --- a/webrtc/video/overuse_frame_detector.cc +++ b/webrtc/video/overuse_frame_detector.cc @@ -20,7 +20,7 @@ #include "webrtc/base/checks.h" #include "webrtc/base/exp_filter.h" #include "webrtc/base/logging.h" -#include "webrtc/frame_callback.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/system_wrappers/include/clock.h" #include "webrtc/video_frame.h" diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h index dc61275088..a1ff0eb36b 100644 --- a/webrtc/video/receive_statistics_proxy.h +++ b/webrtc/video/receive_statistics_proxy.h @@ -19,7 +19,7 @@ #include "webrtc/base/ratetracker.h" #include "webrtc/base/thread_annotations.h" #include "webrtc/common_types.h" -#include "webrtc/frame_callback.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/video_coding/include/video_coding_defines.h" #include "webrtc/video/report_block_stats.h" #include "webrtc/video/vie_channel.h" diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc index d3bf63a9bf..50409115ef 100644 --- a/webrtc/video/video_send_stream_tests.cc +++ b/webrtc/video/video_send_stream_tests.cc @@ -21,7 +21,7 @@ #include "webrtc/base/platform_thread.h" #include "webrtc/call.h" #include "webrtc/call/transport_adapter.h" -#include "webrtc/frame_callback.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" diff --git a/webrtc/video/vie_channel.cc b/webrtc/video/vie_channel.cc index 842558b7b4..108d409ce4 100644 --- a/webrtc/video/vie_channel.cc +++ b/webrtc/video/vie_channel.cc @@ -17,9 +17,9 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/base/platform_thread.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/common_video/include/incoming_video_stream.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/frame_callback.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc index 98169d2271..de3ab71175 100644 --- a/webrtc/video/vie_encoder.cc +++ b/webrtc/video/vie_encoder.cc @@ -17,9 +17,9 @@ #include "webrtc/base/checks.h" #include "webrtc/base/logging.h" #include "webrtc/base/trace_event.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/common_video/include/video_image.h" #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" -#include "webrtc/frame_callback.h" #include "webrtc/modules/pacing/paced_sender.h" #include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h" diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h index 109c2aa15b..1b46c17749 100644 --- a/webrtc/video_receive_stream.h +++ b/webrtc/video_receive_stream.h @@ -17,11 +17,11 @@ #include #include "webrtc/common_types.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/config.h" -#include "webrtc/frame_callback.h" +#include "webrtc/media/base/videosinkinterface.h" #include "webrtc/stream.h" #include "webrtc/transport.h" -#include "webrtc/media/base/videosinkinterface.h" namespace webrtc { diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h index a6ef1e0e85..50a8df3f0d 100644 --- a/webrtc/video_send_stream.h +++ b/webrtc/video_send_stream.h @@ -15,8 +15,8 @@ #include #include "webrtc/common_types.h" +#include "webrtc/common_video/include/frame_callback.h" #include "webrtc/config.h" -#include "webrtc/frame_callback.h" #include "webrtc/media/base/videosinkinterface.h" #include "webrtc/stream.h" #include "webrtc/transport.h" diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index ad4b3534d4..6f90833a28 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -108,7 +108,6 @@ 'audio_state.h', 'call.h', 'config.h', - 'frame_callback.h', 'stream.h', 'transport.h', 'video_receive_stream.h',