Mercurial > libavcodec.hg
comparison avcodec.h @ 12139:e59926e2c50c libavcodec
Add AVCodecContext.lpc_type and Add AVCodecContext.lpc_passes fields.
Add AVLPCType enum.
Deprecate AVCodecContext.use_lpc.
author | jbr |
---|---|
date | Sun, 11 Jul 2010 16:56:20 +0000 |
parents | cb3eb3a2fc96 |
children | fb2f04f70afe |
comparison
equal
deleted
inserted
replaced
12138:41f078d6869d | 12139:e59926e2c50c |
---|---|
28 | 28 |
29 #include <errno.h> | 29 #include <errno.h> |
30 #include "libavutil/avutil.h" | 30 #include "libavutil/avutil.h" |
31 | 31 |
32 #define LIBAVCODEC_VERSION_MAJOR 52 | 32 #define LIBAVCODEC_VERSION_MAJOR 52 |
33 #define LIBAVCODEC_VERSION_MINOR 82 | 33 #define LIBAVCODEC_VERSION_MINOR 83 |
34 #define LIBAVCODEC_VERSION_MICRO 0 | 34 #define LIBAVCODEC_VERSION_MICRO 0 |
35 | 35 |
36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ | 36 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |
37 LIBAVCODEC_VERSION_MINOR, \ | 37 LIBAVCODEC_VERSION_MINOR, \ |
38 LIBAVCODEC_VERSION_MICRO) | 38 LIBAVCODEC_VERSION_MICRO) |
522 AVCHROMA_LOC_TOPLEFT =3, ///< DV | 522 AVCHROMA_LOC_TOPLEFT =3, ///< DV |
523 AVCHROMA_LOC_TOP =4, | 523 AVCHROMA_LOC_TOP =4, |
524 AVCHROMA_LOC_BOTTOMLEFT =5, | 524 AVCHROMA_LOC_BOTTOMLEFT =5, |
525 AVCHROMA_LOC_BOTTOM =6, | 525 AVCHROMA_LOC_BOTTOM =6, |
526 AVCHROMA_LOC_NB , ///< Not part of ABI | 526 AVCHROMA_LOC_NB , ///< Not part of ABI |
527 }; | |
528 | |
529 /** | |
530 * LPC analysis type | |
531 */ | |
532 enum AVLPCType { | |
533 AV_LPC_TYPE_DEFAULT = -1, ///< use the codec default LPC type | |
534 AV_LPC_TYPE_NONE = 0, ///< do not use LPC prediction or use all zero coefficients | |
535 AV_LPC_TYPE_FIXED = 1, ///< fixed LPC coefficients | |
536 AV_LPC_TYPE_LEVINSON = 2, ///< Levinson-Durbin recursion | |
537 AV_LPC_TYPE_CHOLESKY = 3, ///< Cholesky factorization | |
538 AV_LPC_TYPE_NB , ///< Not part of ABI | |
527 }; | 539 }; |
528 | 540 |
529 typedef struct RcOverride{ | 541 typedef struct RcOverride{ |
530 int start_frame; | 542 int start_frame; |
531 int end_frame; | 543 int end_frame; |
2411 * - decoding: unused | 2423 * - decoding: unused |
2412 */ | 2424 */ |
2413 int compression_level; | 2425 int compression_level; |
2414 #define FF_COMPRESSION_DEFAULT -1 | 2426 #define FF_COMPRESSION_DEFAULT -1 |
2415 | 2427 |
2428 #if LIBAVCODEC_VERSION_MAJOR < 53 | |
2416 /** | 2429 /** |
2417 * Sets whether to use LPC mode - used by FLAC encoder. | 2430 * Sets whether to use LPC mode - used by FLAC encoder. |
2418 * - encoding: Set by user. | 2431 * - encoding: Set by user. |
2419 * - decoding: unused | 2432 * - decoding: unused |
2433 * @deprecated Deprecated in favor of lpc_type and lpc_passes. | |
2420 */ | 2434 */ |
2421 int use_lpc; | 2435 int use_lpc; |
2436 #endif | |
2422 | 2437 |
2423 /** | 2438 /** |
2424 * LPC coefficient precision - used by FLAC encoder | 2439 * LPC coefficient precision - used by FLAC encoder |
2425 * - encoding: Set by user. | 2440 * - encoding: Set by user. |
2426 * - decoding: unused | 2441 * - decoding: unused |
2670 * - decoding: unused | 2685 * - decoding: unused |
2671 */ | 2686 */ |
2672 float crf_max; | 2687 float crf_max; |
2673 | 2688 |
2674 int log_level_offset; | 2689 int log_level_offset; |
2690 | |
2691 /** | |
2692 * Determines which LPC analysis algorithm to use. | |
2693 * - encoding: Set by user | |
2694 * - decoding: unused | |
2695 */ | |
2696 enum AVLPCType lpc_type; | |
2697 | |
2698 /** | |
2699 * Number of passes to use for Cholesky factorization during LPC analysis | |
2700 * - encoding: Set by user | |
2701 * - decoding: unused | |
2702 */ | |
2703 int lpc_passes; | |
2675 } AVCodecContext; | 2704 } AVCodecContext; |
2676 | 2705 |
2677 /** | 2706 /** |
2678 * AVCodec. | 2707 * AVCodec. |
2679 */ | 2708 */ |