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

Add support for PS sync extensions.

Browse Source 
Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse
2010-04-08 06:04:41 +00:00
parent 37216b99e0
commit d14662f66a
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mpeg4audio.c
View File

@@ -88,9 +88,12 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels)) if (c->chan_config < FF_ARRAY_ELEMS(ff_mpeg4audio_channels))
c->channels = ff_mpeg4audio_channels[c->chan_config]; c->channels = ff_mpeg4audio_channels[c->chan_config];
c->sbr = -1; c->sbr = -1;
c->ps = -1;
if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && if (c->object_type == AOT_SBR || (c->object_type == AOT_PS &&
// check for W6132 Annex YYYY draft MP3onMP4 // check for W6132 Annex YYYY draft MP3onMP4
!(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) { !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) {
if (c->object_type == AOT_PS)
c->ps = 1;
c->ext_object_type = AOT_SBR; c->ext_object_type = AOT_SBR;
c->sbr = 1; c->sbr = 1;
c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
@@ -121,6 +124,8 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
c->ext_object_type = get_object_type(&gb); c->ext_object_type = get_object_type(&gb);
if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(&gb)) == 1) if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(&gb)) == 1)
c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
if (get_bits_left(&gb) > 11 && get_bits(&gb, 11) == 0x548)
c->ps = get_bits1(&gb);
break; break;
} else } else
get_bits1(&gb); // skip 1 bit get_bits1(&gb); // skip 1 bit

1
libavcodec/mpeg4audio.h
View File

@@ -37,6 +37,7 @@ typedef struct {
int ext_sample_rate; int ext_sample_rate;
int ext_chan_config; int ext_chan_config;
int channels; int channels;
int ps; //< -1 implicit, 1 presence
} MPEG4AudioConfig; } MPEG4AudioConfig;
extern const int ff_mpeg4audio_sample_rates[16]; extern const int ff_mpeg4audio_sample_rates[16];