Mercurial > libavcodec.hg
comparison avcodec.h @ 2479:dfdb6bf4b90f libavcodec
support 32bit output for the mpeg audio decoder
author | michael |
---|---|
date | Mon, 31 Jan 2005 12:16:21 +0000 |
parents | f67b63ed036d |
children | 57ba17bd3924 |
comparison
equal
deleted
inserted
replaced
2478:6744ea5ff950 | 2479:dfdb6bf4b90f |
---|---|
15 #include "rational.h" | 15 #include "rational.h" |
16 #include <sys/types.h> /* size_t */ | 16 #include <sys/types.h> /* size_t */ |
17 | 17 |
18 #define FFMPEG_VERSION_INT 0x000409 | 18 #define FFMPEG_VERSION_INT 0x000409 |
19 #define FFMPEG_VERSION "0.4.9-pre1" | 19 #define FFMPEG_VERSION "0.4.9-pre1" |
20 #define LIBAVCODEC_BUILD 4738 | 20 #define LIBAVCODEC_BUILD 4739 |
21 | 21 |
22 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT | 22 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT |
23 #define LIBAVCODEC_VERSION FFMPEG_VERSION | 23 #define LIBAVCODEC_VERSION FFMPEG_VERSION |
24 | 24 |
25 #define AV_STRINGIFY(s) AV_TOSTRING(s) | 25 #define AV_STRINGIFY(s) AV_TOSTRING(s) |
222 }; | 222 }; |
223 | 223 |
224 /* currently unused, may be used if 24/32 bits samples ever supported */ | 224 /* currently unused, may be used if 24/32 bits samples ever supported */ |
225 enum SampleFormat { | 225 enum SampleFormat { |
226 SAMPLE_FMT_S16 = 0, ///< signed 16 bits | 226 SAMPLE_FMT_S16 = 0, ///< signed 16 bits |
227 SAMPLE_FMT_S32, ///< signed 32 bits | |
228 SAMPLE_FMT_FLT, ///< float | |
229 SAMPLE_FMT_DBL, ///< double | |
227 }; | 230 }; |
228 | 231 |
229 /* in bytes */ | 232 /* in bytes */ |
230 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072 | 233 #define AVCODEC_MAX_AUDIO_FRAME_SIZE 131072 |
231 | 234 |
732 */ | 735 */ |
733 int gop_size; | 736 int gop_size; |
734 | 737 |
735 /** | 738 /** |
736 * pixel format, see PIX_FMT_xxx. | 739 * pixel format, see PIX_FMT_xxx. |
737 * - encoding: FIXME: used by ffmpeg to decide whether an pix_fmt | 740 * - encoding: set by user. |
738 * conversion is in order. This only works for | |
739 * codecs with one supported pix_fmt, we should | |
740 * do something for a generic case as well. | |
741 * - decoding: set by lavc. | 741 * - decoding: set by lavc. |
742 */ | 742 */ |
743 enum PixelFormat pix_fmt; | 743 enum PixelFormat pix_fmt; |
744 | 744 |
745 /** | 745 /** |
767 int y, int type, int height); | 767 int y, int type, int height); |
768 | 768 |
769 /* audio only */ | 769 /* audio only */ |
770 int sample_rate; ///< samples per sec | 770 int sample_rate; ///< samples per sec |
771 int channels; | 771 int channels; |
772 int sample_fmt; ///< sample format, currenly unused | 772 |
773 /** | |
774 * audio sample format. | |
775 * - encoding: set by user. | |
776 * - decoding: set by lavc. | |
777 */ | |
778 enum SampleFormat sample_fmt; ///< sample format, currenly unused | |
773 | 779 |
774 /* the following data should not be initialized */ | 780 /* the following data should not be initialized */ |
775 int frame_size; ///< in samples, initialized when calling 'init' | 781 int frame_size; ///< in samples, initialized when calling 'init' |
776 int frame_number; ///< audio or video frame number | 782 int frame_number; ///< audio or video frame number |
777 int real_pict_num; ///< returns the real picture number of previous encoded frame | 783 int real_pict_num; ///< returns the real picture number of previous encoded frame |