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

Delete unused members of VideoCodecH264.

Browse Source 
profile-level-id for H.264 comes in through the SdpVideoFormat,
rather than through these members.

Bug: None
Change-Id: I9c4ea8873346ca16174aecf5f90a649cbaf913dd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132545
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27571}
This commit is contained in:
Rasmus Brandt
2019-04-11 13:26:25 +02:00
committed by Commit Bot
parent aac2cf66f2
commit 70c961f965
5 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/video_codecs/video_codec.cc
View File

@ -42,10 +42,7 @@ bool VideoCodecVP9::operator==(const VideoCodecVP9& other) const {
bool VideoCodecH264::operator==(const VideoCodecH264& other) const { bool VideoCodecH264::operator==(const VideoCodecH264& other) const {
return (frameDroppingOn == other.frameDroppingOn && return (frameDroppingOn == other.frameDroppingOn &&
keyFrameInterval == other.keyFrameInterval && keyFrameInterval == other.keyFrameInterval &&
spsLen == other.spsLen && ppsLen == other.ppsLen && numberOfTemporalLayers == other.numberOfTemporalLayers);
profile == other.profile &&
(spsLen == 0 || memcmp(spsData, other.spsData, spsLen) == 0) &&
(ppsLen == 0 || memcmp(ppsData, other.ppsData, ppsLen) == 0));
} }
bool SpatialLayer::operator==(const SpatialLayer& other) const { bool SpatialLayer::operator==(const SpatialLayer& other) const {

6
api/video_codecs/video_codec.h
View File

@ -80,12 +80,6 @@ struct VideoCodecH264 {
bool frameDroppingOn; bool frameDroppingOn;
int keyFrameInterval; int keyFrameInterval;
uint8_t numberOfTemporalLayers; uint8_t numberOfTemporalLayers;
// These are NULL/0 if not externally negotiated.
const uint8_t* spsData;
size_t spsLen;
const uint8_t* ppsData;
size_t ppsLen;
H264::Profile profile;
}; };
// Translates from name of codec to codec type and vice versa. // Translates from name of codec to codec type and vice versa.

5
api/video_codecs/video_encoder.cc
View File

@ -54,11 +54,6 @@ VideoCodecH264 VideoEncoder::GetDefaultH264Settings() {
h264_settings.frameDroppingOn = true; h264_settings.frameDroppingOn = true;
h264_settings.keyFrameInterval = 3000; h264_settings.keyFrameInterval = 3000;
h264_settings.numberOfTemporalLayers = 1; h264_settings.numberOfTemporalLayers = 1;
h264_settings.spsData = nullptr;
h264_settings.spsLen = 0;
h264_settings.ppsData = nullptr;
h264_settings.ppsLen = 0;
h264_settings.profile = H264::kProfileConstrainedBaseline;
return h264_settings; return h264_settings;
} }

1
modules/video_coding/codecs/test/videocodec_test_fixture_impl.cc
View File

@ -124,7 +124,6 @@ std::string CodecSpecificToString(const VideoCodec& codec) {
case kVideoCodecH264: case kVideoCodecH264:
ss << "frame_dropping: " << codec.H264().frameDroppingOn; ss << "frame_dropping: " << codec.H264().frameDroppingOn;
ss << "\nkey_frame_interval: " << codec.H264().keyFrameInterval; ss << "\nkey_frame_interval: " << codec.H264().keyFrameInterval;
ss << "\nprofile: " << codec.H264().profile;
break; break;
default: default:
break; break;

2
video/video_receive_stream.cc
View File

@ -79,8 +79,6 @@ VideoCodec CreateDecoderVideoCodec(const VideoReceiveStream::Decoder& decoder) {
*(codec.VP9()) = VideoEncoder::GetDefaultVp9Settings(); *(codec.VP9()) = VideoEncoder::GetDefaultVp9Settings();
} else if (codec.codecType == kVideoCodecH264) { } else if (codec.codecType == kVideoCodecH264) {
*(codec.H264()) = VideoEncoder::GetDefaultH264Settings(); *(codec.H264()) = VideoEncoder::GetDefaultH264Settings();
codec.H264()->profile =
H264::ParseSdpProfileLevelId(decoder.video_format.parameters)->profile;
} else if (codec.codecType == kVideoCodecMultiplex) { } else if (codec.codecType == kVideoCodecMultiplex) {
VideoReceiveStream::Decoder associated_decoder = decoder; VideoReceiveStream::Decoder associated_decoder = decoder;
associated_decoder.video_format = associated_decoder.video_format =