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

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

Issue 2380933003: Delete unused support for vp8 partitions. (Closed)
Patch Set: Created 4 years, 3 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 | « no previous file | webrtc/modules/video_coding/encoded_frame.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 01b3385fdd9189dafd93d3d1d946a3f91b35f86a..439f6afa3ed444e0365e0968f23894b91275bd78 100644
--- a/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
+++ b/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc
@@ -433,13 +433,7 @@ int VP8EncoderImpl::InitEncode(const VideoCodec* inst,
// drop support for libvpx 9.6.0.
break;
case kResilientFrames:
-#ifdef INDEPENDENT_PARTITIONS
- configurations_[0] - g_error_resilient =
- VPX_ERROR_RESILIENT_DEFAULT | VPX_ERROR_RESILIENT_PARTITIONS;
- break;
-#else
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER; // Not supported
-#endif
}
// rate control settings
@@ -1090,9 +1084,6 @@ int VP8DecoderImpl::InitDecode(const VideoCodec* inst, int number_of_cores) {
#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) && \
!defined(ANDROID)
flags = VPX_CODEC_USE_POSTPROC;
-#ifdef INDEPENDENT_PARTITIONS
- flags |= VPX_CODEC_USE_INPUT_PARTITION;
-#endif
#endif
if (vpx_codec_dec_init(decoder_, vpx_codec_vp8_dx(), &cfg, flags)) {
@@ -1129,12 +1120,6 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image,
return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
}
-#ifdef INDEPENDENT_PARTITIONS
- if (fragmentation == NULL) {
- return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
- }
-#endif
-
#if !defined(WEBRTC_ARCH_ARM) && !defined(WEBRTC_ARCH_ARM64) && \
!defined(ANDROID)
vp8_postproc_cfg_t ppcfg;
@@ -1194,15 +1179,6 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image,
iter = NULL;
}
-#ifdef INDEPENDENT_PARTITIONS
- if (DecodePartitions(inputImage, fragmentation)) {
- // Reset to avoid requesting key frames too often.
- if (propagation_cnt_ > 0) {
- propagation_cnt_ = 0;
- }
- return WEBRTC_VIDEO_CODEC_ERROR;
- }
-#else
uint8_t* buffer = input_image._buffer;
if (input_image._length == 0) {
buffer = NULL; // Triggers full frame concealment.
@@ -1215,7 +1191,6 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image,
}
return WEBRTC_VIDEO_CODEC_ERROR;
}
-#endif
img = vpx_codec_get_frame(decoder_, &iter);
ret = ReturnFrame(img, input_image._timeStamp, input_image.ntp_time_ms_);
@@ -1276,25 +1251,6 @@ int VP8DecoderImpl::Decode(const EncodedImage& input_image,
return WEBRTC_VIDEO_CODEC_OK;
}
-int VP8DecoderImpl::DecodePartitions(
- const EncodedImage& input_image,
- const RTPFragmentationHeader* fragmentation) {
- for (int i = 0; i < fragmentation->fragmentationVectorSize; ++i) {
- const uint8_t* partition =
- input_image._buffer + fragmentation->fragmentationOffset[i];
- const uint32_t partition_length = fragmentation->fragmentationLength[i];
- if (vpx_codec_decode(decoder_, partition, partition_length, 0,
- VPX_DL_REALTIME)) {
- return WEBRTC_VIDEO_CODEC_ERROR;
- }
- }
- // Signal end of frame data. If there was no frame data this will trigger
- // a full frame concealment.
- if (vpx_codec_decode(decoder_, NULL, 0, 0, VPX_DL_REALTIME))
- return WEBRTC_VIDEO_CODEC_ERROR;
- return WEBRTC_VIDEO_CODEC_OK;
-}
-
int VP8DecoderImpl::ReturnFrame(const vpx_image_t* img,
uint32_t timestamp,
int64_t ntp_time_ms) {
« no previous file with comments | « no previous file | webrtc/modules/video_coding/encoded_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698