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

Delete unused argument |require_key_frame|

Browse Source 
Bug: webrtc:7408
Change-Id: I59e73e6c54de5b2d293b83d54556e3d3fc6180f4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181073
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31884}
This commit is contained in:
Niels Möller
2020-08-07 14:14:49 +02:00
committed by Commit Bot
parent fe4688edfa
commit 18c83d3f0b
11 changed files with 21 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/video_coding/decoder_database.cc
View File

@ -15,12 +15,8 @@
namespace webrtc {
VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings,
int number_of_cores,
bool require_key_frame)
: settings(settings),
number_of_cores(number_of_cores),
require_key_frame(require_key_frame) {
VCMDecoderMapItem::VCMDecoderMapItem(VideoCodec* settings, int number_of_cores)
: settings(settings), number_of_cores(number_of_cores) {
RTC_DCHECK_GE(number_of_cores, 0);
}
@ -75,16 +71,15 @@ void VCMDecoderDataBase::RegisterExternalDecoder(VideoDecoder* external_decoder,
}
bool VCMDecoderDataBase::RegisterReceiveCodec(const VideoCodec* receive_codec,
int number_of_cores,
bool require_key_frame) {
int number_of_cores) {
if (number_of_cores < 0) {
return false;
}
// If payload value already exists, erase old and insert new.
DeregisterReceiveCodec(receive_codec->plType);
VideoCodec* new_receive_codec = new VideoCodec(*receive_codec);
dec_map_[receive_codec->plType] = new VCMDecoderMapItem(
new_receive_codec, number_of_cores, require_key_frame);
dec_map_[receive_codec->plType] =
new VCMDecoderMapItem(new_receive_codec, number_of_cores);
return true;
}

8
modules/video_coding/decoder_database.h
View File

@ -20,14 +20,11 @@ namespace webrtc {
struct VCMDecoderMapItem {
public:
VCMDecoderMapItem(VideoCodec* settings,
int number_of_cores,
bool require_key_frame);
VCMDecoderMapItem(VideoCodec* settings, int number_of_cores);
~VCMDecoderMapItem();
std::unique_ptr<VideoCodec> settings;
int number_of_cores;
bool require_key_frame;
};
struct VCMExtDecoderMapItem {
@ -49,8 +46,7 @@ class VCMDecoderDataBase {
uint8_t payload_type);
bool RegisterReceiveCodec(const VideoCodec* receive_codec,
int number_of_cores,
bool require_key_frame);
int number_of_cores);
bool DeregisterReceiveCodec(uint8_t payload_type);
// Returns a decoder specified by frame.PayloadType. The decoded frame

3
modules/video_coding/include/video_coding.h
View File

@ -53,8 +53,7 @@ class VideoCodingModule : public Module {
// Return value : VCM_OK, on success.
// < 0, on error.
virtual int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame = false) = 0;
int32_t numberOfCores) = 0;
// Register an external decoder object.
//

6
modules/video_coding/video_coding_impl.cc
View File

@ -57,10 +57,8 @@ class VideoCodingModuleImpl : public VideoCodingModule {
void Process() override { receiver_.Process(); }
int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame) override {
return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores,
requireKeyFrame);
int32_t numberOfCores) override {
return receiver_.RegisterReceiveCodec(receiveCodec, numberOfCores);
}
void RegisterExternalDecoder(VideoDecoder* externalDecoder,

3
modules/video_coding/video_coding_impl.h
View File

@ -61,8 +61,7 @@ class VideoReceiver : public Module {
~VideoReceiver() override;
int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame);
int32_t numberOfCores);
void RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType);

6
modules/video_coding/video_receiver.cc
View File

@ -251,14 +251,12 @@ int32_t VideoReceiver::Decode(const VCMEncodedFrame& frame) {
// Register possible receive codecs, can be called multiple times
int32_t VideoReceiver::RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame) {
int32_t numberOfCores) {
RTC_DCHECK_RUN_ON(&construction_thread_checker_);
if (receiveCodec == nullptr) {
return VCM_PARAMETER_ERROR;
}
if (!_codecDataBase.RegisterReceiveCodec(receiveCodec, numberOfCores,
requireKeyFrame)) {
if (!_codecDataBase.RegisterReceiveCodec(receiveCodec, numberOfCores)) {
return -1;
}
return 0;

6
modules/video_coding/video_receiver2.cc
View File

@ -96,15 +96,13 @@ int32_t VideoReceiver2::Decode(const VCMEncodedFrame* frame) {
// Register possible receive codecs, can be called multiple times
int32_t VideoReceiver2::RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame) {
int32_t numberOfCores) {
RTC_DCHECK_RUN_ON(&construction_thread_checker_);
RTC_DCHECK(!IsDecoderThreadRunning());
if (receiveCodec == nullptr) {
return VCM_PARAMETER_ERROR;
}
if (!codecDataBase_.RegisterReceiveCodec(receiveCodec, numberOfCores,
requireKeyFrame)) {
if (!codecDataBase_.RegisterReceiveCodec(receiveCodec, numberOfCores)) {
return -1;
}
return 0;

3
modules/video_coding/video_receiver2.h
View File

@ -31,8 +31,7 @@ class VideoReceiver2 {
~VideoReceiver2();
int32_t RegisterReceiveCodec(const VideoCodec* receiveCodec,
int32_t numberOfCores,
bool requireKeyFrame);
int32_t numberOfCores);
void RegisterExternalDecoder(VideoDecoder* externalDecoder,
uint8_t payloadType);

2
modules/video_coding/video_receiver_unittest.cc
View File

@ -58,7 +58,7 @@ class TestVideoReceiver : public ::testing::Test {
receiver_.RegisterExternalDecoder(&decoder_, kUnusedPayloadType);
webrtc::test::CodecSettings(kVideoCodecVP8, &settings_);
settings_.plType = kUnusedPayloadType;
EXPECT_EQ(0, receiver_.RegisterReceiveCodec(&settings_, 1, true));
EXPECT_EQ(0, receiver_.RegisterReceiveCodec(&settings_, 1));
// Set protection mode.
const size_t kMaxNackListSize = 250;

4
video/video_receive_stream.cc
View File

@ -375,8 +375,8 @@ void VideoReceiveStream::Start() {
config_.rtp.raw_payload_types.count(codec.plType) > 0;
rtp_video_stream_receiver_.AddReceiveCodec(
codec, decoder.video_format.parameters, raw_payload);
RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
&codec, num_cpu_cores_, false));
RTC_CHECK_EQ(VCM_OK,
video_receiver_.RegisterReceiveCodec(&codec, num_cpu_cores_));
}
RTC_DCHECK(renderer != nullptr);

4
video/video_receive_stream2.cc
View File

@ -351,8 +351,8 @@ void VideoReceiveStream2::Start() {
config_.rtp.raw_payload_types.count(codec.plType) > 0;
rtp_video_stream_receiver_.AddReceiveCodec(
codec, decoder.video_format.parameters, raw_payload);
RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
&codec, num_cpu_cores_, false));
RTC_CHECK_EQ(VCM_OK,
video_receiver_.RegisterReceiveCodec(&codec, num_cpu_cores_));
}
RTC_DCHECK(renderer != nullptr);