From a0befb93e7150f72afe57aa5b7f7df3308690cef Mon Sep 17 00:00:00 2001
From: Alex Converse <aconverse@google.com>
Date: Wed, 1 Oct 2014 11:23:57 -0700
Subject: [PATCH] Fix subsampling check for images 1 pixel wide/tall
Change-Id: I0e262ede7eb4a4ae0c86181922d744e542e93350
---
vp9/decoder/vp9_decodeframe.c | 8 ++++++--
vp9/encoder/vp9_encoder.c | 4 ++--
vp9/vp9_iface_common.h | 14 +++++++-------
vpx_scale/generic/yv12config.c | 2 ++
vpx_scale/yv12config.h | 2 ++
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index db55de16de..c78e97dfd6 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -735,6 +735,8 @@ static void setup_frame_size(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) {
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate frame buffer");
}
+ cm->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;
+ cm->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;
cm->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;
}
@@ -787,8 +789,8 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
RefBuffer *const ref_frame = &cm->frame_refs[i];
if (!valid_ref_frame_img_fmt(
ref_frame->buf->bit_depth,
- ref_frame->buf->uv_crop_width < ref_frame->buf->y_crop_width,
- ref_frame->buf->uv_crop_height < ref_frame->buf->y_crop_height,
+ ref_frame->buf->subsampling_x,
+ ref_frame->buf->subsampling_y,
cm->bit_depth,
cm->subsampling_x,
cm->subsampling_y))
@@ -811,6 +813,8 @@ static void setup_frame_size_with_refs(VP9_COMMON *cm,
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate frame buffer");
}
+ cm->frame_bufs[cm->new_fb_idx].buf.subsampling_x = cm->subsampling_x;
+ cm->frame_bufs[cm->new_fb_idx].buf.subsampling_y = cm->subsampling_y;
cm->frame_bufs[cm->new_fb_idx].buf.bit_depth = (unsigned int)cm->bit_depth;
}
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c
index 0f82d0a600..3e79504e56 100644
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -3276,8 +3276,8 @@ int vp9_receive_raw_frame(VP9_COMP *cpi, unsigned int frame_flags,
VP9_COMMON *cm = &cpi->common;
struct vpx_usec_timer timer;
int res = 0;
- const int subsampling_x = sd->uv_width < sd->y_width;
- const int subsampling_y = sd->uv_height < sd->y_height;
+ const int subsampling_x = sd->subsampling_x;
+ const int subsampling_y = sd->subsampling_y;
#if CONFIG_VP9_HIGHBITDEPTH
const int use_highbitdepth = sd->flags & YV12_FLAG_HIGHBITDEPTH;
check_initial_width(cpi, use_highbitdepth, subsampling_x, subsampling_y);
diff --git a/vp9/vp9_iface_common.h b/vp9/vp9_iface_common.h
index a2bfe62a7c..1ce87ef826 100644
--- a/vp9/vp9_iface_common.h
+++ b/vp9/vp9_iface_common.h
@@ -16,11 +16,9 @@ static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
* the Y, U, and V planes, nor other alignment adjustments that
* might be representable by a YV12_BUFFER_CONFIG, so we just
* initialize all the fields.*/
- const int ss_x = yv12->uv_crop_width < yv12->y_crop_width;
- const int ss_y = yv12->uv_crop_height < yv12->y_crop_height;
int bps;
- if (!ss_y) {
- if (!ss_x) {
+ if (!yv12->subsampling_y) {
+ if (!yv12->subsampling_x) {
img->fmt = VPX_IMG_FMT_I444;
bps = 24;
} else {
@@ -28,7 +26,7 @@ static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
bps = 16;
}
} else {
- if (!ss_x) {
+ if (!yv12->subsampling_x) {
img->fmt = VPX_IMG_FMT_I440;
bps = 16;
} else {
@@ -41,8 +39,8 @@ static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
img->h = ALIGN_POWER_OF_TWO(yv12->y_height + 2 * VP9_ENC_BORDER_IN_PIXELS, 3);
img->d_w = yv12->y_crop_width;
img->d_h = yv12->y_crop_height;
- img->x_chroma_shift = ss_x;
- img->y_chroma_shift = ss_y;
+ img->x_chroma_shift = yv12->subsampling_x;
+ img->y_chroma_shift = yv12->subsampling_y;
img->planes[VPX_PLANE_Y] = yv12->y_buffer;
img->planes[VPX_PLANE_U] = yv12->u_buffer;
img->planes[VPX_PLANE_V] = yv12->v_buffer;
@@ -118,6 +116,8 @@ static vpx_codec_err_t image2yuvconfig(const vpx_image_t *img,
#else
yv12->border = (img->stride[VPX_PLANE_Y] - img->w) / 2;
#endif // CONFIG_VP9_HIGHBITDEPTH
+ yv12->subsampling_x = img->x_chroma_shift;
+ yv12->subsampling_y = img->y_chroma_shift;
return VPX_CODEC_OK;
}
diff --git a/vpx_scale/generic/yv12config.c b/vpx_scale/generic/yv12config.c
index 475d231e1c..fde5044a25 100644
--- a/vpx_scale/generic/yv12config.c
+++ b/vpx_scale/generic/yv12config.c
@@ -242,6 +242,8 @@ int vp9_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf,
ybf->border = border;
ybf->frame_size = (int)frame_size;
+ ybf->subsampling_x = ss_x;
+ ybf->subsampling_y = ss_y;
#if CONFIG_VP9_HIGHBITDEPTH
if (use_highbitdepth) {
diff --git a/vpx_scale/yv12config.h b/vpx_scale/yv12config.h
index 9ff764c66d..c5ac44b123 100644
--- a/vpx_scale/yv12config.h
+++ b/vpx_scale/yv12config.h
@@ -51,6 +51,8 @@ typedef struct yv12_buffer_config {
int buffer_alloc_sz;
int border;
int frame_size;
+ int subsampling_x;
+ int subsampling_y;
unsigned int bit_depth;
int corrupted;
--
GitLab