From 1319a77b017137b676bad3dfb80bffb058c2bc8f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 21 Feb 2006 22:05:13 +0000
Subject: [PATCH] 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
---
libavcodec/avcodec.h | 7 +++++--
libavcodec/utils.c | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9f630fed69e..a9f3164dee2 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -266,11 +266,14 @@ enum PixelFormat {
};
/* currently unused, may be used if 24/32 bits samples ever supported */
+/* all in native endian */
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_FLT, ///< float
- SAMPLE_FMT_DBL, ///< double
};
/* in bytes */
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 04d5081c7d3..235c0676d78 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -788,6 +788,7 @@ void avcodec_get_context_defaults(AVCodecContext *s){
s->pix_fmt= PIX_FMT_NONE;
s->frame_skip_cmp= FF_CMP_DCTMAX;
s->nsse_weight= 8;
+ s->sample_fmt= SAMPLE_FMT_S16; // FIXME: set to NONE
s->intra_quant_bias= FF_DEFAULT_QUANT_BIAS;
s->inter_quant_bias= FF_DEFAULT_QUANT_BIAS;
--
GitLab