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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 * may reference the 'name' member to get a printable description of the | 196 * may reference the 'name' member to get a printable description of the |
197 * algorithm. | 197 * algorithm. |
198 */ | 198 */ |
199 typedef struct vpx_codec_ctx { | 199 typedef struct vpx_codec_ctx { |
200 const char *name; /**< Printable interface name */ | 200 const char *name; /**< Printable interface name */ |
201 vpx_codec_iface_t *iface; /**< Interface pointers */ | 201 vpx_codec_iface_t *iface; /**< Interface pointers */ |
202 vpx_codec_err_t err; /**< Last returned error */ | 202 vpx_codec_err_t err; /**< Last returned error */ |
203 const char *err_detail; /**< Detailed info, if available */ | 203 const char *err_detail; /**< Detailed info, if available */ |
204 vpx_codec_flags_t init_flags; /**< Flags passed at init time */ | 204 vpx_codec_flags_t init_flags; /**< Flags passed at init time */ |
205 union { | 205 union { |
206 struct vpx_codec_dec_cfg *dec; /**< Decoder Configuration Pointer */ | 206 /**< Decoder Configuration Pointer */ |
207 struct vpx_codec_enc_cfg *enc; /**< Encoder Configuration Pointer */ | 207 const struct vpx_codec_dec_cfg *dec; |
208 void *raw; | 208 /**< Encoder Configuration Pointer */ |
| 209 const struct vpx_codec_enc_cfg *enc; |
| 210 const void *raw; |
209 } config; /**< Configuration pointer aliasing un
ion */ | 211 } config; /**< Configuration pointer aliasing un
ion */ |
210 vpx_codec_priv_t *priv; /**< Algorithm private storage */ | 212 vpx_codec_priv_t *priv; /**< Algorithm private storage */ |
211 } vpx_codec_ctx_t; | 213 } vpx_codec_ctx_t; |
212 | 214 |
213 /*!\brief Bit depth for codec | 215 /*!\brief Bit depth for codec |
214 * * | 216 * * |
215 * This enumeration determines the bit depth of the codec. | 217 * This enumeration determines the bit depth of the codec. |
216 */ | 218 */ |
217 typedef enum vpx_bit_depth { | 219 typedef enum vpx_bit_depth { |
218 VPX_BITS_8, /**< 8 bits */ | 220 VPX_BITS_8 = 8, /**< 8 bits */ |
219 VPX_BITS_10, /**< 10 bits */ | 221 VPX_BITS_10 = 10, /**< 10 bits */ |
220 VPX_BITS_12 /**< 12 bits */ | 222 VPX_BITS_12 = 12, /**< 12 bits */ |
221 } vpx_bit_depth_t; | 223 } vpx_bit_depth_t; |
222 | 224 |
223 /* | 225 /* |
224 * Library Version Number Interface | 226 * Library Version Number Interface |
225 * | 227 * |
226 * For example, see the following sample return values: | 228 * For example, see the following sample return values: |
227 * vpx_codec_version() (1<<16 | 2<<8 | 3) | 229 * vpx_codec_version() (1<<16 | 2<<8 | 3) |
228 * vpx_codec_version_str() "v1.2.3-rc1-16-gec6a1ba" | 230 * vpx_codec_version_str() "v1.2.3-rc1-16-gec6a1ba" |
229 * vpx_codec_version_extra_str() "rc1-16-gec6a1ba" | 231 * vpx_codec_version_extra_str() "rc1-16-gec6a1ba" |
230 */ | 232 */ |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
468 | 470 |
469 | 471 |
470 #endif | 472 #endif |
471 | 473 |
472 /*!@} - end defgroup codec*/ | 474 /*!@} - end defgroup codec*/ |
473 #ifdef __cplusplus | 475 #ifdef __cplusplus |
474 } | 476 } |
475 #endif | 477 #endif |
476 #endif // VPX_VPX_CODEC_H_ | 478 #endif // VPX_VPX_CODEC_H_ |
477 | 479 |
OLD | NEW |