Rename the common control id enum vp8_{dec,com}_control_id, move VP8_DECODER_CTRL_ID_START to common, wrap long lines.
Unified · Split
| @@ -36,7 +36,7 @@ · 35 unmodified lines | |||
| 36 | * | 36 | * |
| 37 | * The set of macros define the control functions of VP8 interface | 37 | * The set of macros define the control functions of VP8 interface |
| 38 | */ | 38 | */ |
| 39 | enum vp8_dec_control_id | 39 | enum vp8_com_control_id |
| 40 | { | 40 | { |
| 41 | VP8_SET_REFERENCE = 1, /**< pass in an external frame into decoder to be used as reference frame */ | 41 | VP8_SET_REFERENCE = 1, /**< pass in an external frame into decoder to be used as reference frame */ |
| 42 | VP8_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */ | 42 | VP8_COPY_REFERENCE = 2, /**< get a copy of reference frame from the decoder */ |
| @@ -45,7 +45,8 @@ enum vp8_dec_control_id · 2 unmodified lines | |||
| 45 | VP8_SET_DBG_COLOR_MB_MODES = 5, /**< set which macro block modes to color */ | 45 | VP8_SET_DBG_COLOR_MB_MODES = 5, /**< set which macro block modes to color */ |
| 46 | VP8_SET_DBG_COLOR_B_MODES = 6, /**< set which blocks modes to color */ | 46 | VP8_SET_DBG_COLOR_B_MODES = 6, /**< set which blocks modes to color */ |
| 47 | VP8_SET_DBG_DISPLAY_MV = 7, /**< set which motion vector modes to draw */ | 47 | VP8_SET_DBG_DISPLAY_MV = 7, /**< set which motion vector modes to draw */ |
| 48 | VP8_COMMON_CTRL_ID_MAX | 48 | VP8_COMMON_CTRL_ID_MAX, |
| 49 | VP8_DECODER_CTRL_ID_START = 256, | ||
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| 51 | /*!\brief post process flags | 52 | /*!\brief post process flags |
| @@ -45,19 +45,23 @@ extern vpx_codec_iface_t* vpx_codec_vp8_dx(void); · 44 unmodified lines | |||
| 45 | * | 45 | * |
| 46 | * \sa #vpx_codec_control | 46 | * \sa #vpx_codec_control |
| 47 | */ | 47 | */ |
| 48 | enum vp8d_dec_control_id | 48 | enum vp8_dec_control_id |
| 49 | { | 49 | { |
| 50 | VP8_DECODER_CTRL_ID_START = 256, | 50 | /** control function to get info on which reference frames were updated |
| 51 | VP8D_GET_LAST_REF_UPDATES, /**< control function to get info on which reference frames were updated | 51 | * by the last decode |
| 52 | by the last decode */ | 52 | */ |
| 53 | VP8D_GET_FRAME_CORRUPTED, /**< check if the indicated frame is corrupted */ | 53 | VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START, |
| 54 | |||
| 55 | /** check if the indicated frame is corrupted */ | ||
| 56 | VP8D_GET_FRAME_CORRUPTED, | ||
| 57 | |||
| 54 | VP8_DECODER_CTRL_ID_MAX | 58 | VP8_DECODER_CTRL_ID_MAX |
| 55 | } ; | 59 | } ; |
| 56 | 60 | ||
| 57 | 61 | ||
| 58 | /*!\brief VP8 encoder control function parameter type | 62 | /*!\brief VP8 decoder control function parameter type |
| 59 | * | 63 | * |
| 60 | * Defines the data types that VP8E control functions take. Note that | 64 | * Defines the data types that VP8D control functions take. Note that |
| 61 | * additional common controls are defined in vp8.h | 65 | * additional common controls are defined in vp8.h |
| 62 | * | 66 | * |
| 63 | */ | 67 | */ |