[FFmpeg-cvslog] r25787 - in trunk: doc/APIchanges libavcodec/audioconvert.c libavcodec/audioconvert.h libavcodec/avcodec.h libavcore/Makefile libavcore/audioconvert.c libavcore/audioconvert.h libavcore/avcore.h
stefano
subversion
Sun Nov 21 20:28:52 CET 2010
Author: stefano
Date: Sun Nov 21 20:28:52 2010
New Revision: 25787
Log:
Move audio channel API from libavcodec to libavcore.
Added:
trunk/libavcore/audioconvert.c
- copied, changed from r25784, trunk/libavcodec/audioconvert.c
trunk/libavcore/audioconvert.h
- copied, changed from r25784, trunk/libavcodec/audioconvert.h
Modified:
trunk/doc/APIchanges
trunk/libavcodec/audioconvert.c
trunk/libavcodec/audioconvert.h
trunk/libavcodec/avcodec.h
trunk/libavcore/Makefile
trunk/libavcore/avcore.h
Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/doc/APIchanges Sun Nov 21 20:28:52 2010 (r25787)
@@ -13,6 +13,15 @@ libavutil: 2009-03-08
API changes, most recent first:
+2010-11-21 - r25787 - lavcore 0.14.0 - audioconvert.h
+ Add a public audio channel API in audioconvert.h, and deprecate the
+ corresponding functions in libavcodec:
+ avcodec_get_channel_name()
+ avcodec_get_channel_layout()
+ avcodec_get_channel_layout_string()
+ avcodec_channel_layout_num_channels()
+ and the CH_* macros defined in libavcodec/avcodec.h.
+
2010-11-21 - r25777 - lavf 52.85.0 - avformat.h
Add av_append_packet().
Modified: trunk/libavcodec/audioconvert.c
==============================================================================
--- trunk/libavcodec/audioconvert.c Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/libavcodec/audioconvert.c Sun Nov 21 20:28:52 2010 (r25787)
@@ -48,21 +48,6 @@ void avcodec_sample_fmt_string (char *bu
}
#endif
-static const char* const channel_names[]={
- "FL", "FR", "FC", "LFE", "BL", "BR", "FLC", "FRC",
- "BC", "SL", "SR", "TC", "TFL", "TFC", "TFR", "TBL",
- "TBC", "TBR",
- [29] = "DL",
- [30] = "DR",
-};
-
-static const char *get_channel_name(int channel_id)
-{
- if (channel_id<0 || channel_id>=FF_ARRAY_ELEMS(channel_names))
- return NULL;
- return channel_names[channel_id];
-}
-
int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name)
{
switch(nb_channels) {
@@ -77,75 +62,22 @@ int64_t avcodec_guess_channel_layout(int
}
}
-static const struct {
- const char *name;
- int nb_channels;
- int64_t layout;
-} channel_layout_map[] = {
- { "mono", 1, CH_LAYOUT_MONO },
- { "stereo", 2, CH_LAYOUT_STEREO },
- { "4.0", 4, CH_LAYOUT_4POINT0 },
- { "quad", 4, CH_LAYOUT_QUAD },
- { "5.0", 5, CH_LAYOUT_5POINT0 },
- { "5.0", 5, CH_LAYOUT_5POINT0_BACK },
- { "5.1", 6, CH_LAYOUT_5POINT1 },
- { "5.1", 6, CH_LAYOUT_5POINT1_BACK },
- { "5.1+downmix", 8, CH_LAYOUT_5POINT1|CH_LAYOUT_STEREO_DOWNMIX, },
- { "7.1", 8, CH_LAYOUT_7POINT1 },
- { "7.1(wide)", 8, CH_LAYOUT_7POINT1_WIDE },
- { "7.1+downmix", 10, CH_LAYOUT_7POINT1|CH_LAYOUT_STEREO_DOWNMIX, },
- { 0 }
-};
-
+#if FF_API_OLD_AUDIOCONVERT
int64_t avcodec_get_channel_layout(const char *name)
{
- int i = 0;
- do {
- if (!strcmp(channel_layout_map[i].name, name))
- return channel_layout_map[i].layout;
- i++;
- } while (channel_layout_map[i].name);
-
- return 0;
+ return av_get_channel_layout(name);
}
void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout)
{
- int i;
-
- for (i=0; channel_layout_map[i].name; i++)
- if (nb_channels == channel_layout_map[i].nb_channels &&
- channel_layout == channel_layout_map[i].layout) {
- av_strlcpy(buf, channel_layout_map[i].name, buf_size);
- return;
- }
-
- snprintf(buf, buf_size, "%d channels", nb_channels);
- if (channel_layout) {
- int i,ch;
- av_strlcat(buf, " (", buf_size);
- for(i=0,ch=0; i<64; i++) {
- if ((channel_layout & (1L<<i))) {
- const char *name = get_channel_name(i);
- if (name) {
- if (ch>0) av_strlcat(buf, "|", buf_size);
- av_strlcat(buf, name, buf_size);
- }
- ch++;
- }
- }
- av_strlcat(buf, ")", buf_size);
- }
+ av_get_channel_layout_string(buf, buf_size, nb_channels, channel_layout);
}
int avcodec_channel_layout_num_channels(int64_t channel_layout)
{
- int count;
- uint64_t x = channel_layout;
- for (count = 0; x; count++)
- x &= x-1; // unset lowest set bit
- return count;
+ return av_get_channel_layout_nb_channels(channel_layout);
}
+#endif
struct AVAudioConvert {
int in_channels, out_channels;
Modified: trunk/libavcodec/audioconvert.h
==============================================================================
--- trunk/libavcodec/audioconvert.h Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/libavcodec/audioconvert.h Sun Nov 21 20:28:52 2010 (r25787)
@@ -52,22 +52,30 @@ attribute_deprecated
enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
#endif
-/**
- * @return NULL on error
- */
+#if FF_API_OLD_AUDIOCONVERT
+attribute_deprecated
const char *avcodec_get_channel_name(int channel_id);
/**
- * @return channel layout that matches name, 0 if no match
+ * @deprecated Use av_get_channel_layout() instead.
*/
+attribute_deprecated
int64_t avcodec_get_channel_layout(const char *name);
/**
- * Return description of channel layout
+ * @deprecated Use av_get_channel_layout_string() instead.
*/
+attribute_deprecated
void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
/**
+ * @deprecated Use av_get_channel_layout_nb_channels() instead.
+ */
+attribute_deprecated
+int avcodec_channel_layout_num_channels(int64_t channel_layout);
+#endif
+
+/**
* Guess the channel layout
* @param nb_channels
* @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
@@ -76,11 +84,6 @@ void avcodec_get_channel_layout_string(c
*/
int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
-/**
- * @return the number of channels in the channel layout.
- */
-int avcodec_channel_layout_num_channels(int64_t channel_layout);
-
struct AVAudioConvert;
typedef struct AVAudioConvert AVAudioConvert;
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/libavcodec/avcodec.h Sun Nov 21 20:28:52 2010 (r25787)
@@ -33,7 +33,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 97
-#define LIBAVCODEC_VERSION_MICRO 0
+#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -79,6 +79,9 @@
#ifndef FF_API_OLD_SAMPLE_FMT
#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_OLD_AUDIOCONVERT
+#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
#define AV_NOPTS_VALUE INT64_C(0x8000000000000000)
#define AV_TIME_BASE 1000000
@@ -426,50 +429,53 @@ enum CodecID {
#define SAMPLE_FMT_NB AV_SAMPLE_FMT_NB
#endif
+#if FF_API_OLD_AUDIOCONVERT
+#include "libavcore/audioconvert.h"
+
/* Audio channel masks */
-#define CH_FRONT_LEFT 0x00000001
-#define CH_FRONT_RIGHT 0x00000002
-#define CH_FRONT_CENTER 0x00000004
-#define CH_LOW_FREQUENCY 0x00000008
-#define CH_BACK_LEFT 0x00000010
-#define CH_BACK_RIGHT 0x00000020
-#define CH_FRONT_LEFT_OF_CENTER 0x00000040
-#define CH_FRONT_RIGHT_OF_CENTER 0x00000080
-#define CH_BACK_CENTER 0x00000100
-#define CH_SIDE_LEFT 0x00000200
-#define CH_SIDE_RIGHT 0x00000400
-#define CH_TOP_CENTER 0x00000800
-#define CH_TOP_FRONT_LEFT 0x00001000
-#define CH_TOP_FRONT_CENTER 0x00002000
-#define CH_TOP_FRONT_RIGHT 0x00004000
-#define CH_TOP_BACK_LEFT 0x00008000
-#define CH_TOP_BACK_CENTER 0x00010000
-#define CH_TOP_BACK_RIGHT 0x00020000
-#define CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
-#define CH_STEREO_RIGHT 0x40000000 ///< See CH_STEREO_LEFT.
+#define CH_FRONT_LEFT AV_CH_FRONT_LEFT
+#define CH_FRONT_RIGHT AV_CH_FRONT_RIGHT
+#define CH_FRONT_CENTER AV_CH_FRONT_CENTER
+#define CH_LOW_FREQUENCY AV_CH_LOW_FREQUENCY
+#define CH_BACK_LEFT AV_CH_BACK_LEFT
+#define CH_BACK_RIGHT AV_CH_BACK_RIGHT
+#define CH_FRONT_LEFT_OF_CENTER AV_CH_FRONT_LEFT_OF_CENTER
+#define CH_FRONT_RIGHT_OF_CENTER AV_CH_FRONT_RIGHT_OF_CENTER
+#define CH_BACK_CENTER AV_CH_BACK_CENTER
+#define CH_SIDE_LEFT AV_CH_SIDE_LEFT
+#define CH_SIDE_RIGHT AV_CH_SIDE_RIGHT
+#define CH_TOP_CENTER AV_CH_TOP_CENTER
+#define CH_TOP_FRONT_LEFT AV_CH_TOP_FRONT_LEFT
+#define CH_TOP_FRONT_CENTER AV_CH_TOP_FRONT_CENTER
+#define CH_TOP_FRONT_RIGHT AV_CH_TOP_FRONT_RIGHT
+#define CH_TOP_BACK_LEFT AV_CH_TOP_BACK_LEFT
+#define CH_TOP_BACK_CENTER AV_CH_TOP_BACK_CENTER
+#define CH_TOP_BACK_RIGHT AV_CH_TOP_BACK_RIGHT
+#define CH_STEREO_LEFT AV_CH_STEREO_LEFT
+#define CH_STEREO_RIGHT AV_CH_STEREO_RIGHT
/** Channel mask value used for AVCodecContext.request_channel_layout
to indicate that the user requests the channel order of the decoder output
to be the native codec channel order. */
-#define CH_LAYOUT_NATIVE 0x8000000000000000LL
+#define CH_LAYOUT_NATIVE AV_CH_LAYOUT_NATIVE
/* Audio channel convenience macros */
-#define CH_LAYOUT_MONO (CH_FRONT_CENTER)
-#define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT)
-#define CH_LAYOUT_2_1 (CH_LAYOUT_STEREO|CH_BACK_CENTER)
-#define CH_LAYOUT_SURROUND (CH_LAYOUT_STEREO|CH_FRONT_CENTER)
-#define CH_LAYOUT_4POINT0 (CH_LAYOUT_SURROUND|CH_BACK_CENTER)
-#define CH_LAYOUT_2_2 (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_QUAD (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT0 (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT)
-#define CH_LAYOUT_5POINT1 (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_5POINT0_BACK (CH_LAYOUT_SURROUND|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_5POINT1_BACK (CH_LAYOUT_5POINT0_BACK|CH_LOW_FREQUENCY)
-#define CH_LAYOUT_7POINT0 (CH_LAYOUT_5POINT0|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1 (CH_LAYOUT_5POINT1|CH_BACK_LEFT|CH_BACK_RIGHT)
-#define CH_LAYOUT_7POINT1_WIDE (CH_LAYOUT_5POINT1_BACK|\
- CH_FRONT_LEFT_OF_CENTER|CH_FRONT_RIGHT_OF_CENTER)
-#define CH_LAYOUT_STEREO_DOWNMIX (CH_STEREO_LEFT|CH_STEREO_RIGHT)
+#define CH_LAYOUT_MONO AV_CH_LAYOUT_MONO
+#define CH_LAYOUT_STEREO AV_CH_LAYOUT_STEREO
+#define CH_LAYOUT_2_1 AV_CH_LAYOUT_2_1
+#define CH_LAYOUT_SURROUND AV_CH_LAYOUT_SURROUND
+#define CH_LAYOUT_4POINT0 AV_CH_LAYOUT_4POINT0
+#define CH_LAYOUT_2_2 AV_CH_LAYOUT_2_2
+#define CH_LAYOUT_QUAD AV_CH_LAYOUT_QUAD
+#define CH_LAYOUT_5POINT0 AV_CH_LAYOUT_5POINT0
+#define CH_LAYOUT_5POINT1 AV_CH_LAYOUT_5POINT1
+#define CH_LAYOUT_5POINT0_BACK AV_CH_LAYOUT_5POINT0_BACK
+#define CH_LAYOUT_5POINT1_BACK AV_CH_LAYOUT_5POINT1_BACK
+#define CH_LAYOUT_7POINT0 AV_CH_LAYOUT_7POINT0
+#define CH_LAYOUT_7POINT1 AV_CH_LAYOUT_7POINT1
+#define CH_LAYOUT_7POINT1_WIDE AV_CH_LAYOUT_7POINT1_WIDE
+#define CH_LAYOUT_STEREO_DOWNMIX AV_CH_LAYOUT_STEREO_DOWNMIX
+#endif
/* in bytes */
#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
Modified: trunk/libavcore/Makefile
==============================================================================
--- trunk/libavcore/Makefile Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/libavcore/Makefile Sun Nov 21 20:28:52 2010 (r25787)
@@ -3,12 +3,16 @@ include $(SUBDIR)../config.mak
NAME = avcore
FFLIBS = avutil
-HEADERS = avcore.h \
+HEADERS = \
+ audioconvert.h \
+ avcore.h \
imgutils.h \
parseutils.h \
samplefmt.h \
-OBJS = imgutils.o \
+OBJS = \
+ audioconvert.o \
+ imgutils.o \
parseutils.o \
samplefmt.o \
utils.o \
Copied and modified: trunk/libavcore/audioconvert.c (from r25784, trunk/libavcodec/audioconvert.c)
==============================================================================
--- trunk/libavcodec/audioconvert.c Sun Nov 21 19:39:34 2010 (r25784, copy source)
+++ trunk/libavcore/audioconvert.c Sun Nov 21 20:28:52 2010 (r25787)
@@ -1,5 +1,4 @@
/*
- * audio conversion
* Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
*
* This file is part of FFmpeg.
@@ -21,34 +20,13 @@
/**
* @file
- * audio conversion
- * @author Michael Niedermayer <michaelni at gmx.at>
+ * audio conversion routines
*/
#include "libavutil/avstring.h"
-#include "libavutil/libm.h"
-#include "libavcore/samplefmt.h"
-#include "avcodec.h"
#include "audioconvert.h"
-#if FF_API_OLD_SAMPLE_FMT
-const char *avcodec_get_sample_fmt_name(int sample_fmt)
-{
- return av_get_sample_fmt_name(sample_fmt);
-}
-
-enum AVSampleFormat avcodec_get_sample_fmt(const char* name)
-{
- return av_get_sample_fmt(name);
-}
-
-void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt)
-{
- av_get_sample_fmt_string(buf, buf_size, sample_fmt);
-}
-#endif
-
-static const char* const channel_names[]={
+static const char * const channel_names[] = {
"FL", "FR", "FC", "LFE", "BL", "BR", "FLC", "FRC",
"BC", "SL", "SR", "TC", "TFL", "TFC", "TFR", "TBL",
"TBC", "TBR",
@@ -58,46 +36,32 @@ static const char* const channel_names[]
static const char *get_channel_name(int channel_id)
{
- if (channel_id<0 || channel_id>=FF_ARRAY_ELEMS(channel_names))
+ if (channel_id < 0 || channel_id >= FF_ARRAY_ELEMS(channel_names))
return NULL;
return channel_names[channel_id];
}
-int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name)
-{
- switch(nb_channels) {
- case 1: return CH_LAYOUT_MONO;
- case 2: return CH_LAYOUT_STEREO;
- case 3: return CH_LAYOUT_SURROUND;
- case 4: return CH_LAYOUT_QUAD;
- case 5: return CH_LAYOUT_5POINT0;
- case 6: return CH_LAYOUT_5POINT1;
- case 8: return CH_LAYOUT_7POINT1;
- default: return 0;
- }
-}
-
static const struct {
const char *name;
int nb_channels;
int64_t layout;
} channel_layout_map[] = {
- { "mono", 1, CH_LAYOUT_MONO },
- { "stereo", 2, CH_LAYOUT_STEREO },
- { "4.0", 4, CH_LAYOUT_4POINT0 },
- { "quad", 4, CH_LAYOUT_QUAD },
- { "5.0", 5, CH_LAYOUT_5POINT0 },
- { "5.0", 5, CH_LAYOUT_5POINT0_BACK },
- { "5.1", 6, CH_LAYOUT_5POINT1 },
- { "5.1", 6, CH_LAYOUT_5POINT1_BACK },
- { "5.1+downmix", 8, CH_LAYOUT_5POINT1|CH_LAYOUT_STEREO_DOWNMIX, },
- { "7.1", 8, CH_LAYOUT_7POINT1 },
- { "7.1(wide)", 8, CH_LAYOUT_7POINT1_WIDE },
- { "7.1+downmix", 10, CH_LAYOUT_7POINT1|CH_LAYOUT_STEREO_DOWNMIX, },
+ { "mono", 1, AV_CH_LAYOUT_MONO },
+ { "stereo", 2, AV_CH_LAYOUT_STEREO },
+ { "4.0", 4, AV_CH_LAYOUT_4POINT0 },
+ { "quad", 4, AV_CH_LAYOUT_QUAD },
+ { "5.0", 5, AV_CH_LAYOUT_5POINT0 },
+ { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK },
+ { "5.1", 6, AV_CH_LAYOUT_5POINT1 },
+ { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK },
+ { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
+ { "7.1", 8, AV_CH_LAYOUT_7POINT1 },
+ { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
+ { "7.1+downmix", 10, AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ 0 }
};
-int64_t avcodec_get_channel_layout(const char *name)
+int64_t av_get_channel_layout(const char *name)
{
int i = 0;
do {
@@ -109,11 +73,12 @@ int64_t avcodec_get_channel_layout(const
return 0;
}
-void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout)
+void av_get_channel_layout_string(char *buf, int buf_size,
+ int nb_channels, int64_t channel_layout)
{
int i;
- for (i=0; channel_layout_map[i].name; i++)
+ for (i = 0; channel_layout_map[i].name; i++)
if (nb_channels == channel_layout_map[i].nb_channels &&
channel_layout == channel_layout_map[i].layout) {
av_strlcpy(buf, channel_layout_map[i].name, buf_size);
@@ -138,7 +103,7 @@ void avcodec_get_channel_layout_string(c
}
}
-int avcodec_channel_layout_num_channels(int64_t channel_layout)
+int av_get_channel_layout_nb_channels(int64_t channel_layout)
{
int count;
uint64_t x = channel_layout;
@@ -146,86 +111,3 @@ int avcodec_channel_layout_num_channels(
x &= x-1; // unset lowest set bit
return count;
}
-
-struct AVAudioConvert {
- int in_channels, out_channels;
- int fmt_pair;
-};
-
-AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
- enum AVSampleFormat in_fmt, int in_channels,
- const float *matrix, int flags)
-{
- AVAudioConvert *ctx;
- if (in_channels!=out_channels)
- return NULL; /* FIXME: not supported */
- ctx = av_malloc(sizeof(AVAudioConvert));
- if (!ctx)
- return NULL;
- ctx->in_channels = in_channels;
- ctx->out_channels = out_channels;
- ctx->fmt_pair = out_fmt + AV_SAMPLE_FMT_NB*in_fmt;
- return ctx;
-}
-
-void av_audio_convert_free(AVAudioConvert *ctx)
-{
- av_free(ctx);
-}
-
-int av_audio_convert(AVAudioConvert *ctx,
- void * const out[6], const int out_stride[6],
- const void * const in[6], const int in_stride[6], int len)
-{
- int ch;
-
- //FIXME optimize common cases
-
- for(ch=0; ch<ctx->out_channels; ch++){
- const int is= in_stride[ch];
- const int os= out_stride[ch];
- const uint8_t *pi= in[ch];
- uint8_t *po= out[ch];
- uint8_t *end= po + os*len;
- if(!out[ch])
- continue;
-
-#define CONV(ofmt, otype, ifmt, expr)\
-if(ctx->fmt_pair == ofmt + AV_SAMPLE_FMT_NB*ifmt){\
- do{\
- *(otype*)po = expr; pi += is; po += os;\
- }while(po < end);\
-}
-
-//FIXME put things below under ifdefs so we do not waste space for cases no codec will need
-//FIXME rounding ?
-
- CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_U8 , *(const uint8_t*)pi)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<8)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)<<24)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_U8 , (*(const uint8_t*)pi - 0x80)*(1.0 / (1<<7)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S16, (*(const int16_t*)pi>>8) + 0x80)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S16, *(const int16_t*)pi<<16)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S16, *(const int16_t*)pi*(1.0 / (1<<15)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_S32, (*(const int32_t*)pi>>24) + 0x80)
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi>>16)
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_S32, *(const int32_t*)pi)
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1<<31)))
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_S32, *(const int32_t*)pi*(1.0 / (1<<31)))
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_FLT, av_clip_uint8( lrintf(*(const float*)pi * (1<<7)) + 0x80))
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_FLT, av_clip_int16( lrintf(*(const float*)pi * (1<<15))))
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_FLT, av_clipl_int32(llrintf(*(const float*)pi * (1U<<31))))
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_FLT, *(const float*)pi)
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_FLT, *(const float*)pi)
- else CONV(AV_SAMPLE_FMT_U8 , uint8_t, AV_SAMPLE_FMT_DBL, av_clip_uint8( lrint(*(const double*)pi * (1<<7)) + 0x80))
- else CONV(AV_SAMPLE_FMT_S16, int16_t, AV_SAMPLE_FMT_DBL, av_clip_int16( lrint(*(const double*)pi * (1<<15))))
- else CONV(AV_SAMPLE_FMT_S32, int32_t, AV_SAMPLE_FMT_DBL, av_clipl_int32(llrint(*(const double*)pi * (1U<<31))))
- else CONV(AV_SAMPLE_FMT_FLT, float , AV_SAMPLE_FMT_DBL, *(const double*)pi)
- else CONV(AV_SAMPLE_FMT_DBL, double , AV_SAMPLE_FMT_DBL, *(const double*)pi)
- else return -1;
- }
- return 0;
-}
Copied and modified: trunk/libavcore/audioconvert.h (from r25784, trunk/libavcodec/audioconvert.h)
==============================================================================
--- trunk/libavcodec/audioconvert.h Sun Nov 21 19:39:34 2010 (r25784, copy source)
+++ trunk/libavcore/audioconvert.h Sun Nov 21 20:28:52 2010 (r25787)
@@ -1,5 +1,4 @@
/*
- * audio conversion
* Copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
* Copyright (c) 2008 Peter Ross
*
@@ -20,99 +19,76 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef AVCODEC_AUDIOCONVERT_H
-#define AVCODEC_AUDIOCONVERT_H
+#ifndef AVCORE_AUDIOCONVERT_H
+#define AVCORE_AUDIOCONVERT_H
/**
* @file
- * Audio format conversion routines
- */
-
-
-#include "libavutil/cpu.h"
-#include "avcodec.h"
-
-#if FF_API_OLD_SAMPLE_FMT
-/**
- * @deprecated Use av_get_sample_fmt_string() instead.
- */
-attribute_deprecated
-void avcodec_sample_fmt_string(char *buf, int buf_size, int sample_fmt);
-
-/**
- * @deprecated Use av_get_sample_fmt_name() instead.
- */
-attribute_deprecated
-const char *avcodec_get_sample_fmt_name(int sample_fmt);
-
-/**
- * @deprecated Use av_get_sample_fmt() instead.
- */
-attribute_deprecated
-enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
-#endif
-
-/**
- * @return NULL on error
- */
-const char *avcodec_get_channel_name(int channel_id);
-
-/**
- * @return channel layout that matches name, 0 if no match
+ * audio conversion routines
*/
-int64_t avcodec_get_channel_layout(const char *name);
-/**
- * Return description of channel layout
- */
-void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
+#include "avcore.h"
-/**
- * Guess the channel layout
- * @param nb_channels
- * @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
- * @param fmt_name Format name, or NULL if unknown
- * @return Channel layout mask
- */
-int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
+/* Audio channel masks */
+#define AV_CH_FRONT_LEFT 0x00000001
+#define AV_CH_FRONT_RIGHT 0x00000002
+#define AV_CH_FRONT_CENTER 0x00000004
+#define AV_CH_LOW_FREQUENCY 0x00000008
+#define AV_CH_BACK_LEFT 0x00000010
+#define AV_CH_BACK_RIGHT 0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER 0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER 0x00000080
+#define AV_CH_BACK_CENTER 0x00000100
+#define AV_CH_SIDE_LEFT 0x00000200
+#define AV_CH_SIDE_RIGHT 0x00000400
+#define AV_CH_TOP_CENTER 0x00000800
+#define AV_CH_TOP_FRONT_LEFT 0x00001000
+#define AV_CH_TOP_FRONT_CENTER 0x00002000
+#define AV_CH_TOP_FRONT_RIGHT 0x00004000
+#define AV_CH_TOP_BACK_LEFT 0x00008000
+#define AV_CH_TOP_BACK_CENTER 0x00010000
+#define AV_CH_TOP_BACK_RIGHT 0x00020000
+#define AV_CH_STEREO_LEFT 0x20000000 ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT 0x40000000 ///< See AV_CH_STEREO_LEFT.
-/**
- * @return the number of channels in the channel layout.
- */
-int avcodec_channel_layout_num_channels(int64_t channel_layout);
+/** Channel mask value used for AVCodecContext.request_channel_layout
+ to indicate that the user requests the channel order of the decoder output
+ to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE 0x8000000000000000LL
-struct AVAudioConvert;
-typedef struct AVAudioConvert AVAudioConvert;
+/* Audio channel convenience macros */
+#define AV_CH_LAYOUT_MONO (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2_1 (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_4POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_2_2 (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0 (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1 (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
/**
- * Create an audio sample format converter context
- * @param out_fmt Output sample format
- * @param out_channels Number of output channels
- * @param in_fmt Input sample format
- * @param in_channels Number of input channels
- * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore.
- * @param flags See AV_CPU_FLAG_xx
- * @return NULL on error
+ * Return a channel layout id that matches name, 0 if no match.
*/
-AVAudioConvert *av_audio_convert_alloc(enum AVSampleFormat out_fmt, int out_channels,
- enum AVSampleFormat in_fmt, int in_channels,
- const float *matrix, int flags);
+int64_t av_get_channel_layout(const char *name);
/**
- * Free audio sample format converter context
+ * Return a description of a channel layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
*/
-void av_audio_convert_free(AVAudioConvert *ctx);
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
/**
- * Convert between audio sample formats
- * @param[in] out array of output buffers for each channel. set to NULL to ignore processing of the given channel.
- * @param[in] out_stride distance between consecutive output samples (measured in bytes)
- * @param[in] in array of input buffers for each channel
- * @param[in] in_stride distance between consecutive input samples (measured in bytes)
- * @param len length of audio frame size (measured in samples)
+ * Return the number of channels in the channel layout.
*/
-int av_audio_convert(AVAudioConvert *ctx,
- void * const out[6], const int out_stride[6],
- const void * const in[6], const int in_stride[6], int len);
+int av_get_channel_layout_nb_channels(int64_t channel_layout);
-#endif /* AVCODEC_AUDIOCONVERT_H */
+#endif /* AVCORE_AUDIOCONVERT_H */
Modified: trunk/libavcore/avcore.h
==============================================================================
--- trunk/libavcore/avcore.h Sun Nov 21 20:02:52 2010 (r25786)
+++ trunk/libavcore/avcore.h Sun Nov 21 20:28:52 2010 (r25787)
@@ -27,7 +27,7 @@
#include "libavutil/avutil.h"
#define LIBAVCORE_VERSION_MAJOR 0
-#define LIBAVCORE_VERSION_MINOR 13
+#define LIBAVCORE_VERSION_MINOR 14
#define LIBAVCORE_VERSION_MICRO 0
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
More information about the ffmpeg-cvslog
mailing list