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

Move frame_callback.h to common_video/include.

Browse Source 
BUG=webrtc:4243
R=kjellander@webrtc.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1902543002

Cr-Commit-Position: refs/heads/master@{#12419}
This commit is contained in:
pbos
2016-04-18 21:12:48 -07:00
committed by Commit bot
parent 844f99351f
commit a96b60b3a6
16 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/BUILD.gn
View File

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

3
webrtc/DEPS
View File

@ -19,7 +19,6 @@ include_rules = [
"+webrtc/common_types.h", "+webrtc/common_types.h",
"+webrtc/config.h", "+webrtc/config.h",
"+webrtc/engine_configurations.h", "+webrtc/engine_configurations.h",
"+webrtc/frame_callback.h",
"+webrtc/stream.h", "+webrtc/stream.h",
"+webrtc/transport.h", "+webrtc/transport.h",
"+webrtc/typedefs.h", "+webrtc/typedefs.h",
@ -45,9 +44,11 @@ specific_include_rules = {
"+webrtc/common_video", "+webrtc/common_video",
], ],
"video_receive_stream\.h": [ "video_receive_stream\.h": [
"+webrtc/common_video/include",
"+webrtc/media/base", "+webrtc/media/base",
], ],
"video_send_stream\.h": [ "video_send_stream\.h": [
"+webrtc/common_video/include",
"+webrtc/media/base", "+webrtc/media/base",
], ],
} }

1
webrtc/common_video/BUILD.gn
View File

@ -18,6 +18,7 @@ config("common_video_config") {
source_set("common_video") { source_set("common_video") {
sources = [ sources = [
"i420_buffer_pool.cc", "i420_buffer_pool.cc",
"include/frame_callback.h",
"include/i420_buffer_pool.h", "include/i420_buffer_pool.h",
"include/incoming_video_stream.h", "include/incoming_video_stream.h",
"include/video_frame_buffer.h", "include/video_frame_buffer.h",

1
webrtc/common_video/common_video.gyp
View File

@ -55,6 +55,7 @@
'i420_buffer_pool.cc', 'i420_buffer_pool.cc',
'video_frame.cc', 'video_frame.cc',
'incoming_video_stream.cc', 'incoming_video_stream.cc',
'include/frame_callback.h',
'include/i420_buffer_pool.h', 'include/i420_buffer_pool.h',
'include/incoming_video_stream.h', 'include/incoming_video_stream.h',
'include/video_frame_buffer.h', 'include/video_frame_buffer.h',

6
webrtc/frame_callback.h → webrtc/common_video/include/frame_callback.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef WEBRTC_FRAME_CALLBACK_H_ #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_
#define WEBRTC_FRAME_CALLBACK_H_ #define WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -52,4 +52,4 @@ class EncodedFrameObserver {
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_FRAME_CALLBACK_H_ #endif // WEBRTC_COMMON_VIDEO_INCLUDE_FRAME_CALLBACK_H_

2
webrtc/modules/video_coding/video_coding_impl.h
View File

@ -16,10 +16,10 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "webrtc/frame_callback.h"
#include "webrtc/base/onetimeevent.h" #include "webrtc/base/onetimeevent.h"
#include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_annotations.h"
#include "webrtc/base/thread_checker.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/codec_database.h"
#include "webrtc/modules/video_coding/frame_buffer.h" #include "webrtc/modules/video_coding/frame_buffer.h"
#include "webrtc/modules/video_coding/generic_decoder.h" #include "webrtc/modules/video_coding/generic_decoder.h"

2
webrtc/video/encoded_frame_callback_adapter.h
View File

@ -11,8 +11,8 @@
#ifndef WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_ #ifndef WEBRTC_VIDEO_ENCODED_FRAME_CALLBACK_ADAPTER_H_
#define 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/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/frame_callback.h"
namespace webrtc { namespace webrtc {
namespace internal { namespace internal {

2
webrtc/video/end_to_end_tests.cc
View File

@ -22,7 +22,7 @@
#include "webrtc/base/timeutils.h" #include "webrtc/base/timeutils.h"
#include "webrtc/call.h" #include "webrtc/call.h"
#include "webrtc/call/transport_adapter.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/include/module_common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h" #include "webrtc/modules/rtp_rtcp/source/byte_io.h"

2
webrtc/video/overuse_frame_detector.cc
View File

@ -20,7 +20,7 @@
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/base/exp_filter.h" #include "webrtc/base/exp_filter.h"
#include "webrtc/base/logging.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/system_wrappers/include/clock.h"
#include "webrtc/video_frame.h" #include "webrtc/video_frame.h"

2
webrtc/video/receive_statistics_proxy.h
View File

@ -19,7 +19,7 @@
#include "webrtc/base/ratetracker.h" #include "webrtc/base/ratetracker.h"
#include "webrtc/base/thread_annotations.h" #include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.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/modules/video_coding/include/video_coding_defines.h"
#include "webrtc/video/report_block_stats.h" #include "webrtc/video/report_block_stats.h"
#include "webrtc/video/vie_channel.h" #include "webrtc/video/vie_channel.h"

2
webrtc/video/video_send_stream_tests.cc
View File

@ -21,7 +21,7 @@
#include "webrtc/base/platform_thread.h" #include "webrtc/base/platform_thread.h"
#include "webrtc/call.h" #include "webrtc/call.h"
#include "webrtc/call/transport_adapter.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_header_parser.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h" #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h" #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"

2
webrtc/video/vie_channel.cc
View File

@ -17,9 +17,9 @@
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/base/platform_thread.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/include/incoming_video_stream.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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/paced_sender.h"
#include "webrtc/modules/pacing/packet_router.h" #include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h" #include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"

2
webrtc/video/vie_encoder.cc
View File

@ -17,9 +17,9 @@
#include "webrtc/base/checks.h" #include "webrtc/base/checks.h"
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"
#include "webrtc/base/trace_event.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/include/video_image.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.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/paced_sender.h"
#include "webrtc/modules/utility/include/process_thread.h" #include "webrtc/modules/utility/include/process_thread.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h" #include "webrtc/modules/video_coding/include/video_codec_interface.h"

4
webrtc/video_receive_stream.h
View File

@ -17,11 +17,11 @@
#include <vector> #include <vector>
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/config.h" #include "webrtc/config.h"
#include "webrtc/frame_callback.h" #include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/stream.h" #include "webrtc/stream.h"
#include "webrtc/transport.h" #include "webrtc/transport.h"
#include "webrtc/media/base/videosinkinterface.h"
namespace webrtc { namespace webrtc {

2
webrtc/video_send_stream.h
View File

@ -15,8 +15,8 @@
#include <string> #include <string>
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/config.h" #include "webrtc/config.h"
#include "webrtc/frame_callback.h"
#include "webrtc/media/base/videosinkinterface.h" #include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/stream.h" #include "webrtc/stream.h"
#include "webrtc/transport.h" #include "webrtc/transport.h"

1
webrtc/webrtc.gyp
View File

@ -108,7 +108,6 @@
'audio_state.h', 'audio_state.h',
'call.h', 'call.h',
'config.h', 'config.h',
'frame_callback.h',
'stream.h', 'stream.h',
'transport.h', 'transport.h',
'video_receive_stream.h', 'video_receive_stream.h',