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

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

Issue 1677853002: Remove VideoFormat from WebRtcVideoEngine2. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/webrtc/webrtcvideoengine2.cc
diff --git a/webrtc/media/webrtc/webrtcvideoengine2.cc b/webrtc/media/webrtc/webrtcvideoengine2.cc
index 0489198fac4eb1abda963699fc11603339fbfb8c..04dc0e49869f12ac7b61ed03a03dd2e05a8ac1be 100644
--- a/webrtc/media/webrtc/webrtcvideoengine2.cc
+++ b/webrtc/media/webrtc/webrtcvideoengine2.cc
@@ -1589,11 +1589,6 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::InputFrame(
if (!sending_)
return;
- if (format_.width == 0) { // Dropping frames.
- RTC_DCHECK(format_.height == 0);
- LOG(LS_VERBOSE) << "VideoFormat 0x0 set, Dropping frame.";
- return;
- }
if (muted_) {
// Create a black frame to transmit instead.
CreateBlackFrame(&video_frame,
@@ -1643,8 +1638,7 @@ bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer(
// timestamp is less than or equal to last frame's timestamp, it is
// necessary to give this black frame a larger timestamp than the
// previous one.
- last_frame_timestamp_ms_ +=
- format_.interval / rtc::kNumNanosecsPerMillisec;
+ last_frame_timestamp_ms_ += 1;
black_frame.set_render_time_ms(last_frame_timestamp_ms_);
stream_->Input()->IncomingCapturedFrame(black_frame);
}
@@ -1761,11 +1755,6 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::SetCodecAndOptions(
CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec);
RTC_DCHECK(!parameters_.encoder_config.streams.empty());
- format_ = VideoFormat(codec_settings.codec.width,
- codec_settings.codec.height,
- VideoFormat::FpsToInterval(30),
- FOURCC_I420);
-
AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec);
parameters_.config.encoder_settings.encoder = new_encoder.encoder;
parameters_.config.encoder_settings.full_overuse_time = new_encoder.external;
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoengine2.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698