diff options
| author | Alex Converse <aconverse@google.com> | 2014-01-21 16:31:14 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-01-21 16:31:14 -0800 |
| commit | 7a197b2d4950c01da34c1513b59da63ea96af3da (patch) | |
| tree | 4661c45e08c95be8b148260aab5a6d305e1122bd /vp9/encoder | |
| parent | 000efb5711d2732f7197f15cd8497ddc4140a5b9 (diff) | |
| parent | 0428579b3dca3d501b3b048b0ecfb2a48f69e611 (diff) | |
| download | libvpx-7a197b2d4950c01da34c1513b59da63ea96af3da.tar libvpx-7a197b2d4950c01da34c1513b59da63ea96af3da.tar.gz libvpx-7a197b2d4950c01da34c1513b59da63ea96af3da.tar.bz2 libvpx-7a197b2d4950c01da34c1513b59da63ea96af3da.zip | |
Merge "Have check_initial_width() take subsampling as arguments directly."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 59d36ee14..3e1daca28 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3279,12 +3279,12 @@ static void Pass2Encode(VP9_COMP *cpi, size_t *size, vp9_twopass_postencode_update(cpi, *size); } -static void check_initial_width(VP9_COMP *cpi, YV12_BUFFER_CONFIG *sd) { +static void check_initial_width(VP9_COMP *cpi, int subsampling_x, + int subsampling_y) { VP9_COMMON *const cm = &cpi->common; if (!cpi->initial_width) { - // 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; + cm->subsampling_x = subsampling_x; + cm->subsampling_y = subsampling_y; alloc_raw_frame_buffers(cpi); cpi->initial_width = cm->width; cpi->initial_height = cm->height; @@ -3298,8 +3298,10 @@ int vp9_receive_raw_frame(VP9_PTR ptr, unsigned int frame_flags, VP9_COMP *cpi = (VP9_COMP *) ptr; 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; - check_initial_width(cpi, sd); + check_initial_width(cpi, subsampling_x, subsampling_y); vpx_usec_timer_start(&timer); if (vp9_lookahead_push(cpi->lookahead, sd, time_stamp, end_time, frame_flags, cpi->active_map_enabled ? cpi->active_map : NULL)) @@ -3798,7 +3800,7 @@ int vp9_set_size_literal(VP9_PTR comp, unsigned int width, VP9_COMP *cpi = (VP9_COMP *)comp; VP9_COMMON *cm = &cpi->common; - check_initial_width(cpi, NULL); + check_initial_width(cpi, 1, 1); if (width) { cm->width = width; |