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

modules/video_coding/utility: Remove include

Browse Source 
This makes it clearer this code not meant to be used as an API.
I could not find any use of this in downstream code.

BUG=webrtc:5095
TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc
R=stefan@webrtc.org
TBR=magjed@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#10699}
This commit is contained in:
kjellander@webrtc.org
2015-11-18 23:04:10 +01:00
parent 1b20d81d35
commit b7ce96470b
20 changed files with 42 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,14 +94,14 @@ source_set("video_coding") {
source_set("video_coding_utility") {
sources = [
"utility/frame_dropper.cc",
"utility/include/frame_dropper.h",
"utility/include/moving_average.h",
"utility/include/qp_parser.h",
"utility/include/quality_scaler.h",
"utility/include/vp8_header_parser.h",
"utility/frame_dropper.h",
"utility/moving_average.h",
"utility/qp_parser.cc",
"utility/qp_parser.h",
"utility/quality_scaler.cc",
"utility/quality_scaler.h",
"utility/vp8_header_parser.cc",
"utility/vp8_header_parser.h",
]
configs += [ "../..:common_config" ]

2
webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h
View File

@ -15,7 +15,7 @@
#include "webrtc/base/timeutils.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/typedefs.h"
namespace webrtc {

2
webrtc/modules/video_coding/codecs/vp8/screenshare_layers_unittest.cc
View File

@ -14,7 +14,7 @@
#include "webrtc/base/scoped_ptr.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/screenshare_layers.h"
#include "webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h"
#include "webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h"
using ::testing::_;
using ::testing::NiceMock;

4
webrtc/modules/video_coding/codecs/vp8/vp8_impl.h
View File

@ -26,8 +26,8 @@
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/reference_picture_selection.h"
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/video_frame.h"
namespace webrtc {

2
webrtc/modules/video_coding/media_optimization.cc
View File

@ -13,7 +13,7 @@
#include "webrtc/base/logging.h"
#include "webrtc/modules/video_coding/content_metrics_processing.h"
#include "webrtc/modules/video_coding/qm_select.h"
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {

2
webrtc/modules/video_coding/utility/frame_dropper.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/system_wrappers/include/trace.h"

18
webrtc/modules/video_coding/utility/include/frame_dropper.h → webrtc/modules/video_coding/utility/frame_dropper.h
View File

@ -8,23 +8,21 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_FRAME_DROPPER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_FRAME_DROPPER_H_
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_
#include <cstddef>
#include "webrtc/base/exp_filter.h"
#include "webrtc/typedefs.h"
namespace webrtc
{
namespace webrtc {
// The Frame Dropper implements a variant of the leaky bucket algorithm
// for keeping track of when to drop frames to avoid bit rate
// over use when the encoder can't keep its bit rate.
class FrameDropper
{
public:
class FrameDropper {
public:
FrameDropper();
explicit FrameDropper(float max_time_drops);
virtual ~FrameDropper() {}
@ -69,7 +67,7 @@ public:
// instruction of when to drop frames.
virtual float ActualFrameRate(uint32_t inputFrameRate) const;
private:
private:
void FillBucket(float inKbits, float outKbits);
void UpdateRatio();
void CapAccumulator();
@ -91,8 +89,8 @@ private:
bool _fastMode;
float _cap_buffer_size;
float _max_time_drops;
}; // end of VCMFrameDropper class
}; // end of VCMFrameDropper class
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_FRAME_DROPPER_H_
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_FRAME_DROPPER_H_

8
webrtc/modules/video_coding/utility/include/mock/mock_frame_dropper.h → webrtc/modules/video_coding/utility/mock/mock_frame_dropper.h
View File

@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_MOCK_MOCK_FRAME_DROPPER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_MOCK_MOCK_FRAME_DROPPER_H_
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_
#include <string>
#include "testing/gmock/include/gmock/gmock.h"
#include "webrtc/modules/video_coding/utility/include/frame_dropper.h"
#include "webrtc/modules/video_coding/utility/frame_dropper.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -38,4 +38,4 @@ class MockFrameDropper : public FrameDropper {
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_INCLUDE_MOCK_MOCK_FRAME_DROPPER_H_
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOCK_MOCK_FRAME_DROPPER_H_

2
webrtc/modules/video_coding/utility/include/moving_average.h → webrtc/modules/video_coding/utility/moving_average.h
View File

@ -68,4 +68,4 @@ int MovingAverage<T>::size() {
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_MOVING_AVERAGE_SCALER_H_
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_MOVING_AVERAGE_H_

4
webrtc/modules/video_coding/utility/qp_parser.cc
View File

@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/include/qp_parser.h"
#include "webrtc/modules/video_coding/utility/qp_parser.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/video_coding/utility/include/vp8_header_parser.h"
#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
namespace webrtc {

0
webrtc/modules/video_coding/utility/include/qp_parser.h → webrtc/modules/video_coding/utility/qp_parser.h
View File

2
webrtc/modules/video_coding/utility/quality_scaler.cc
View File

@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
namespace webrtc {

2
webrtc/modules/video_coding/utility/include/quality_scaler.h → webrtc/modules/video_coding/utility/quality_scaler.h
View File

@ -12,7 +12,7 @@
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
#include "webrtc/common_video/libyuv/include/scaler.h"
#include "webrtc/modules/video_coding/utility/include/moving_average.h"
#include "webrtc/modules/video_coding/utility/moving_average.h"
namespace webrtc {
class QualityScaler {

2
webrtc/modules/video_coding/utility/quality_scaler_unittest.cc
View File

@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "testing/gtest/include/gtest/gtest.h"

10
webrtc/modules/video_coding/utility/video_coding_utility.gyp
View File

@ -19,14 +19,14 @@
],
'sources': [
'frame_dropper.cc',
'include/frame_dropper.h',
'include/moving_average.h',
'include/qp_parser.h',
'include/quality_scaler.h',
'include/vp8_header_parser.h',
'frame_dropper.h',
'moving_average.h',
'qp_parser.cc',
'qp_parser.h',
'quality_scaler.cc',
'quality_scaler.h',
'vp8_header_parser.cc',
'vp8_header_parser.h',
],
},
], # targets

2
webrtc/modules/video_coding/utility/vp8_header_parser.cc
View File

@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/modules/video_coding/utility/include/vp8_header_parser.h"
#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
#include "webrtc/base/logging.h"

6
webrtc/modules/video_coding/utility/include/vp8_header_parser.h → webrtc/modules/video_coding/utility/vp8_header_parser.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_PARSE_HEADER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_PARSE_HEADER_H_
#ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_
#define WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_
#include <stdint.h>
#include <stdio.h>
@ -77,4 +77,4 @@ bool GetQp(const uint8_t* buf, size_t length, int* qp);
} // namespace webrtc
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_PARSE_HEADER_H_
#endif // WEBRTC_MODULES_VIDEO_CODING_UTILITY_VP8_HEADER_PARSER_H_

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

@ -25,7 +25,7 @@
#include "webrtc/modules/video_coding/media_optimization.h"
#include "webrtc/modules/video_coding/receiver.h"
#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/modules/video_coding/utility/include/qp_parser.h"
#include "webrtc/modules/video_coding/utility/qp_parser.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"

2
webrtc/modules/video_coding/video_sender.cc
View File

@ -17,8 +17,8 @@
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/encoded_frame.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/modules/video_coding/utility/include/quality_scaler.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {