From 2195b51b96b25a5b0f7bfc7979bd7f395f0d7ece Mon Sep 17 00:00:00 2001
From: Oliver Chang <ochang@chromium.org>
Date: Mon, 21 Mar 2016 11:19:33 -0700
Subject: Merge to M50: Reland "Fix sycc{420,422}_to_rgb issues."
Fix an incorrect unit test result.
This reverts commit 2df269c52741c12d63300cee806e96ae5d0b038f.
TBR=tsepez@chromium.org
Original Review URL: https://codereview.chromium.org/1803043002 .
(cherry picked from commit 3cc180234c14639d408003c8180ba2963f0ea665)
Review URL: https://codereview.chromium.org/1816183002 .
---
core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 38 ++++++++++++++----------
core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 10 ++-----
2 files changed, 25 insertions(+), 23 deletions(-)
(limited to 'core/src')
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index 4ace3ad220..177a0c05f7 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -201,14 +201,30 @@ static void sycc444_to_rgb(opj_image_t* img) {
FX_Free(img->comps[2].data);
img->comps[2].data = d2;
}
+static bool sycc420_422_size_is_valid(opj_image_t* img) {
+ return (img && img->comps[0].w != std::numeric_limits<OPJ_UINT32>::max() &&
+ (img->comps[0].w + 1) / 2 == img->comps[1].w &&
+ img->comps[1].w == img->comps[2].w &&
+ img->comps[1].h == img->comps[2].h);
+}
+static bool sycc420_size_is_valid(opj_image_t* img) {
+ return (sycc420_422_size_is_valid(img) &&
+ img->comps[0].h != std::numeric_limits<OPJ_UINT32>::max() &&
+ (img->comps[0].h + 1) / 2 == img->comps[1].h);
+}
+static bool sycc422_size_is_valid(opj_image_t* img) {
+ return (sycc420_422_size_is_valid(img) && img->comps[0].h == img->comps[1].h);
+}
static void sycc422_to_rgb(opj_image_t* img) {
+ if (!sycc422_size_is_valid(img))
+ return;
+
int prec = img->comps[0].prec;
int offset = 1 << (prec - 1);
int upb = (1 << prec) - 1;
- OPJ_UINT32 maxw =
- std::min(std::min(img->comps[0].w, img->comps[1].w), img->comps[2].w);
- OPJ_UINT32 maxh =
- std::min(std::min(img->comps[0].h, img->comps[1].h), img->comps[2].h);
+
+ OPJ_UINT32 maxw = img->comps[0].w;
+ OPJ_UINT32 maxh = img->comps[0].h;
FX_SAFE_SIZE_T max_size = maxw;
max_size *= maxh;
if (!max_size.IsValid())
@@ -262,16 +278,13 @@ static void sycc422_to_rgb(opj_image_t* img) {
img->comps[1].dy = img->comps[0].dy;
img->comps[2].dy = img->comps[0].dy;
}
-static bool sycc420_size_is_valid(OPJ_UINT32 y, OPJ_UINT32 cbcr) {
- if (!y || !cbcr)
- return false;
-
- return (cbcr == y / 2) || ((y & 1) && (cbcr == y / 2 + 1));
-}
static bool sycc420_must_extend_cbcr(OPJ_UINT32 y, OPJ_UINT32 cbcr) {
return (y & 1) && (cbcr == y / 2);
}
void sycc420_to_rgb(opj_image_t* img) {
+ if (!sycc420_size_is_valid(img))
+ return;
+
OPJ_UINT32 prec = img->comps[0].prec;
if (!prec)
return;
@@ -282,11 +295,6 @@ void sycc420_to_rgb(opj_image_t* img) {
OPJ_UINT32 cbw = img->comps[1].w;
OPJ_UINT32 cbh = img->comps[1].h;
OPJ_UINT32 crw = img->comps[2].w;
- OPJ_UINT32 crh = img->comps[2].h;
- if (cbw != crw || cbh != crh)
- return;
- if (!sycc420_size_is_valid(yw, cbw) || !sycc420_size_is_valid(yh, cbh))
- return;
bool extw = sycc420_must_extend_cbcr(yw, cbw);
bool exth = sycc420_must_extend_cbcr(yh, cbh);
FX_SAFE_DWORD safeSize = yw;
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
index c472ef18c6..cebd16cfe2 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
@@ -496,14 +496,8 @@ TEST(fxcodec, YUV420ToRGB) {
const struct {
OPJ_UINT32 w;
bool expected;
- } cases[] = {{0, false},
- {1, false},
- {30, false},
- {31, true},
- {32, true},
- {33, true},
- {34, false},
- {UINT_MAX, false}};
+ } cases[] = {{0, false}, {1, false}, {30, false}, {31, true},
+ {32, true}, {33, false}, {34, false}, {UINT_MAX, false}};
for (int i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) {
y.w = cases[i].w;
y.h = y.w;
--
cgit v1.2.3