aom/aom.h: rm AOM_SET_DBG_* controls
these are noops inherited from vp8. see https://crbug.com/webm/1573 for
further detail.
BUG=aomedia:2671
Change-Id: I40914f60d285fe7491a7c5b790d881768a566580
(cherry picked from commit b66a1e4c732833522692e5ad8077cadaaedcce11)
diff --git a/aom/aom.h b/aom/aom.h
index 13f28c7..6a5eee5 100644
--- a/aom/aom.h
+++ b/aom/aom.h
@@ -43,20 +43,10 @@
* The set of macros define the control functions of AOM interface
*/
enum aom_com_control_id {
- /*!\brief pass in an external frame into decoder to be used as reference frame
- */
- AOM_SET_DBG_COLOR_REF_FRAME = 4, /**< set the reference frames to color for
- each macroblock, int parameter */
- AOM_SET_DBG_COLOR_MB_MODES =
- 5, /**< set which macro block modes to color, int parameter */
- AOM_SET_DBG_COLOR_B_MODES =
- 6, /**< set which blocks modes to color, int parameter */
- AOM_SET_DBG_DISPLAY_MV =
- 7, /**< set which motion vector modes to draw, int parameter */
-
- /* TODO(jkoleszar): The encoder incorrectly reuses some of these values (5+)
- * for its control ids. These should be migrated to something like the
- * AOM_DECODER_CTRL_ID_START range next time we're ready to break the ABI.
+ /* TODO(https://crbug.com/aomedia/2671): The encoder overlaps the range of
+ * these values for its control ids, see the NOTEs in aom/aomcx.h. These
+ * should be migrated to something like the AOM_DECODER_CTRL_ID_START range
+ * next time we're ready to break the ABI.
*/
AV1_GET_REFERENCE = 128, /**< get a pointer to a reference frame,
av1_ref_frame_t* parameter */
@@ -89,14 +79,6 @@
*
* defines the data type for each of AOM decoder control function requires
*/
-AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_REF_FRAME, int)
-#define AOM_CTRL_AOM_SET_DBG_COLOR_REF_FRAME
-AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_MB_MODES, int)
-#define AOM_CTRL_AOM_SET_DBG_COLOR_MB_MODES
-AOM_CTRL_USE_TYPE(AOM_SET_DBG_COLOR_B_MODES, int)
-#define AOM_CTRL_AOM_SET_DBG_COLOR_B_MODES
-AOM_CTRL_USE_TYPE(AOM_SET_DBG_DISPLAY_MV, int)
-#define AOM_CTRL_AOM_SET_DBG_DISPLAY_MV
AOM_CTRL_USE_TYPE(AV1_GET_REFERENCE, av1_ref_frame_t *)
#define AOM_CTRL_AV1_GET_REFERENCE
AOM_CTRL_USE_TYPE(AV1_SET_REFERENCE, av1_ref_frame_t *)
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index 129ef8a..d821a52 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -940,13 +940,6 @@
}
}
-static aom_codec_err_t ctrl_set_dbg_options(aom_codec_alg_priv_t *ctx,
- va_list args) {
- (void)ctx;
- (void)args;
- return AOM_CODEC_INCAPABLE;
-}
-
static aom_codec_err_t ctrl_get_last_ref_updates(aom_codec_alg_priv_t *ctx,
va_list args) {
int *const update_info = va_arg(args, int *);
@@ -1337,10 +1330,6 @@
// Setters
{ AV1_SET_REFERENCE, ctrl_set_reference },
- { AOM_SET_DBG_COLOR_REF_FRAME, ctrl_set_dbg_options },
- { AOM_SET_DBG_COLOR_MB_MODES, ctrl_set_dbg_options },
- { AOM_SET_DBG_COLOR_B_MODES, ctrl_set_dbg_options },
- { AOM_SET_DBG_DISPLAY_MV, ctrl_set_dbg_options },
{ AV1_INVERT_TILE_DECODE_ORDER, ctrl_set_invert_tile_order },
{ AV1_SET_BYTE_ALIGNMENT, ctrl_set_byte_alignment },
{ AV1_SET_SKIP_LOOP_FILTER, ctrl_set_skip_loop_filter },
