RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added none/8bit/24bit audio formats and defaulting to s16 for now (once the system works like pix_fmt, the defaulting should be changed to SAMPLE_FMT_NONE) 

Originally committed as revision 5045 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Beregszaszi 2006-02-21 22:05:13 +00:00
parent 33f5e2ec3e
commit 1319a77b01
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/avcodec.h
View File

@ -266,11 +266,14 @@ enum PixelFormat {
}; };
/* currently unused, may be used if 24/32 bits samples ever supported */ /* currently unused, may be used if 24/32 bits samples ever supported */
/* all in native endian */
enum SampleFormat { enum SampleFormat {
SAMPLE_FMT_S16 = 0, ///< signed 16 bits SAMPLT_FMT_NONE = -1,
SAMPLE_FMT_U8, ///< unsigned 8 bits
SAMPLE_FMT_S16, ///< signed 16 bits
SAMPLE_FMT_S24, ///< signed 24 bits
SAMPLE_FMT_S32, ///< signed 32 bits SAMPLE_FMT_S32, ///< signed 32 bits
SAMPLE_FMT_FLT, ///< float SAMPLE_FMT_FLT, ///< float
SAMPLE_FMT_DBL, ///< double
}; };
/* in bytes */ /* in bytes */

1
libavcodec/utils.c
View File

@ -788,6 +788,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
s->pix_fmt= PIX_FMT_NONE; s->pix_fmt= PIX_FMT_NONE;
s->frame_skip_cmp= FF_CMP_DCTMAX; s->frame_skip_cmp= FF_CMP_DCTMAX;
s->nsse_weight= 8; s->nsse_weight= 8;
s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS; s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS; s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;