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

Delete RTP-specific values from the VideoCodecType enum.

Browse Source 
Bug: None
Change-Id: Icd6a03f4dc7cfe074ba1e0370ed40938f0f1d7ed
Reviewed-on: https://webrtc-review.googlesource.com/80442
Reviewed-by: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23527}
This commit is contained in:
Niels Möller
2018-06-04 14:22:15 +02:00
committed by Commit Bot
parent 81327d54f3
commit 2b3af2e8be
7 changed files with 0 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common_types.cc
View File

@ -117,9 +117,6 @@ static const char* kPayloadNameVp8 = "VP8";
static const char* kPayloadNameVp9 = "VP9"; static const char* kPayloadNameVp9 = "VP9";
static const char* kPayloadNameH264 = "H264"; static const char* kPayloadNameH264 = "H264";
static const char* kPayloadNameI420 = "I420"; static const char* kPayloadNameI420 = "I420";
static const char* kPayloadNameRED = "RED";
static const char* kPayloadNameULPFEC = "ULPFEC";
static const char* kPayloadNameFlexfec = "flexfec-03";
static const char* kPayloadNameGeneric = "Generic"; static const char* kPayloadNameGeneric = "Generic";
static const char* kPayloadNameMultiplex = "Multiplex"; static const char* kPayloadNameMultiplex = "Multiplex";
@ -137,12 +134,6 @@ const char* CodecTypeToPayloadString(VideoCodecType type) {
return kPayloadNameH264; return kPayloadNameH264;
case kVideoCodecI420: case kVideoCodecI420:
return kPayloadNameI420; return kPayloadNameI420;
case kVideoCodecRED:
return kPayloadNameRED;
case kVideoCodecULPFEC:
return kPayloadNameULPFEC;
case kVideoCodecFlexfec:
return kPayloadNameFlexfec;
// Other codecs default to generic. // Other codecs default to generic.
case kVideoCodecMultiplex: case kVideoCodecMultiplex:
case kVideoCodecGeneric: case kVideoCodecGeneric:
@ -161,12 +152,6 @@ VideoCodecType PayloadStringToCodecType(const std::string& name) {
return kVideoCodecH264; return kVideoCodecH264;
if (CodecNamesEq(name.c_str(), kPayloadNameI420)) if (CodecNamesEq(name.c_str(), kPayloadNameI420))
return kVideoCodecI420; return kVideoCodecI420;
if (CodecNamesEq(name.c_str(), kPayloadNameRED))
return kVideoCodecRED;
if (CodecNamesEq(name.c_str(), kPayloadNameULPFEC))
return kVideoCodecULPFEC;
if (CodecNamesEq(name.c_str(), kPayloadNameFlexfec))
return kVideoCodecFlexfec;
if (CodecNamesEq(name.c_str(), kPayloadNameMultiplex)) if (CodecNamesEq(name.c_str(), kPayloadNameMultiplex))
return kVideoCodecMultiplex; return kVideoCodecMultiplex;
return kVideoCodecGeneric; return kVideoCodecGeneric;

3
common_types.h
View File

@ -412,9 +412,6 @@ enum VideoCodecType {
kVideoCodecVP9, kVideoCodecVP9,
kVideoCodecH264, kVideoCodecH264,
kVideoCodecI420, kVideoCodecI420,
kVideoCodecRED,
kVideoCodecULPFEC,
kVideoCodecFlexfec,
kVideoCodecGeneric, kVideoCodecGeneric,
kVideoCodecMultiplex, kVideoCodecMultiplex,

3
common_video/video_frame.cc
View File

@ -31,9 +31,6 @@ size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
case kVideoCodecH264: case kVideoCodecH264:
return kBufferPaddingBytesH264; return kBufferPaddingBytesH264;
case kVideoCodecI420: case kVideoCodecI420:
case kVideoCodecRED:
case kVideoCodecULPFEC:
case kVideoCodecFlexfec:
case kVideoCodecGeneric: case kVideoCodecGeneric:
case kVideoCodecMultiplex: case kVideoCodecMultiplex:
case kVideoCodecUnknown: case kVideoCodecUnknown:

3
modules/rtp_rtcp/source/rtp_payload_registry.cc
View File

@ -54,9 +54,6 @@ RtpVideoCodecTypes ConvertToRtpVideoCodecType(VideoCodecType type) {
case kVideoCodecVP9: case kVideoCodecVP9:
case kVideoCodecH264: case kVideoCodecH264:
return type; return type;
case kVideoCodecRED:
case kVideoCodecULPFEC:
return kVideoCodecUnknown;
default: default:
return kVideoCodecGeneric; return kVideoCodecGeneric;
} }

3
modules/video_coding/encoder_database.cc
View File

@ -159,9 +159,6 @@ bool VCMEncoderDataBase::RequiresEncoderReset(
break; break;
// Known codecs without payload-specifics // Known codecs without payload-specifics
case kVideoCodecI420: case kVideoCodecI420:
case kVideoCodecRED:
case kVideoCodecULPFEC:
case kVideoCodecFlexfec:
case kVideoCodecMultiplex: case kVideoCodecMultiplex:
break; break;
// Unknown codec type, reset just to be sure. // Unknown codec type, reset just to be sure.

5
modules/video_coding/rtp_frame_reference_finder.cc
View File

@ -83,11 +83,6 @@ void RtpFrameReferenceFinder::RetryStashedFrames() {
RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::FrameDecision
RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) { RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) {
switch (frame->codec_type()) { switch (frame->codec_type()) {
case kVideoCodecFlexfec:
case kVideoCodecULPFEC:
case kVideoCodecRED:
RTC_NOTREACHED();
break;
case kVideoCodecVP8: case kVideoCodecVP8:
return ManageFrameVp8(frame); return ManageFrameVp8(frame);
case kVideoCodecVP9: case kVideoCodecVP9:

3
test/video_codec_settings.h
View File

@ -69,9 +69,6 @@ static void CodecSettings(VideoCodecType codec_type, VideoCodec* settings) {
3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2; 3 * kTestWidth * kTestHeight * 8 * kTestFrameRate / 1000 / 2;
settings->maxBitrate = settings->startBitrate; settings->maxBitrate = settings->startBitrate;
return; return;
case kVideoCodecRED:
case kVideoCodecULPFEC:
case kVideoCodecFlexfec:
case kVideoCodecMultiplex: case kVideoCodecMultiplex:
case kVideoCodecGeneric: case kVideoCodecGeneric:
case kVideoCodecUnknown: case kVideoCodecUnknown: