diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 17:03:55 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 17:03:55 +0400 |
commit | 83e89787984d3f96cb793ebfddc6078d6bc50073 (patch) | |
tree | be7e09b4e106d85247a3650aa7ff578071482577 /libavutil | |
parent | 595ba3b96258538566d6f42113dd0180aaee87c4 (diff) | |
parent | 5a7e35dd2351c30bab45177b9482cb8833a0ca78 (diff) |
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/Makefile | 1 | ||||
-rw-r--r-- | libavutil/frame.h | 4 | ||||
-rw-r--r-- | libavutil/replaygain.h | 51 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
4 files changed, 57 insertions, 1 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index e131ee442c..2fe3e1549b 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -44,6 +44,7 @@ HEADERS = adler32.h \ pixdesc.h \ pixfmt.h \ random_seed.h \ + replaygain.h \ rational.h \ ripemd.h \ samplefmt.h \ diff --git a/libavutil/frame.h b/libavutil/frame.h index 9fedba8635..6587439ab1 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -92,6 +92,10 @@ enum AVFrameSideDataType { * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. */ AV_FRAME_DATA_DOWNMIX_INFO, + /** + * ReplayGain information in the form of the AVReplayGain struct. + */ + AV_FRAME_DATA_REPLAYGAIN, }; typedef struct AVFrameSideData { diff --git a/libavutil/replaygain.h b/libavutil/replaygain.h new file mode 100644 index 0000000000..a9ea19c67a --- /dev/null +++ b/libavutil/replaygain.h @@ -0,0 +1,51 @@ +/* + * + * 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 AVUTIL_REPLAYGAIN_H +#define AVUTIL_REPLAYGAIN_H + +#include <stdint.h> + +/** + * ReplayGain information (see + * http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_1.0_specification). + * The size of this struct is a part of the public ABI. + */ +typedef struct AVReplayGain { + /** + * Track replay gain in microbels (divide by 100000 to get the value in dB). + * Should be set to INT32_MIN when unknown. + */ + int32_t track_gain; + /** + * Peak track amplitude, with UINT32_MAX representing full scale. 0 when + * unknown. + */ + uint32_t track_peak; + /** + * Same as track_gain, but for the whole album. + */ + int32_t album_gain; + /** + * Same as track_peak, but for the whole album, + */ + uint32_t album_peak; +} AVReplayGain; + +#endif /* AVUTIL_REPLAYGAIN_H */ diff --git a/libavutil/version.h b/libavutil/version.h index 02c9ce0c0e..d880dfdaf5 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 52 -#define LIBAVUTIL_VERSION_MINOR 67 +#define LIBAVUTIL_VERSION_MINOR 68 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |