virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Support writing E-AC3 in wav.

Browse Source
This commit is contained in:
Carl Eugen Hoyos
2014-01-29 00:48:50 +01:00
parent 862174ec83
commit bf9a8d183d
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/riff.c
View File

@ -413,6 +413,8 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_AAC, 0x1600 }, { AV_CODEC_ID_AAC, 0x1600 },
{ AV_CODEC_ID_AAC_LATM, 0x1602 }, { AV_CODEC_ID_AAC_LATM, 0x1602 },
{ AV_CODEC_ID_AC3, 0x2000 }, { AV_CODEC_ID_AC3, 0x2000 },
/* There is no Microsoft Format Tag for E-AC3, the GUID has to be used */
{ AV_CODEC_ID_EAC3, 0x2000 },
{ AV_CODEC_ID_DTS, 0x2001 }, { AV_CODEC_ID_DTS, 0x2001 },
{ AV_CODEC_ID_SONIC, 0x2048 }, { AV_CODEC_ID_SONIC, 0x2048 },
{ AV_CODEC_ID_SONIC_LS, 0x2048 }, { AV_CODEC_ID_SONIC_LS, 0x2048 },

5
libavformat/riffenc.c
View File

@ -72,6 +72,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
waveformatextensible = (enc->channels > 2 && enc->channel_layout) || waveformatextensible = (enc->channels > 2 && enc->channel_layout) ||
enc->sample_rate > 48000 || enc->sample_rate > 48000 ||
enc->codec_id == AV_CODEC_ID_EAC3 ||
av_get_bits_per_sample(enc->codec_id) > 16; av_get_bits_per_sample(enc->codec_id) > 16;
if (waveformatextensible) if (waveformatextensible)
@ -183,10 +184,14 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
/* dwChannelMask */ /* dwChannelMask */
avio_wl32(pb, enc->channel_layout); avio_wl32(pb, enc->channel_layout);
/* GUID + next 3 */ /* GUID + next 3 */
if (enc->codec_id == AV_CODEC_ID_EAC3) {
ff_put_guid(pb, get_codec_guid(enc->codec_id, ff_codec_wav_guids));
} else {
avio_wl32(pb, enc->codec_tag); avio_wl32(pb, enc->codec_tag);
avio_wl32(pb, 0x00100000); avio_wl32(pb, 0x00100000);
avio_wl32(pb, 0xAA000080); avio_wl32(pb, 0xAA000080);
avio_wl32(pb, 0x719B3800); avio_wl32(pb, 0x719B3800);
}
} else { } else {
avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */ avio_wl16(pb, riff_extradata - riff_extradata_start); /* cbSize */
} }

2
libavformat/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 28 #define LIBAVFORMAT_VERSION_MINOR 28
#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \