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

Unified Diff: webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc

Issue 1369923005: Remove kSkipFrame usage. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: bogus default return value for ConvertFrameType Created 5 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/modules/video_coding/codecs/vp8/vp8_impl.cc
diff --git a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
index 5714a07f2e38f5d8b5506047a8d55fc507b3dd63..e7a5b326ea4bfabc02c924683d01703f03363da8 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -1018,17 +1018,6 @@ int VP8EncoderImpl::GetEncodedPartitions(const VideoFrame& input_image,
} else if (codec_.mode == kScreensharing) {
result = WEBRTC_VIDEO_CODEC_TARGET_BITRATE_OVERSHOOT;
}
- } else {
- // Required in case padding is applied to dropped frames.
- encoded_images_[encoder_idx]._length = 0;
- encoded_images_[encoder_idx]._frameType = kSkipFrame;
- codec_specific.codecType = kVideoCodecVP8;
- CodecSpecificInfoVP8* vp8Info = &(codec_specific.codecSpecific.VP8);
- vp8Info->pictureId = picture_id_[stream_idx];
- vp8Info->simulcastIdx = stream_idx;
- vp8Info->keyIdx = kNoKeyIdx;
- encoded_complete_callback_->Encoded(encoded_images_[encoder_idx],
- &codec_specific, NULL);
}
}
if (encoders_.size() == 1 && send_stream_[0]) {
« no previous file with comments | « webrtc/modules/video_coding/codecs/vp8/simulcast_unittest.h ('k') | webrtc/modules/video_coding/main/source/encoded_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698