admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated variant of RtpVideoStreamReceiver::AddReceiveCodec

Browse Source 
Bug: None
Change-Id: I231967ca6777ec2fcbc6bdeef432267525182198
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181361
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31906}
This commit is contained in:
Niels Möller 2020-08-11 09:41:34 +02:00 committed by Commit Bot
parent 64a60835a1
commit f867ba8b5d
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
video/rtp_video_stream_receiver.h
View File

@ -115,12 +115,6 @@ class RtpVideoStreamReceiver : public LossNotificationSender,
rtc::scoped_refptr<FrameTransformerInterface> frame_transformer);
~RtpVideoStreamReceiver() override;
// TODO(nisse): Deprecated, to be deleted together with VideoCodec::plType.
void AddReceiveCodec(const VideoCodec& video_codec,
const std::map<std::string, std::string>& codec_params,
bool raw_payload) {
AddReceiveCodec(video_codec.plType, video_codec, codec_params, raw_payload);
}
void AddReceiveCodec(uint8_t payload_type,
const VideoCodec& video_codec,
const std::map<std::string, std::string>& codec_params,

20
video/rtp_video_stream_receiver_unittest.cc
View File

@ -180,7 +180,7 @@ class RtpVideoStreamReceiverTest : public ::testing::Test {
VideoCodec codec;
codec.plType = kPayloadType;
codec.codecType = kVideoCodecGeneric;
rtp_video_stream_receiver_->AddReceiveCodec(codec, {},
rtp_video_stream_receiver_->AddReceiveCodec(kPayloadType, codec, {},
/*raw_payload=*/false);
}
@ -315,7 +315,8 @@ TEST_F(RtpVideoStreamReceiverTest, CacheColorSpaceFromLastPacketOfKeyframe) {
codec.plType = kVp9PayloadType;
codec.codecType = kVideoCodecVP9;
std::map<std::string, std::string> codec_params;
rtp_video_stream_receiver_->AddReceiveCodec(codec, codec_params,
rtp_video_stream_receiver_->AddReceiveCodec(kVp9PayloadType, codec,
codec_params,
/*raw_payload=*/false);
// Generate key frame packets.
@ -574,7 +575,7 @@ TEST_P(RtpVideoStreamReceiverTestH264, OutOfBandFmtpSpsPps) {
// .
codec_params.insert(
{cricket::kH264FmtpSpropParameterSets, "Z0IACpZTBYmI,aMljiA=="});
rtp_video_stream_receiver_->AddReceiveCodec(codec, codec_params,
rtp_video_stream_receiver_->AddReceiveCodec(kPayloadType, codec, codec_params,
/*raw_payload=*/false);
const uint8_t binary_sps[] = {0x67, 0x42, 0x00, 0x0a, 0x96,
0x53, 0x05, 0x89, 0x88};
@ -616,7 +617,7 @@ TEST_P(RtpVideoStreamReceiverTestH264, ForceSpsPpsIdrIsKeyframe) {
"") { // Forcing can be done either with field trial or codec_params.
codec_params.insert({cricket::kH264FmtpSpsPpsIdrInKeyframe, ""});
}
rtp_video_stream_receiver_->AddReceiveCodec(codec, codec_params,
rtp_video_stream_receiver_->AddReceiveCodec(kPayloadType, codec, codec_params,
/*raw_payload=*/false);
rtc::CopyOnWriteBuffer sps_data;
RtpPacketReceived rtp_packet;
@ -937,7 +938,8 @@ TEST_F(RtpVideoStreamReceiverTest, ParseGenericDescriptorRawPayload) {
VideoCodec codec;
codec.plType = kRawPayloadType;
rtp_video_stream_receiver_->AddReceiveCodec(codec, {}, /*raw_payload=*/true);
rtp_video_stream_receiver_->AddReceiveCodec(kRawPayloadType, codec, {},
/*raw_payload=*/true);
rtp_video_stream_receiver_->StartReceive();
RtpHeaderExtensionMap extension_map;
@ -969,7 +971,8 @@ TEST_F(RtpVideoStreamReceiverTest, UnwrapsFrameId) {
VideoCodec codec;
codec.plType = kPayloadType;
rtp_video_stream_receiver_->AddReceiveCodec(codec, {}, /*raw_payload=*/true);
rtp_video_stream_receiver_->AddReceiveCodec(kPayloadType, codec, {},
/*raw_payload=*/true);
rtp_video_stream_receiver_->StartReceive();
RtpHeaderExtensionMap extension_map;
extension_map.Register<RtpGenericFrameDescriptorExtension00>(5);
@ -1017,7 +1020,7 @@ class RtpVideoStreamReceiverDependencyDescriptorTest
RtpVideoStreamReceiverDependencyDescriptorTest() {
VideoCodec codec;
codec.plType = payload_type_;
rtp_video_stream_receiver_->AddReceiveCodec(codec, {},
rtp_video_stream_receiver_->AddReceiveCodec(payload_type_, codec, {},
/*raw_payload=*/true);
extension_map_.Register<RtpDependencyDescriptorExtension>(7);
rtp_video_stream_receiver_->StartReceive();
@ -1202,7 +1205,8 @@ TEST_F(RtpVideoStreamReceiverTest, TransformFrame) {
VideoCodec video_codec;
video_codec.plType = kPayloadType;
video_codec.codecType = kVideoCodecGeneric;
receiver->AddReceiveCodec(video_codec, {}, /*raw_payload=*/false);
receiver->AddReceiveCodec(kPayloadType, video_codec, {},
/*raw_payload=*/false);
RtpPacketReceived rtp_packet;
rtp_packet.SetPayloadType(kPayloadType);

7
video/video_receive_stream.cc
View File

@ -372,9 +372,10 @@ void VideoReceiveStream::Start() {
VideoCodec codec = CreateDecoderVideoCodec(decoder);
const bool raw_payload =
config_.rtp.raw_payload_types.count(codec.plType) > 0;
rtp_video_stream_receiver_.AddReceiveCodec(
codec, decoder.video_format.parameters, raw_payload);
config_.rtp.raw_payload_types.count(decoder.payload_type) > 0;
rtp_video_stream_receiver_.AddReceiveCodec(decoder.payload_type, codec,
decoder.video_format.parameters,
raw_payload);
RTC_CHECK_EQ(VCM_OK, video_receiver_.RegisterReceiveCodec(
decoder.payload_type, &codec, num_cpu_cores_));
}