highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flvdec: read audio sample size and channels metadata

Browse Source 
This is needed in order for the FLV demuxer not to detect a codec change when
using the "flv_metadata" option.
This commit is contained in:
Justin Ruggles 2013-03-21 08:23:51 -04:00
parent c3d0157753
commit e46a2a7309
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/flvdec.c
View File

@ -400,7 +400,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
acodec = astream ? astream->codec : NULL; acodec = astream ? astream->codec : NULL;
vcodec = vstream ? vstream->codec : NULL; vcodec = vstream ? vstream->codec : NULL;
if (amf_type == AMF_DATA_TYPE_NUMBER) { if (amf_type == AMF_DATA_TYPE_NUMBER || amf_type == AMF_DATA_TYPE_BOOL) {
if (!strcmp(key, "duration")) if (!strcmp(key, "duration"))
s->duration = num_val * AV_TIME_BASE; s->duration = num_val * AV_TIME_BASE;
else if (!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0)) else if (!strcmp(key, "videodatarate") && vcodec && 0 <= (int)(num_val * 1024.0))
@ -422,6 +422,13 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
} else } else
if (!strcmp(key, "audiosamplerate") && acodec) { if (!strcmp(key, "audiosamplerate") && acodec) {
acodec->sample_rate = num_val; acodec->sample_rate = num_val;
} else if (!strcmp(key, "audiosamplesize") && acodec) {
acodec->bits_per_coded_sample = num_val;
} else if (!strcmp(key, "stereo") && acodec) {
acodec->channels = num_val + 1;
acodec->channel_layout = acodec->channels == 2 ?
AV_CH_LAYOUT_STEREO :
AV_CH_LAYOUT_MONO;
} else } else
if (!strcmp(key, "width") && vcodec) { if (!strcmp(key, "width") && vcodec) {
vcodec->width = num_val; vcodec->width = num_val;