diff options
| author | Alex Converse <aconverse@google.com> | 2014-02-21 15:45:38 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-21 15:45:38 -0800 |
| commit | a8e1d66b68badf428a98586f2bf92e26fcd793de (patch) | |
| tree | 8a63456971add051a7bfb2b92dc742c4970ab995 /vp9 | |
| parent | bc28ee7bb1d8b67e544ce236e7a441e9d79efaa6 (diff) | |
| parent | 6e3cf6ec1d0bad58071d774ef2c4191560293cbc (diff) | |
| download | libvpx-a8e1d66b68badf428a98586f2bf92e26fcd793de.tar libvpx-a8e1d66b68badf428a98586f2bf92e26fcd793de.tar.gz libvpx-a8e1d66b68badf428a98586f2bf92e26fcd793de.tar.bz2 libvpx-a8e1d66b68badf428a98586f2bf92e26fcd793de.zip | |
Merge "Stop gating non420 features with a configure flag."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/vp9_loopfilter.c | 10 | ||||
| -rw-r--r-- | vp9/vp9_dx_iface.c | 4 |
2 files changed, 0 insertions, 14 deletions
diff --git a/vp9/common/vp9_loopfilter.c b/vp9/common/vp9_loopfilter.c index 04f8934c4..fe2056d14 100644 --- a/vp9/common/vp9_loopfilter.c +++ b/vp9/common/vp9_loopfilter.c @@ -868,7 +868,6 @@ void vp9_setup_mask(VP9_COMMON *const cm, const int mi_row, const int mi_col, assert(!(lfm->int_4x4_uv & lfm->above_uv[TX_16X16])); } -#if CONFIG_NON420 static uint8_t build_lfi(const loop_filter_info_n *lfi_n, const MB_MODE_INFO *mbmi) { const int seg = mbmi->segment_id; @@ -1046,7 +1045,6 @@ static void filter_block_plane_non420(VP9_COMMON *cm, dst->buf += 8 * dst->stride; } } -#endif void vp9_filter_block_plane(VP9_COMMON *const cm, struct macroblockd_plane *const plane, @@ -1206,10 +1204,8 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer, const int num_planes = y_only ? 1 : MAX_MB_PLANE; int mi_row, mi_col; LOOP_FILTER_MASK lfm; -#if CONFIG_NON420 int use_420 = y_only || (xd->plane[1].subsampling_y == 1 && xd->plane[1].subsampling_x == 1); -#endif for (mi_row = start; mi_row < stop; mi_row += MI_BLOCK_SIZE) { MODE_INFO **mi_8x8 = cm->mi_grid_visible + mi_row * cm->mode_info_stride; @@ -1220,22 +1216,16 @@ void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer, setup_dst_planes(xd, frame_buffer, mi_row, mi_col); // TODO(JBB): Make setup_mask work for non 420. -#if CONFIG_NON420 if (use_420) -#endif vp9_setup_mask(cm, mi_row, mi_col, mi_8x8 + mi_col, cm->mode_info_stride, &lfm); for (plane = 0; plane < num_planes; ++plane) { -#if CONFIG_NON420 if (use_420) -#endif vp9_filter_block_plane(cm, &xd->plane[plane], mi_row, &lfm); -#if CONFIG_NON420 else filter_block_plane_non420(cm, &xd->plane[plane], mi_8x8 + mi_col, mi_row, mi_col); -#endif } } } diff --git a/vp9/vp9_dx_iface.c b/vp9/vp9_dx_iface.c index 76cbebf19..b85e17237 100644 --- a/vp9/vp9_dx_iface.c +++ b/vp9/vp9_dx_iface.c @@ -159,11 +159,7 @@ static vpx_codec_err_t vp9_peek_si(const uint8_t *data, unsigned int data_sz, if (frame_marker != VP9_FRAME_MARKER) return VPX_CODEC_UNSUP_BITSTREAM; -#if CONFIG_NON420 if (version > 1) return VPX_CODEC_UNSUP_BITSTREAM; -#else - if (version != 0) return VPX_CODEC_UNSUP_BITSTREAM; -#endif if (vp9_rb_read_bit(&rb)) { // show an existing frame return VPX_CODEC_OK; |