[FFmpeg-devel] [PATCH 5/5] ADTS to AudioSpecificConfig bitstream filter

[Michael Niedermayer]

On Tue, Jun 02, 2009 at 02:24:08PM -0400, Alex Converse wrote:
> On Sat, May 30, 2009 at 7:32 PM, Michael Niedermayer <michaelni at gmx.at> wrote:
> > On Fri, May 29, 2009 at 04:12:08PM -0400, Alex Converse wrote:
> [...]
> >> + ? ?if (!ctx->first_frame_done) {
> >> + ? ? ? ?int ? ? ? ? ? ?pce_size = 0;
> >> + ? ? ? ?uint8_t ? ? ? ?pce_data[MAX_PCE_SIZE];
> >> + ? ? ? ?if (!hdr.chan_config) {
> >> + ? ? ? ? ? ?init_get_bits(&gb, buf, buf_size);
> >> + ? ? ? ? ? ?if (get_bits(&gb, 3) != 5) {
> >> + ? ? ? ? ? ? ? ?ff_log_missing_feature(avctx, "PCE based channel configuration, where the PCE is not the first syntax element is", 0);
> >> + ? ? ? ? ? ? ? ?return -1;
> >> + ? ? ? ? ? ?}
> >> + ? ? ? ? ? ?init_put_bits(&pb, pce_data, MAX_PCE_SIZE);
> >> + ? ? ? ? ? ?pce_size = ff_copy_pce_data(&pb, &gb)/8;
> >> + ? ? ? ? ? ?flush_put_bits(&pb);
> >
> >> + ? ? ? ? ? ?avctx->extradata_size = 2 + pce_size;
> >> + ? ? ? ? ? ?buf_size -= get_bits_count(&gb)/8;
> >> + ? ? ? ? ? ?buf ? ? ?+= get_bits_count(&gb)/8;
> >> + ? ? ? ?} else {
> >> + ? ? ? ? ? ?avctx->extradata_size = 2;
> >> + ? ? ? ?}
> >
> > avctx->extradata_size = 2 + pce_size;
> > is correct for either side of the branch
> >
> 
> fixed
> 
> [...]
> 
> --Alex

>  Makefile            |    1 
>  aac_adtstoasc_bsf.c |  114 ++++++++++++++++++++++++++++++++++++++++++++++++++++
>  allcodecs.c         |    1 
>  3 files changed, 116 insertions(+)
> 79dbfe9de2105c73b483936c35a629f978791546  0005-ADTS-to-AudioSpecificConfig-bitstream-filter.patch
> diff --git a/libavcodec/Makefile b/libavcodec/Makefile
[...]

> +    buf += AAC_ADTS_HEADER_SIZE + 2*!hdr.crc_absent;
> +    buf_size -= AAC_ADTS_HEADER_SIZE + 2*!hdr.crc_absent;

vertical align

and ok except that

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I do not agree with what you have to say, but I'll defend to the death your
right to say it. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090603/ed03b4d1/attachment.pgp>