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

Remove kVideoCodecUnknown from WebRTC.

Browse Source 
There is no difference between how we handle "generic" and "unkown" codecs,
so we don't need to represent both.

Bug: webrtc:8136
Change-Id: I42b0dbc8a0bae67cc21742303c963c8dd5bde1f6
Reviewed-on: https://webrtc-review.googlesource.com/92086
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Kári Helgason <kthelgason@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24316}
This commit is contained in:
Kári Tristan Helgason
2018-08-16 14:35:26 +02:00
committed by Commit Bot
parent fa2b2d62d7
commit 84ccb2de77
14 changed files with 22 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/video_coding/decoder_database.cc
View File

@ -81,9 +81,6 @@ bool VCMDecoderDataBase::RegisterReceiveCodec(const VideoCodec* receive_codec,
}
// If payload value already exists, erase old and insert new.
DeregisterReceiveCodec(receive_codec->plType);
if (receive_codec->codecType == kVideoCodecUnknown) {
return false;
}
VideoCodec* new_receive_codec = new VideoCodec(*receive_codec);
dec_map_[receive_codec->plType] = new VCMDecoderMapItem(
new_receive_codec, number_of_cores, require_key_frame);

10
modules/video_coding/encoded_frame.cc
View File

@ -17,9 +17,9 @@ VCMEncodedFrame::VCMEncodedFrame()
_renderTimeMs(-1),
_payloadType(0),
_missingFrame(false),
_codec(kVideoCodecUnknown),
_codec(kVideoCodecGeneric),
_rotation_set(false) {
_codecSpecificInfo.codecType = kVideoCodecUnknown;
_codecSpecificInfo.codecType = kVideoCodecGeneric;
}
VCMEncodedFrame::~VCMEncodedFrame() {
@ -44,8 +44,8 @@ void VCMEncodedFrame::Reset() {
_completeFrame = false;
_missingFrame = false;
_length = 0;
_codecSpecificInfo.codecType = kVideoCodecUnknown;
_codec = kVideoCodecUnknown;
_codecSpecificInfo.codecType = kVideoCodecGeneric;
_codec = kVideoCodecGeneric;
rotation_ = kVideoRotation_0;
content_type_ = VideoContentType::UNSPECIFIED;
timing_.flags = VideoSendTiming::kInvalid;
@ -138,7 +138,7 @@ void VCMEncodedFrame::CopyCodecSpecific(const RTPVideoHeader* header) {
break;
}
default: {
_codecSpecificInfo.codecType = kVideoCodecUnknown;
_codecSpecificInfo.codecType = kVideoCodecGeneric;
break;
}
}

10
modules/video_coding/encoder_database.cc
View File

@ -44,7 +44,6 @@ bool VCMEncoderDataBase::SetSendCodec(const VideoCodec* send_codec,
RTC_DCHECK_GE(number_of_cores, 1);
// Make sure the start bit rate is sane...
RTC_DCHECK_LE(send_codec->startBitrate, 1000000);
RTC_DCHECK(send_codec->codecType != kVideoCodecUnknown);
bool reset_required = pending_encoder_reset_;
if (number_of_cores_ != number_of_cores) {
number_of_cores_ = number_of_cores;
@ -155,15 +154,8 @@ bool VCMEncoderDataBase::RequiresEncoderReset(
}
break;
case kVideoCodecGeneric:
default:
break;
// Known codecs without payload-specifics
case kVideoCodecI420:
case kVideoCodecMultiplex:
break;
// Unknown codec type, reset just to be sure.
case kVideoCodecUnknown:
return true;
}
for (unsigned char i = 0; i < new_send_codec.numberOfSimulcastStreams; ++i) {

2
modules/video_coding/generic_decoder.cc
View File

@ -188,7 +188,7 @@ VCMGenericDecoder::VCMGenericDecoder(VideoDecoder* decoder, bool isExternal)
_frameInfos(),
_nextFrameInfoIdx(0),
decoder_(decoder),
_codecType(kVideoCodecUnknown),
_codecType(kVideoCodecGeneric),
_isExternal(isExternal),
_last_keyframe_content_type(VideoContentType::UNSPECIFIED) {
RTC_DCHECK(decoder_);

2
modules/video_coding/generic_encoder.cc
View File

@ -43,7 +43,7 @@ VCMGenericEncoder::VCMGenericEncoder(
internal_source_(internal_source),
encoder_params_({VideoBitrateAllocation(), 0, 0, 0}),
streams_or_svc_num_(0),
codec_type_(VideoCodecType::kVideoCodecUnknown) {}
codec_type_(VideoCodecType::kVideoCodecGeneric) {}
VCMGenericEncoder::~VCMGenericEncoder() {}

2
modules/video_coding/include/video_codec_interface.h
View File

@ -83,7 +83,7 @@ union CodecSpecificInfoUnion {
// must be fitted with a copy-constructor. This is because it is copied
// in the copy-constructor of VCMEncodedFrame.
struct CodecSpecificInfo {
CodecSpecificInfo() : codecType(kVideoCodecUnknown), codec_name(nullptr) {
CodecSpecificInfo() : codecType(kVideoCodecGeneric), codec_name(nullptr) {
memset(&codecSpecific, 0, sizeof(codecSpecific));
}
VideoCodecType codecType;

2
modules/video_coding/packet.cc
View File

@ -26,7 +26,7 @@ VCMPacket::VCMPacket()
markerBit(false),
timesNacked(-1),
frameType(kEmptyFrame),
codec(kVideoCodecUnknown),
codec(kVideoCodecGeneric),
is_first_packet_in_frame(false),
completeNALU(kNaluUnset),
insertStartCode(false),

14
modules/video_coding/rtp_frame_reference_finder.cc
View File

@ -88,21 +88,9 @@ RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) {
return ManageFrameVp8(frame);
case kVideoCodecVP9:
return ManageFrameVp9(frame);
// Since the EndToEndTests use kVicdeoCodecUnknow we treat it the same as
// kVideoCodecGeneric.
// TODO(philipel): Take a look at the EndToEndTests and see if maybe they
// should be changed to use kVideoCodecGeneric instead.
case kVideoCodecUnknown:
case kVideoCodecH264:
case kVideoCodecI420:
case kVideoCodecMultiplex:
case kVideoCodecGeneric:
default:
return ManageFrameGeneric(frame, kNoPictureId);
}
// If not all code paths return a value it makes the win compiler sad.
RTC_NOTREACHED();
return kDrop;
}
void RtpFrameReferenceFinder::PaddingReceived(uint16_t seq_num) {

2
modules/video_coding/utility/ivf_file_writer.cc
View File

@ -25,7 +25,7 @@ namespace webrtc {
const size_t kIvfHeaderSize = 32;
IvfFileWriter::IvfFileWriter(rtc::File file, size_t byte_limit)
: codec_type_(kVideoCodecUnknown),
: codec_type_(kVideoCodecGeneric),
bytes_written_(0),
byte_limit_(byte_limit),
num_frames_(0),