admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove VideoFormat from WebRtcVideoEngine2.

Browse Source 
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}
This commit is contained in:
Peter Boström 2016-02-10 20:12:52 +01:00
parent 9c6a0c7f6d
commit 84d1f126d3
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/media/webrtc/webrtcvideoengine2.cc
View File

@ -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;

1
webrtc/media/webrtc/webrtcvideoengine2.h
View File

@ -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