From 262d1c5d2206467809fd81d841d09ad70cc8ba13 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 2 Nov 2010 20:45:46 +0000 Subject: [PATCH] Move sample format definitions from libavcodec to libavcore. Originally committed as revision 25652 to svn://svn.ffmpeg.org/ffmpeg/trunk --- doc/APIchanges | 4 ++++ libavcodec/avcodec.h | 29 ++++++++++++++++------------- libavcore/Makefile | 1 + libavcore/avcore.h | 4 ++-- libavcore/samplefmt.h | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 libavcore/samplefmt.h diff --git a/doc/APIchanges b/doc/APIchanges index b92e5dc907..eaa112f8bd 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2009-03-08 API changes, most recent first: +2010-11-02 - r25652 - lavcore 0.10.0 - samplefmt.h + Define enum AVSampleFormat in libavcore/samplefmt.h, deprecate enum + SampleFormat. + 2010-10-16 - r25502 - lavfi 1.52.0 - avfilter_graph_config() Add the function avfilter_graph_config() in avfiltergraph.h. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 96d7987bdd..571e8271b7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -27,12 +27,13 @@ */ #include +#include "libavcore/samplefmt.h" #include "libavutil/avutil.h" #include "libavutil/cpu.h" #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 94 -#define LIBAVCODEC_VERSION_MICRO 0 +#define LIBAVCODEC_VERSION_MICRO 1 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -75,6 +76,9 @@ #ifndef FF_API_INOFFICIAL #define FF_API_INOFFICIAL (LIBAVCODEC_VERSION_MAJOR < 53) #endif +#ifndef FF_API_OLD_SAMPLE_FMT +#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 53) +#endif #define AV_NOPTS_VALUE INT64_C(0x8000000000000000) #define AV_TIME_BASE 1000000 @@ -410,18 +414,17 @@ enum CodecID { #define CODEC_TYPE_NB AVMEDIA_TYPE_NB #endif -/** - * all in native-endian format - */ -enum SampleFormat { - SAMPLE_FMT_NONE = -1, - SAMPLE_FMT_U8, ///< unsigned 8 bits - SAMPLE_FMT_S16, ///< signed 16 bits - SAMPLE_FMT_S32, ///< signed 32 bits - SAMPLE_FMT_FLT, ///< float - SAMPLE_FMT_DBL, ///< double - SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if dynamically linking to libavcodec -}; +#if FF_API_OLD_SAMPLE_FMT +#define SampleFormat AVSampleFormat + +#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE +#define SAMPLE_FMT_U8 AV_SAMPLE_FMT_U8 +#define SAMPLE_FMT_S16 AV_SAMPLE_FMT_S16 +#define SAMPLE_FMT_S32 AV_SAMPLE_FMT_S32 +#define SAMPLE_FMT_FLT AV_SAMPLE_FMT_FLT +#define SAMPLE_FMT_DBL AV_SAMPLE_FMT_DBL +#define SAMPLE_FMT_NB AV_SAMPLE_FMT_NB +#endif /* Audio channel masks */ #define CH_FRONT_LEFT 0x00000001 diff --git a/libavcore/Makefile b/libavcore/Makefile index 5e16c34fbd..97d973fa28 100644 --- a/libavcore/Makefile +++ b/libavcore/Makefile @@ -6,6 +6,7 @@ FFLIBS = avutil HEADERS = avcore.h \ imgutils.h \ parseutils.h \ + samplefmt.h \ OBJS = imgutils.o \ parseutils.o \ diff --git a/libavcore/avcore.h b/libavcore/avcore.h index a77bab84f1..5870817f23 100644 --- a/libavcore/avcore.h +++ b/libavcore/avcore.h @@ -27,8 +27,8 @@ #include "libavutil/avutil.h" #define LIBAVCORE_VERSION_MAJOR 0 -#define LIBAVCORE_VERSION_MINOR 9 -#define LIBAVCORE_VERSION_MICRO 1 +#define LIBAVCORE_VERSION_MINOR 10 +#define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ LIBAVCORE_VERSION_MINOR, \ diff --git a/libavcore/samplefmt.h b/libavcore/samplefmt.h new file mode 100644 index 0000000000..163246b35f --- /dev/null +++ b/libavcore/samplefmt.h @@ -0,0 +1,35 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCORE_SAMPLEFMT_H +#define AVCORE_SAMPLEFMT_H + +/** + * all in native-endian format + */ +enum AVSampleFormat { + AV_SAMPLE_FMT_NONE = -1, + AV_SAMPLE_FMT_U8, ///< unsigned 8 bits + AV_SAMPLE_FMT_S16, ///< signed 16 bits + AV_SAMPLE_FMT_S32, ///< signed 32 bits + AV_SAMPLE_FMT_FLT, ///< float + AV_SAMPLE_FMT_DBL, ///< double + AV_SAMPLE_FMT_NB ///< Number of sample formats. DO NOT USE if dynamically linking to libavcore +}; + +#endif /* AVCORE_SAMPLEFMT_H */