Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Unified Diff: webrtc/modules/video_coding/codec_database.cc

Issue 2001533003: Refactoring: Hide VideoCodec.codecSpecific as "private" (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Use initializers instead of memset Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/video_coding/codec_database.cc
diff --git a/webrtc/modules/video_coding/codec_database.cc b/webrtc/modules/video_coding/codec_database.cc
index 1baa414bce7469d3fa8b145cf2b1367af77e2aff..9603884925d16bb0b3464cdf4c231d257efde37e 100644
--- a/webrtc/modules/video_coding/codec_database.cc
+++ b/webrtc/modules/video_coding/codec_database.cc
@@ -132,7 +132,7 @@ void VCMCodecDataBase::Codec(VideoCodecType codec_type, VideoCodec* settings) {
settings->height = VCM_DEFAULT_CODEC_HEIGHT;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
- settings->codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings();
+ *(settings->VP8()) = VideoEncoder::GetDefaultVp8Settings();
return;
case kVideoCodecVP9:
strncpy(settings->plName, "VP9", 4);
@@ -147,7 +147,7 @@ void VCMCodecDataBase::Codec(VideoCodecType codec_type, VideoCodec* settings) {
settings->height = VCM_DEFAULT_CODEC_HEIGHT;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
- settings->codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings();
+ *(settings->VP9()) = VideoEncoder::GetDefaultVp9Settings();
return;
case kVideoCodecH264:
strncpy(settings->plName, "H264", 5);
@@ -162,7 +162,7 @@ void VCMCodecDataBase::Codec(VideoCodecType codec_type, VideoCodec* settings) {
settings->height = VCM_DEFAULT_CODEC_HEIGHT;
settings->numberOfSimulcastStreams = 0;
settings->qpMax = 56;
- settings->codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings();
+ *(settings->H264()) = VideoEncoder::GetDefaultH264Settings();
return;
case kVideoCodecI420:
strncpy(settings->plName, "I420", 5);
@@ -332,23 +332,20 @@ bool VCMCodecDataBase::RequiresEncoderReset(const VideoCodec& new_send_codec) {
switch (new_send_codec.codecType) {
case kVideoCodecVP8:
- if (memcmp(&new_send_codec.codecSpecific.VP8,
- &send_codec_.codecSpecific.VP8,
- sizeof(new_send_codec.codecSpecific.VP8)) != 0) {
+ if (memcmp(&new_send_codec.VP8(), send_codec_.VP8(),
+ sizeof(new_send_codec.VP8())) != 0) {
return true;
}
break;
case kVideoCodecVP9:
- if (memcmp(&new_send_codec.codecSpecific.VP9,
- &send_codec_.codecSpecific.VP9,
- sizeof(new_send_codec.codecSpecific.VP9)) != 0) {
+ if (memcmp(&new_send_codec.VP9(), send_codec_.VP9(),
+ sizeof(new_send_codec.VP9())) != 0) {
return true;
}
break;
case kVideoCodecH264:
- if (memcmp(&new_send_codec.codecSpecific.H264,
- &send_codec_.codecSpecific.H264,
- sizeof(new_send_codec.codecSpecific.H264)) != 0) {
+ if (memcmp(&new_send_codec.H264(), send_codec_.H264(),
+ sizeof(new_send_codec.H264())) != 0) {
return true;
}
break;

Powered by Google App Engine
This is Rietveld 408576698