RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b845f5e97b655de0a191f736594777fec9754cf5' 

* commit 'b845f5e97b655de0a191f736594777fec9754cf5':
  riff: Factor out WAVEFORMATEX parsing

Conflicts:
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-22 12:53:58 +02:00
parent 51286aaffc b845f5e97b
commit 645d0384e8
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavformat/riff.c
View File

@ -752,6 +752,31 @@ void ff_riff_write_info(AVFormatContext *s)
* WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
* an openended structure.
*/
static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)
{
ff_asf_guid subformat;
int bps = avio_rl16(pb);
if (bps)
c->bits_per_coded_sample = bps;
c->channel_layout = avio_rl32(pb); /* dwChannelMask */
ff_get_guid(pb, &subformat);
if (!memcmp(subformat + 4,
(const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
c->codec_tag = AV_RL32(subformat);
c->codec_id = ff_wav_codec_get_id(c->codec_tag,
c->bits_per_coded_sample);
} else {
c->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat);
if (!c->codec_id)
av_log(c, AV_LOG_WARNING,
"unknown subformat:"FF_PRI_GUID"\n",
FF_ARG_GUID(subformat));
}
}
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
{
int id;
@ -778,26 +803,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
size -= 18;
cbSize = FFMIN(size, cbSize);
if (cbSize >= 22 && id == 0xfffe) { /* WAVEFORMATEXTENSIBLE */
ff_asf_guid subformat;
int bps = avio_rl16(pb);
if (bps)
codec->bits_per_coded_sample = bps;
codec->channel_layout = avio_rl32(pb); /* dwChannelMask */
ff_get_guid(pb, &subformat);
if (!memcmp(subformat + 4,
(const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
codec->codec_tag = AV_RL32(subformat);
codec->codec_id = ff_wav_codec_get_id(codec->codec_tag,
codec->bits_per_coded_sample);
} else {
codec->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids,
subformat);
if (!codec->codec_id)
av_log(codec, AV_LOG_WARNING,
"unknown subformat: "FF_PRI_GUID"\n",
FF_ARG_GUID(subformat));
}
parse_waveformatex(pb, codec);
cbSize -= 22;
size -= 22;
}