| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #define VP8DX_H | 24 #define VP8DX_H |
| 25 #include "vpx_codec_impl_top.h" | 25 #include "vpx_codec_impl_top.h" |
| 26 | 26 |
| 27 /*!\name Algorithm interface for VP8 | 27 /*!\name Algorithm interface for VP8 |
| 28 * | 28 * |
| 29 * This interface provides the capability to decode raw VP8 streams, as would | 29 * This interface provides the capability to decode raw VP8 streams, as would |
| 30 * be found in AVI files and other non-Flash uses. | 30 * be found in AVI files and other non-Flash uses. |
| 31 * @{ | 31 * @{ |
| 32 */ | 32 */ |
| 33 extern vpx_codec_iface_t vpx_codec_vp8_dx_algo; | 33 extern vpx_codec_iface_t vpx_codec_vp8_dx_algo; |
| 34 extern vpx_codec_iface_t* vpx_codec_vp8_dx(void); | 34 extern vpx_codec_iface_t *vpx_codec_vp8_dx(void); |
| 35 |
| 36 /* TODO(jkoleszar): These move to VP9 in a later patch set. */ |
| 37 extern vpx_codec_iface_t vpx_codec_vp9_dx_algo; |
| 38 extern vpx_codec_iface_t *vpx_codec_vp9_dx(void); |
| 35 /*!@} - end algorithm interface member group*/ | 39 /*!@} - end algorithm interface member group*/ |
| 36 | 40 |
| 37 /* Include controls common to both the encoder and decoder */ | 41 /* Include controls common to both the encoder and decoder */ |
| 38 #include "vp8.h" | 42 #include "vp8.h" |
| 39 | 43 |
| 40 | 44 |
| 41 /*!\brief VP8 decoder control functions | 45 /*!\brief VP8 decoder control functions |
| 42 * | 46 * |
| 43 * This set of macros define the control functions available for the VP8 | 47 * This set of macros define the control functions available for the VP8 |
| 44 * decoder interface. | 48 * decoder interface. |
| 45 * | 49 * |
| 46 * \sa #vpx_codec_control | 50 * \sa #vpx_codec_control |
| 47 */ | 51 */ |
| 48 enum vp8_dec_control_id | 52 enum vp8_dec_control_id { |
| 49 { | 53 /** control function to get info on which reference frames were updated |
| 50 /** control function to get info on which reference frames were updated | 54 * by the last decode |
| 51 * by the last decode | 55 */ |
| 52 */ | 56 VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START, |
| 53 VP8D_GET_LAST_REF_UPDATES = VP8_DECODER_CTRL_ID_START, | |
| 54 | 57 |
| 55 /** check if the indicated frame is corrupted */ | 58 /** check if the indicated frame is corrupted */ |
| 56 VP8D_GET_FRAME_CORRUPTED, | 59 VP8D_GET_FRAME_CORRUPTED, |
| 57 | 60 |
| 58 /** control function to get info on which reference frames were used | 61 /** control function to get info on which reference frames were used |
| 59 * by the last decode | 62 * by the last decode |
| 60 */ | 63 */ |
| 61 VP8D_GET_LAST_REF_USED, | 64 VP8D_GET_LAST_REF_USED, |
| 62 | 65 |
| 63 VP8_DECODER_CTRL_ID_MAX | 66 VP8_DECODER_CTRL_ID_MAX |
| 64 } ; | 67 }; |
| 65 | 68 |
| 66 | 69 |
| 67 /*!\brief VP8 decoder control function parameter type | 70 /*!\brief VP8 decoder control function parameter type |
| 68 * | 71 * |
| 69 * Defines the data types that VP8D control functions take. Note that | 72 * Defines the data types that VP8D control functions take. Note that |
| 70 * additional common controls are defined in vp8.h | 73 * additional common controls are defined in vp8.h |
| 71 * | 74 * |
| 72 */ | 75 */ |
| 73 | 76 |
| 74 | 77 |
| 75 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) | 78 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_UPDATES, int *) |
| 76 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) | 79 VPX_CTRL_USE_TYPE(VP8D_GET_FRAME_CORRUPTED, int *) |
| 77 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) | 80 VPX_CTRL_USE_TYPE(VP8D_GET_LAST_REF_USED, int *) |
| 78 | 81 |
| 79 /*! @} - end defgroup vp8_decoder */ | 82 /*! @} - end defgroup vp8_decoder */ |
| 80 | 83 |
| 81 | 84 |
| 82 #include "vpx_codec_impl_bottom.h" | 85 #include "vpx_codec_impl_bottom.h" |
| 83 #endif | 86 #endif |
| OLD | NEW |