From 84d1f126d38f2256fb19e59224320563d554d857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Wed, 10 Feb 2016 20:12:52 +0100 Subject: [PATCH] Remove VideoFormat from WebRtcVideoEngine2. No longer used since SendStreamFormat has been removed. BUG=webrtc:5332 R=pthatcher@webrtc.org Review URL: https://codereview.webrtc.org/1677853002 . Cr-Commit-Position: refs/heads/master@{#11557} --- webrtc/media/webrtc/webrtcvideoengine2.cc | 13 +------------ webrtc/media/webrtc/webrtcvideoengine2.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/webrtc/media/webrtc/webrtcvideoengine2.cc b/webrtc/media/webrtc/webrtcvideoengine2.cc index bae29ad640..c2b65ced27 100644 --- a/webrtc/media/webrtc/webrtcvideoengine2.cc +++ b/webrtc/media/webrtc/webrtcvideoengine2.cc @@ -1572,11 +1572,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, @@ -1626,8 +1621,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); } @@ -1744,11 +1738,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; diff --git a/webrtc/media/webrtc/webrtcvideoengine2.h b/webrtc/media/webrtc/webrtcvideoengine2.h index 4407253764..98bad0f007 100644 --- a/webrtc/media/webrtc/webrtcvideoengine2.h +++ b/webrtc/media/webrtc/webrtcvideoengine2.h @@ -349,7 +349,6 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, VideoCapturer* capturer_ GUARDED_BY(lock_); bool sending_ GUARDED_BY(lock_); bool muted_ GUARDED_BY(lock_); - VideoFormat format_ GUARDED_BY(lock_); int old_adapt_changes_ GUARDED_BY(lock_); // The timestamp of the first frame received