diff options
| author | miu <miu@chromium.org> | 2015-08-12 16:51:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-12 23:52:10 +0000 |
| commit | 1ee8420d22c2b3bca5d13df57945a875700a873e (patch) | |
| tree | fd51602c50e4e75720c544f54b3d962f4054cef8 /media | |
| parent | e89963accb5f3a9d93b8007b22fc79c0120eb794 (diff) | |
| download | chromium_src-1ee8420d22c2b3bca5d13df57945a875700a873e.zip chromium_src-1ee8420d22c2b3bca5d13df57945a875700a873e.tar.gz chromium_src-1ee8420d22c2b3bca5d13df57945a875700a873e.tar.bz2 | |
Use visible_rect instead of coded_size for Cast video testing.
By using the coded_size, the PSNR and SSIM quality measurements were
including the garbage in the non-visible padding regions of the video
frames.
TBR=phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/1284353002
Cr-Commit-Position: refs/heads/master@{#343127}
Diffstat (limited to 'media')
| -rw-r--r-- | media/cast/test/utility/video_utility.cc | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/media/cast/test/utility/video_utility.cc b/media/cast/test/utility/video_utility.cc index 0b8a78e..3de60f4 100644 --- a/media/cast/test/utility/video_utility.cc +++ b/media/cast/test/utility/video_utility.cc @@ -16,46 +16,46 @@ namespace cast { double I420PSNR(const scoped_refptr<media::VideoFrame>& frame1, const scoped_refptr<media::VideoFrame>& frame2) { - if (frame1->coded_size().width() != frame2->coded_size().width() || - frame1->coded_size().height() != frame2->coded_size().height()) + if (frame1->visible_rect().width() != frame2->visible_rect().width() || + frame1->visible_rect().height() != frame2->visible_rect().height()) return -1; - return libyuv::I420Psnr(frame1->data(VideoFrame::kYPlane), + return libyuv::I420Psnr(frame1->visible_data(VideoFrame::kYPlane), frame1->stride(VideoFrame::kYPlane), - frame1->data(VideoFrame::kUPlane), + frame1->visible_data(VideoFrame::kUPlane), frame1->stride(VideoFrame::kUPlane), - frame1->data(VideoFrame::kVPlane), + frame1->visible_data(VideoFrame::kVPlane), frame1->stride(VideoFrame::kVPlane), - frame2->data(VideoFrame::kYPlane), + frame2->visible_data(VideoFrame::kYPlane), frame2->stride(VideoFrame::kYPlane), - frame2->data(VideoFrame::kUPlane), + frame2->visible_data(VideoFrame::kUPlane), frame2->stride(VideoFrame::kUPlane), - frame2->data(VideoFrame::kVPlane), + frame2->visible_data(VideoFrame::kVPlane), frame2->stride(VideoFrame::kVPlane), - frame1->coded_size().width(), - frame1->coded_size().height()); + frame1->visible_rect().width(), + frame1->visible_rect().height()); } double I420SSIM(const scoped_refptr<media::VideoFrame>& frame1, const scoped_refptr<media::VideoFrame>& frame2) { - if (frame1->coded_size().width() != frame2->coded_size().width() || - frame1->coded_size().height() != frame2->coded_size().height()) + if (frame1->visible_rect().width() != frame2->visible_rect().width() || + frame1->visible_rect().height() != frame2->visible_rect().height()) return -1; - return libyuv::I420Ssim(frame1->data(VideoFrame::kYPlane), + return libyuv::I420Ssim(frame1->visible_data(VideoFrame::kYPlane), frame1->stride(VideoFrame::kYPlane), - frame1->data(VideoFrame::kUPlane), + frame1->visible_data(VideoFrame::kUPlane), frame1->stride(VideoFrame::kUPlane), - frame1->data(VideoFrame::kVPlane), + frame1->visible_data(VideoFrame::kVPlane), frame1->stride(VideoFrame::kVPlane), - frame2->data(VideoFrame::kYPlane), + frame2->visible_data(VideoFrame::kYPlane), frame2->stride(VideoFrame::kYPlane), - frame2->data(VideoFrame::kUPlane), + frame2->visible_data(VideoFrame::kUPlane), frame2->stride(VideoFrame::kUPlane), - frame2->data(VideoFrame::kVPlane), + frame2->visible_data(VideoFrame::kVPlane), frame2->stride(VideoFrame::kVPlane), - frame1->coded_size().width(), - frame1->coded_size().height()); + frame1->visible_rect().width(), + frame1->visible_rect().height()); } void PopulateVideoFrame(VideoFrame* frame, int start_value) { |