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

@@ -169,7 +169,6 @@ source_set("webrtc") {
   sources = [
     "call.h",
     "config.h",
-    "frame_callback.h",
     "transport.h",
   ]
 

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",
   ],
 }

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",

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',

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 <stddef.h>
 #include <stdint.h>
@@ -52,4 +52,4 @@ class EncodedFrameObserver {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_FRAME_CALLBACK_H_
+#endif  // WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_

webrtc/modules/video_coding/video_coding_impl.h

@@ -16,10 +16,10 @@
 #include <memory>
 #include <vector>
 
-#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"

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 {

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"

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"
 

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"

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"

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"

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"

webrtc/video_receive_stream.h

@@ -17,11 +17,11 @@
 #include <vector>
 
 #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 {
 

webrtc/video_send_stream.h

@@ -15,8 +15,8 @@
 #include <string>
 
 #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"

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',