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

Move BitrateAdjuster into common_video

Browse Source 
This CL moves BitrateAdjuster into common_video folder as it
was suggested on [0] such that it can be properly linked with
Chrome projects.

[0] https://codereview.chromium.org/1818903004/

BUG=500605

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

Cr-Commit-Position: refs/heads/master@{#12515}
This commit is contained in:
emircan
2016-04-26 12:55:07 -07:00
committed by Commit bot
parent 1d9061e8ae
commit 55a401e607
10 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/common_video/BUILD.gn
View File

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

2
webrtc/modules/video_coding/bitrate_adjuster.cc → webrtc/common_video/bitrate_adjuster.cc
View File

@ -8,7 +8,7 @@
* 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.
*/ */
#include "webrtc/modules/video_coding/include/bitrate_adjuster.h" #include "webrtc/common_video/include/bitrate_adjuster.h"
#include <cmath> #include <cmath>

2
webrtc/modules/video_coding/bitrate_adjuster_unittest.cc → webrtc/common_video/bitrate_adjuster_unittest.cc
View File

@ -10,7 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/video_coding/include/bitrate_adjuster.h" #include "webrtc/common_video/include/bitrate_adjuster.h"
#include "webrtc/system_wrappers/include/clock.h" #include "webrtc/system_wrappers/include/clock.h"
namespace webrtc { namespace webrtc {

2
webrtc/common_video/common_video.gyp
View File

@ -52,9 +52,11 @@
}], }],
], ],
'sources': [ 'sources': [
'bitrate_adjuster.cc',
'i420_buffer_pool.cc', 'i420_buffer_pool.cc',
'video_frame.cc', 'video_frame.cc',
'incoming_video_stream.cc', 'incoming_video_stream.cc',
'include/bitrate_adjuster.h',
'include/frame_callback.h', 'include/frame_callback.h',
'include/i420_buffer_pool.h', 'include/i420_buffer_pool.h',
'include/incoming_video_stream.h', 'include/incoming_video_stream.h',

1
webrtc/common_video/common_video_unittests.gyp
View File

@ -20,6 +20,7 @@
'<(webrtc_root)/test/test.gyp:video_test_common', '<(webrtc_root)/test/test.gyp:video_test_common',
], ],
'sources': [ 'sources': [
'bitrate_adjuster_unittest.cc',
'i420_buffer_pool_unittest.cc', 'i420_buffer_pool_unittest.cc',
'i420_video_frame_unittest.cc', 'i420_video_frame_unittest.cc',
'libyuv/libyuv_unittest.cc', 'libyuv/libyuv_unittest.cc',

6
webrtc/modules/video_coding/include/bitrate_adjuster.h → webrtc/common_video/include/bitrate_adjuster.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_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_ #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_
#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_ #define WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_
#include <functional> #include <functional>
@ -86,4 +86,4 @@ class BitrateAdjuster {
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_INCLUDE_BITRATE_ADJUSTER_H_ #endif // WEBRTC_COMMON_VIDEO_INCLUDE_BITRATE_ADJUSTER_H_

1
webrtc/modules/modules.gyp
View File

@ -364,7 +364,6 @@
'video_coding/codecs/vp8/simulcast_unittest.h', 'video_coding/codecs/vp8/simulcast_unittest.h',
'video_coding/codecs/vp9/screenshare_layers_unittest.cc', 'video_coding/codecs/vp9/screenshare_layers_unittest.cc',
'video_coding/include/mock/mock_vcm_callbacks.h', 'video_coding/include/mock/mock_vcm_callbacks.h',
'video_coding/bitrate_adjuster_unittest.cc',
'video_coding/decoding_state_unittest.cc', 'video_coding/decoding_state_unittest.cc',
'video_coding/histogram_unittest.cc', 'video_coding/histogram_unittest.cc',
'video_coding/jitter_buffer_unittest.cc', 'video_coding/jitter_buffer_unittest.cc',

2
webrtc/modules/video_coding/BUILD.gn
View File

@ -10,8 +10,6 @@ import("../../build/webrtc.gni")
source_set("video_coding") { source_set("video_coding") {
sources = [ sources = [
"bitrate_adjuster.cc",
"bitrate_adjuster.h",
"codec_database.cc", "codec_database.cc",
"codec_database.h", "codec_database.h",
"codec_timer.cc", "codec_timer.cc",

2
webrtc/modules/video_coding/codecs/h264/h264_video_toolbox_encoder.h
View File

@ -12,9 +12,9 @@
#ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_ #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
#define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_ #define WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_VIDEO_TOOLBOX_ENCODER_H_
#include "webrtc/common_video/include/bitrate_adjuster.h"
#include "webrtc/common_video/rotation.h" #include "webrtc/common_video/rotation.h"
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h" #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/include/bitrate_adjuster.h"
#if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED) #if defined(WEBRTC_VIDEO_TOOLBOX_SUPPORTED)

2
webrtc/modules/video_coding/video_coding.gypi
View File

@ -22,7 +22,6 @@
], ],
'sources': [ 'sources': [
# interfaces # interfaces
'include/bitrate_adjuster.h',
'include/video_coding.h', 'include/video_coding.h',
'include/video_coding_defines.h', 'include/video_coding_defines.h',
@ -60,7 +59,6 @@
'video_coding_impl.h', 'video_coding_impl.h',
# sources # sources
'bitrate_adjuster.cc',
'codec_database.cc', 'codec_database.cc',
'codec_timer.cc', 'codec_timer.cc',
'content_metrics_processing.cc', 'content_metrics_processing.cc',