diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-06-10 15:55:03 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2013-06-10 15:55:03 -0700 |
| commit | 0fcb625e35cb4b3f6f5e4626602dd8af430d58b3 (patch) | |
| tree | f97c77a1c9c9e7a072c2dc66f742aced287669b7 /vp9/common | |
| parent | 44db42c1142d9e893f0e07f3ac00d16b4c6c0532 (diff) | |
| download | libvpx-0fcb625e35cb4b3f6f5e4626602dd8af430d58b3.tar libvpx-0fcb625e35cb4b3f6f5e4626602dd8af430d58b3.tar.gz libvpx-0fcb625e35cb4b3f6f5e4626602dd8af430d58b3.tar.bz2 libvpx-0fcb625e35cb4b3f6f5e4626602dd8af430d58b3.zip | |
Remove remnants of VP8 profiles/versions
Remove the bilinear filter mode, and the no-loopfilter mode, and the
related vp9_setup_version() function.
Change-Id: I32311367812faf37863131df3af37d63d03973d7
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_alloccommon.c | 27 | ||||
| -rw-r--r-- | vp9/common/vp9_alloccommon.h | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 3 |
3 files changed, 0 insertions, 31 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index 13a1c7d7f..2660344d5 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -173,31 +173,6 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) { return 1; } -void vp9_setup_version(VP9_COMMON *cm) { - if (cm->version & 0x4) { - if (!CONFIG_EXPERIMENTAL) - vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM, - "Bitstream was created by an experimental " - "encoder"); - cm->experimental = 1; - } - - switch (cm->version & 0x3) { - case 0: - cm->no_lpf = 0; - cm->use_bilinear_mc_filter = 0; - break; - case 1: - cm->no_lpf = 0; - cm->use_bilinear_mc_filter = 1; - break; - case 2: - case 3: - cm->no_lpf = 1; - cm->use_bilinear_mc_filter = 1; - break; - } -} void vp9_create_common(VP9_COMMON *oci) { vp9_machine_specific_config(oci); @@ -205,8 +180,6 @@ void vp9_create_common(VP9_COMMON *oci) { oci->txfm_mode = ONLY_4X4; oci->comp_pred_mode = HYBRID_PREDICTION; - oci->no_lpf = 0; - oci->use_bilinear_mc_filter = 0; oci->clr_type = REG_YUV; // Initialize reference frame sign bias structure to defaults diff --git a/vp9/common/vp9_alloccommon.h b/vp9/common/vp9_alloccommon.h index fc79f6377..8bf5ed160 100644 --- a/vp9/common/vp9_alloccommon.h +++ b/vp9/common/vp9_alloccommon.h @@ -25,7 +25,6 @@ void vp9_remove_common(VP9_COMMON *oci); int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height); void vp9_free_frame_buffers(VP9_COMMON *oci); -void vp9_setup_version(VP9_COMMON *oci); void vp9_update_frame_size(VP9_COMMON *cm); diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 12161ca27..121995093 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -187,10 +187,7 @@ typedef struct VP9Common { int mode_info_stride; /* profile settings */ - int experimental; TXFM_MODE txfm_mode; - int no_lpf; - int use_bilinear_mc_filter; int base_qindex; int last_kf_gf_q; /* Q used on the last GF or KF */ |