# HG changeset patch # User alexc # Date 1242255450 0 # Node ID 8e95c7402d1ad05aad26bdd2dda037cabdcee46b # Parent 4d13e2e2503a23d8e704e7ac4b1bf8672e978ef9 Subroutine to copy an AAC Program Config Element (PCE) diff -r 4d13e2e2503a -r 8e95c7402d1a mpeg4audio.c --- a/mpeg4audio.c Wed May 13 17:59:46 2009 +0000 +++ b/mpeg4audio.c Wed May 13 22:57:30 2009 +0000 @@ -1,6 +1,7 @@ /* * MPEG-4 Audio common code * Copyright (c) 2008 Baptiste Coudurier + * Copyright (c) 2009 Alex Converse * * This file is part of FFmpeg. * @@ -20,6 +21,7 @@ */ #include "get_bits.h" +#include "put_bits.h" #include "mpeg4audio.h" const int ff_mpeg4audio_sample_rates[16] = { @@ -84,3 +86,43 @@ } return specific_config_bitindex; } + +static av_always_inline unsigned int copy_bits(PutBitContext *pb, + GetBitContext *gb, + int bits) +{ + unsigned int el = get_bits(gb, bits); + put_bits(pb, bits, el); + return el; +} + +int ff_copy_pce_data(PutBitContext *pb, GetBitContext *gb) +{ + int five_bit_ch, four_bit_ch, comment_size, bits; + int offset = put_bits_count(pb); + + copy_bits(pb, gb, 10); //Tag, Object Type, Frequency + five_bit_ch = copy_bits(pb, gb, 4); //Front + five_bit_ch += copy_bits(pb, gb, 4); //Side + five_bit_ch += copy_bits(pb, gb, 4); //Back + four_bit_ch = copy_bits(pb, gb, 2); //LFE + four_bit_ch += copy_bits(pb, gb, 3); //Data + five_bit_ch += copy_bits(pb, gb, 4); //Coupling + if (copy_bits(pb, gb, 1)) //Mono Mixdown + copy_bits(pb, gb, 4); + if (copy_bits(pb, gb, 1)) //Stereo Mixdown + copy_bits(pb, gb, 4); + if (copy_bits(pb, gb, 1)) //Matrix Mixdown + copy_bits(pb, gb, 3); + for (bits = five_bit_ch*5+four_bit_ch*4; bits > 16; bits -= 16) + copy_bits(pb, gb, 16); + if (bits) + copy_bits(pb, gb, bits); + align_put_bits(pb); + align_get_bits(gb); + comment_size = copy_bits(pb, gb, 8); + for (; comment_size > 0; comment_size--) + copy_bits(pb, gb, 8); + + return put_bits_count(pb) - offset; +} diff -r 4d13e2e2503a -r 8e95c7402d1a mpeg4audio.h --- a/mpeg4audio.h Wed May 13 17:59:46 2009 +0000 +++ b/mpeg4audio.h Wed May 13 22:57:30 2009 +0000 @@ -23,6 +23,8 @@ #define AVCODEC_MPEG4AUDIO_H #include +#include "get_bits.h" +#include "put_bits.h" typedef struct { int object_type; @@ -90,4 +92,9 @@ AOT_SMR_MAIN, ///< N Symbolic Music Representation Main }; +#define MAX_PCE_SIZE 304 ///