ref: 9667a424757fe08f72d8a7158073617ac092e56f
parent: 26b9d085911ff5e83406d1f464dfc562708eaad5
author: James Zern <jzern@google.com>
date: Wed Dec 19 07:23:28 EST 2018
vpx/*.h: rm some deprecated defines/enum vals/typedefs most predate 1.4.0 the DBG enums were deprecated in 1.6.1. VPX_KF_FIXED is left as it's still fairly widely used BUG=webm:1573 Change-Id: Iacaad28a6fe7251f042a2b45507b00fc5b7a0eac
--- a/vpx/vp8.h
+++ b/vpx/vp8.h
@@ -47,10 +47,6 @@
VP8_SET_REFERENCE = 1,
VP8_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */
VP8_SET_POSTPROC = 3, /**< set the decoder's post processing settings */
- VP8_SET_DBG_COLOR_REF_FRAME = 4, /**< \deprecated */
- VP8_SET_DBG_COLOR_MB_MODES = 5, /**< \deprecated */
- VP8_SET_DBG_COLOR_B_MODES = 6, /**< \deprecated */
- VP8_SET_DBG_DISPLAY_MV = 7, /**< \deprecated */
/* TODO(jkoleszar): The encoder incorrectly reuses some of these values (5+)
* for its control ids. These should be migrated to something like the
@@ -127,14 +123,6 @@
#define VPX_CTRL_VP8_COPY_REFERENCE
VPX_CTRL_USE_TYPE(VP8_SET_POSTPROC, vp8_postproc_cfg_t *)
#define VPX_CTRL_VP8_SET_POSTPROC
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_REF_FRAME, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_REF_FRAME
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_MB_MODES, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_MB_MODES
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_COLOR_B_MODES, int)
-#define VPX_CTRL_VP8_SET_DBG_COLOR_B_MODES
-VPX_CTRL_USE_TYPE_DEPRECATED(VP8_SET_DBG_DISPLAY_MV, int)
-#define VPX_CTRL_VP8_SET_DBG_DISPLAY_MV
VPX_CTRL_USE_TYPE(VP9_GET_REFERENCE, vp9_ref_frame_t *)
#define VPX_CTRL_VP9_GET_REFERENCE
--- a/vpx/vp8dx.h
+++ b/vpx/vp8dx.h
@@ -163,10 +163,6 @@
void *decrypt_state;
} vpx_decrypt_init;
-/*!\brief A deprecated alias for vpx_decrypt_init.
- */
-typedef vpx_decrypt_init vp8_decrypt_init;
-
/*!\cond */
/*!\brief VP8 decoder control function parameter type
*
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -39,14 +39,8 @@
/*! Temporal Scalability: Maximum number of coding layers */
#define VPX_TS_MAX_LAYERS 5
-/*!\deprecated Use #VPX_TS_MAX_PERIODICITY instead. */
-#define MAX_PERIODICITY VPX_TS_MAX_PERIODICITY
-
/*! Temporal+Spatial Scalability: Maximum number of coding layers */
#define VPX_MAX_LAYERS 12 // 3 temporal + 4 spatial layers are allowed.
-
-/*!\deprecated Use #VPX_MAX_LAYERS instead. */
-#define MAX_LAYERS VPX_MAX_LAYERS // 3 temporal + 4 spatial layers allowed.
/*! Spatial Scalability: Maximum number of coding layers */
#define VPX_SS_MAX_LAYERS 5