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

Unified Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 2408153002: Remove cricket::VideoCodec with, height and framerate properties (Closed)
Patch Set: rebased Created 4 years, 2 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/media/engine/webrtcvideoengine2.cc
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc
index 4e22a487a2fb86324c25aa5cc4b2520f02ff3656..badd27ae50660779da43f4dd7af3435a92b61335 100644
--- a/webrtc/media/engine/webrtcvideoengine2.cc
+++ b/webrtc/media/engine/webrtcvideoengine2.cc
@@ -183,8 +183,7 @@ void AddDefaultFeedbackParams(VideoCodec* codec) {
static VideoCodec MakeVideoCodecWithDefaultFeedbackParams(int payload_type,
const char* name) {
- VideoCodec codec(payload_type, name, kDefaultVideoMaxWidth,
- kDefaultVideoMaxHeight, kDefaultVideoMaxFramerate);
+ VideoCodec codec(payload_type, name);
AddDefaultFeedbackParams(&codec);
return codec;
}
@@ -675,9 +674,7 @@ std::vector<VideoCodec> WebRtcVideoEngine2::GetSupportedCodecs() const {
const int kExternalVideoPayloadTypeBase = 120;
size_t payload_type = kExternalVideoPayloadTypeBase + i;
RTC_DCHECK(payload_type < 128);
- VideoCodec codec(static_cast<int>(payload_type), codecs[i].name,
- codecs[i].max_width, codecs[i].max_height,
- codecs[i].max_fps);
+ VideoCodec codec(static_cast<int>(payload_type), codecs[i].name);
AddDefaultFeedbackParams(&codec);
AddCodecAndMaybeRtxCodec(codec, &supported_codecs);
@@ -2006,12 +2003,9 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::CreateVideoEncoderConfig(
int max_qp = kDefaultQpMax;
codec.GetParam(kCodecParamMaxQuantization, &max_qp);
- int max_framerate =
- codec.framerate != 0 ? codec.framerate : kDefaultVideoMaxFramerate;
-
encoder_config.video_stream_factory =
new rtc::RefCountedObject<EncoderStreamFactory>(
- codec.name, max_qp, max_framerate, is_screencast,
+ codec.name, max_qp, kDefaultVideoMaxFramerate, is_screencast,
parameters_.conference_mode);
return encoder_config;
}

Powered by Google App Engine
This is Rietveld 408576698