diff options
| author | Adrian Grange <agrange@google.com> | 2013-12-04 09:35:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-04 09:35:14 -0800 |
| commit | 584c72992a972ba124a3f05ba9fc683da8190680 (patch) | |
| tree | 71dccb0072e8d69e00d76a3b8f6b6302874aa431 /vp9 | |
| parent | 920a074e89d63c9cd41737d0158418e6a6949134 (diff) | |
| parent | 3173c2190910a748d1a97b19a94ef4c47e48cb14 (diff) | |
| download | libvpx-584c72992a972ba124a3f05ba9fc683da8190680.tar libvpx-584c72992a972ba124a3f05ba9fc683da8190680.tar.gz libvpx-584c72992a972ba124a3f05ba9fc683da8190680.tar.bz2 libvpx-584c72992a972ba124a3f05ba9fc683da8190680.zip | |
Merge "Change default behavior to assume sampled chroma"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 852cedfd5..8ae70c9bb 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3317,13 +3317,12 @@ static void Pass2Encode(VP9_COMP *cpi, unsigned long *size, } static void check_initial_width(VP9_COMP *cpi, YV12_BUFFER_CONFIG *sd) { - VP9_COMMON *cm = &cpi->common; + VP9_COMMON *const cm = &cpi->common; if (!cpi->initial_width) { - // TODO(jkoleszar): Support 1/4 subsampling? - cm->subsampling_x = (sd != NULL) && sd->uv_width < sd->y_width; - cm->subsampling_y = (sd != NULL) && sd->uv_height < sd->y_height; + // TODO(agrange) Subsampling defaults to assuming sampled chroma. + cm->subsampling_x = sd != NULL ? (sd->uv_width < sd->y_width) : 1; + cm->subsampling_y = sd != NULL ? (sd->uv_height < sd->y_height) : 1; alloc_raw_frame_buffers(cpi); - cpi->initial_width = cm->width; cpi->initial_height = cm->height; } |