From bbf46c27538cc5e98cff9cac935b0a72968c796e Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Wed, 31 Jan 2018 10:54:06 +0000 Subject: [PATCH] Revert "Set actual resolution for coded frame in VP9 enc wrapper." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4e53a0f384f46816a56f7d1aa9811e87b9c367d9. Reason for revert: breaks downstream projects Original change's description: > Set actual resolution for coded frame in VP9 enc wrapper. > > This fix the mismatch of resolution VP9 wrapper set for coded frame with > its actual resolution. > > Bug: webm:1485, webrtc:5749 > Change-Id: Ie1225d8f3a3d00e66229a1a79858d0a89b3d5fae > Reviewed-on: https://webrtc-review.googlesource.com/46040 > Reviewed-by: Åsa Persson > Reviewed-by: Rasmus Brandt > Commit-Queue: Sergey Silkin > Cr-Commit-Position: refs/heads/master@{#21819} TBR=brandtr@webrtc.org,asapersson@webrtc.org,ssilkin@webrtc.org Change-Id: I122ce66ebf709125b3f927dd75fec25be7e1d525 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webm:1485, webrtc:5749 Reviewed-on: https://webrtc-review.googlesource.com/46620 Reviewed-by: Oleh Prypin Commit-Queue: Oleh Prypin Cr-Commit-Position: refs/heads/master@{#21824} --- modules/video_coding/codecs/vp9/vp9_impl.cc | 6 ++---- video/send_statistics_proxy.cc | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/video_coding/codecs/vp9/vp9_impl.cc b/modules/video_coding/codecs/vp9/vp9_impl.cc index 7a779deb37..22993eb66a 100644 --- a/modules/video_coding/codecs/vp9/vp9_impl.cc +++ b/modules/video_coding/codecs/vp9/vp9_impl.cc @@ -716,10 +716,8 @@ int VP9EncoderImpl::GetEncodedLayerFrame(const vpx_codec_cx_pkt* pkt) { encoded_image_.content_type_ = (codec_.mode == kScreensharing) ? VideoContentType::SCREENSHARE : VideoContentType::UNSPECIFIED; - encoded_image_._encodedHeight = - pkt->data.frame.height[layer_id.spatial_layer_id]; - encoded_image_._encodedWidth = - pkt->data.frame.width[layer_id.spatial_layer_id]; + encoded_image_._encodedHeight = raw_->d_h; + encoded_image_._encodedWidth = raw_->d_w; encoded_image_.timing_.flags = TimingFrameFlags::kInvalid; int qp = -1; vpx_codec_control(encoder_, VP8E_GET_LAST_QUANTIZER, &qp); diff --git a/video/send_statistics_proxy.cc b/video/send_statistics_proxy.cc index 3c655cc43a..4375e840c3 100644 --- a/video/send_statistics_proxy.cc +++ b/video/send_statistics_proxy.cc @@ -878,7 +878,6 @@ void SendStatisticsProxy::OnSendEncodedImage( if (!stats) return; - // TODO(ssilkin): Fix stats reporting for spatial layers in SVC. stats->width = encoded_image._encodedWidth; stats->height = encoded_image._encodedHeight; update_times_[ssrc].resolution_update_ms = clock_->TimeInMilliseconds();