July 2008 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r2938 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 21:37:03 2008 New Revision: 2938 Log: Simplify doxygen comments for function parameters band_type* and sf by using an additional comment to indicate the indices of the arrays Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 21:37:03 2008 @@ -1052,8 +1052,10 @@ static inline float ivquant(AACContext * /** * Decode section_data payload; reference: table 4.46. * - * @param band_type array of the band type used for a window group's scalefactor band - * @param band_type_run_end array of the last scalefactor band of a band type run for a window group's scalefactor band + * @param band_type array of the used band type + * @param band_type_run_end array of the last scalefactor band of a band type run + * + * The band_type* arrays have indices [window group][scalefactor band]. * @return Returns error status. 0 - OK, !0 - error */ static int decode_band_types(AACContext * ac, GetBitContext * gb, IndividualChannelStream * ics, enum BandType band_type[][64], int band_type_run_end[][64]) { @@ -1092,9 +1094,11 @@ static int decode_band_types(AACContext * * @param mix_gain channel gain (Not used by AAC bitstream.) * @param global_gain first scalefactor value as scalefactors are differentially coded - * @param band_type array of the band type used for a window group's scalefactor band - * @param band_type_run_end array of the last scalefactor band of a band type run for a window group's scalefactor band - * @param sf array of scalefactors or intensity stereo positions used for a window group's scalefactor band + * @param band_type array of the used band type + * @param band_type_run_end array of the last scalefactor band of a band type run + * @param sf array of scalefactors or intensity stereo positions + * + * The band_type* and sf arrays have indices [window group][scalefactor band]. * @return Returns error status. 0 - OK, !0 - error */ static int decode_scalefactors(AACContext * ac, GetBitContext * gb, float mix_gain, unsigned int global_gain, @@ -1246,8 +1250,10 @@ static void decode_mid_side_stereo(AACCo /** * Decode spectral data; reference: table 4.50. * - * @param band_type array of the band type used for a window group's scalefactor band + * @param band_type array of the used band type * @param icoef array of quantized spectral data + * + * The band_type array has indices [window group][scalefactor band] * @return Returns error status. 0 - OK, !0 - error */ static int decode_spectrum(AACContext * ac, GetBitContext * gb, const IndividualChannelStream * ics, const enum BandType band_type[][64], int icoef[1024]) { @@ -1326,9 +1332,11 @@ static void add_pulses(AACContext * ac, * Dequantize and scale spectral data; reference: 4.6.3.3. * * @param icoef array of quantized spectral data - * @param band_type array of the band type used for a window group's scalefactor band - * @param sf array of scalefactors or intensity stereo positions used for a window group's scalefactor band + * @param band_type array of the used band type + * @param sf array of scalefactors or intensity stereo positions * @param coef array of dequantized, scaled spectral data + * + * The band_type and sf arrays have indices [window group][scalefactor band]. */ static void dequant(AACContext * ac, const IndividualChannelStream * ics, const int icoef[1024], const enum BandType band_type[][64], const float sf[][64], float coef[1024]) {

1 0

[soc]: r2937 - mxf/mxfenc.c
by spyfeng 30 Jul '08

30 Jul '08

Author: spyfeng Date: Wed Jul 30 18:32:52 2008 New Revision: 2937 Log: use UID instead of UID * in function mxf_write_reference() Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 18:32:52 2008 @@ -324,11 +324,11 @@ static void mxf_write_local_tag(ByteIOCo put_be16(pb, value_size); } -static void mxf_write_reference(ByteIOContext *pb, int ref_count, UID *value) +static void mxf_write_reference(ByteIOContext *pb, int ref_count, UID value) { put_be32(pb, ref_count); put_be32(pb, 16); - put_buffer(pb, *value, 16 * ref_count); + put_buffer(pb, value, sizeof(UID) * ref_count); } static void mxf_free(AVFormatContext *s) @@ -401,7 +401,7 @@ static int mxf_write_preface(AVFormatCon if (mxf_generate_reference(s, &refs->identification, 1) < 0) return -1; mxf_write_local_tag(pb, 16 + 8, 0x3B06); - mxf_write_reference(pb, 1, refs->identification); + mxf_write_reference(pb, 1, *refs->identification); // write content_storage_refs if (mxf_generate_reference(s, &refs->content_storage, 1) < 0) @@ -414,7 +414,7 @@ static int mxf_write_preface(AVFormatCon // write essence_container_refs mxf_write_local_tag(pb, 8 + 16 * mxf->essence_container_count, 0x3B0A); - mxf_write_reference(pb, mxf->essence_container_count, mxf->essence_container_uls); + mxf_write_reference(pb, mxf->essence_container_count, *mxf->essence_container_uls); // write dm_scheme_refs mxf_write_local_tag(pb, 8, 0x3B0B); @@ -504,7 +504,7 @@ static int mxf_write_content_storage(AVF if (mxf_generate_reference(s, refs->package, 2) < 0) return -1; mxf_write_local_tag(pb, 16 * 2 + 8, 0x1901); - mxf_write_reference(pb, 2, *refs->package); + mxf_write_reference(pb, 2, **refs->package); return 0; } @@ -562,7 +562,7 @@ static int mxf_write_package(AVFormatCon if (mxf_generate_reference(s, refs->track, s->nb_streams) < 0) return -1; mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x4403); - mxf_write_reference(pb, s->nb_streams, *refs->track); + mxf_write_reference(pb, s->nb_streams, **refs->track); // every track have 1 sequence and 1 structural componet, malloc memory for the refs pointer refs->sequence = av_mallocz(s->nb_streams * sizeof(*refs->sequence)); @@ -694,7 +694,7 @@ static int mxf_write_sequence(AVFormatCo if (mxf_generate_reference(s, &refs->structural_component[stream_index], 1) < 0) return -1; mxf_write_local_tag(pb, 16 + 8, 0x1001); - mxf_write_reference(pb, 1, refs->structural_component[stream_index]); + mxf_write_reference(pb, 1, *refs->structural_component[stream_index]); return 0; } @@ -787,7 +787,7 @@ static int mxf_write_multi_descriptor(AV if (mxf_generate_reference(s, refs->sub_desc, s->nb_streams) < 0) return -1; mxf_write_local_tag(pb, s->nb_streams * 16 + 8, 0x3F01); - mxf_write_reference(pb, s->nb_streams, *refs->sub_desc); + mxf_write_reference(pb, s->nb_streams, **refs->sub_desc); return 0; } @@ -1021,7 +1021,7 @@ static void mxf_write_partition(AVFormat put_buffer(pb, op1a_ul, 16); // operational pattern // essence container - mxf_write_reference(pb, mxf->essence_container_count, mxf->essence_container_uls); + mxf_write_reference(pb, mxf->essence_container_count, *mxf->essence_container_uls); #ifdef DEBUG av_log(s,AV_LOG_DEBUG, "essence container count:%d\n", mxf->essence_container_count); for (i = 0; i < mxf->essence_container_count; i++)

1 0

[soc]: r2936 - mxf/mxfenc.c
by spyfeng 30 Jul '08

30 Jul '08

Author: spyfeng Date: Wed Jul 30 18:25:41 2008 New Revision: 2936 Log: remove useless code line in klv_encode_ber_length(), return 0 directly. Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 18:25:41 2008 @@ -269,7 +269,6 @@ static int klv_encode_ber_length(ByteIOC uint64_t tmp = len; if (len < 128) { //short form - size = 1; put_byte(pb, len); return 1; } @@ -285,7 +284,7 @@ static int klv_encode_ber_length(ByteIOC size --; put_byte(pb, len >> 8 * size & 0xff); } - return size; + return 0; } static const MXFCodecUL *mxf_get_essence_container_ul(const MXFCodecUL *uls, enum CodecID type)

1 0

[soc]: r2935 - mxf/mxfenc.c
by spyfeng 30 Jul '08

30 Jul '08

Author: spyfeng Date: Wed Jul 30 18:20:09 2008 New Revision: 2935 Log: modify type error for if condition. Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 18:20:09 2008 @@ -252,7 +252,7 @@ static int mxf_generate_reference(AVForm int i; UID *p; *refs = av_mallocz(ref_count * sizeof(UID)); - if (!refs) + if (!*refs) return AVERROR(ENOMEM); p = *refs; for (i = 0; i < ref_count; i++) {

1 0

[soc]: r2934 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 18:09:35 2008 New Revision: 2934 Log: Rename output_samples() as mixdown_and_convert_to_int16() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 18:09:35 2008 @@ -2177,7 +2177,7 @@ static int spectral_to_sample(AACContext * @param data_size output data size in bytes * @return Returns error status. 0 - OK, !0 - error */ -static int output_samples(AVCodecContext * avccontext, uint16_t * data, int * data_size) { +static int mixdown_and_convert_to_int16(AVCodecContext * avccontext, uint16_t * data, int * data_size) { AACContext * ac = avccontext->priv_data; int i; float *c, *l, *r, *sl, *sr, *out; @@ -2314,7 +2314,7 @@ static int aac_decode_frame(AVCodecConte if((err = spectral_to_sample(ac))) return err; - if((err = output_samples(avccontext, data, data_size))) + if((err = mixdown_and_convert_to_int16(avccontext, data, data_size))) return err; return buf_size;

1 0

[soc]: r2933 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 18:07:57 2008 New Revision: 2933 Log: Improve doxygen comment for 'index' parameter Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 18:07:57 2008 @@ -2039,7 +2039,7 @@ static void apply_ssr(AACContext * ac, S /** * Apply dependent channel coupling (applied before IMDCT). * - * @param index which gain to use for coupling + * @param index index into coupling gain array */ static void apply_dependent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { IndividualChannelStream * ics = &cc->ch[0].ics; @@ -2072,7 +2072,7 @@ static void apply_dependent_coupling(AAC /** * Apply independent channel coupling (applied after IMDCT). * - * @param index which gain to use for coupling + * @param index index into coupling gain array */ static void apply_independent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { int i; @@ -2084,7 +2084,7 @@ static void apply_independent_coupling(A /** * channel coupling transformation interface * - * @param index which gain to use for coupling + * @param index index into coupling gain array * @param apply_coupling_method pointer to (in)dependent coupling function */ static void apply_channel_coupling(AACContext * ac, ChannelElement * cc,

1 0

[soc]: r2931 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 18:06:05 2008 New Revision: 2931 Log: Rename (in)dependent_coupling() as apply_(in)dependent_coupling() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 18:06:05 2008 @@ -2041,7 +2041,7 @@ static void apply_ssr(AACContext * ac, S * * @param index which gain to use for coupling */ -static void dependent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { +static void apply_dependent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { IndividualChannelStream * ics = &cc->ch[0].ics; const uint16_t * offsets = ics->swb_offset; float * dest = sce->coeffs; @@ -2074,7 +2074,7 @@ static void dependent_coupling(AACContex * * @param index which gain to use for coupling */ -static void independent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { +static void apply_independent_coupling(AACContext * ac, ChannelElement * cc, SingleChannelElement * sce, int index) { int i; float gain = cc->coup.gain[index][0][0] * sce->mixing_gain; for (i = 0; i < 1024; i++) @@ -2124,7 +2124,7 @@ static int spectral_to_sample(AACContext ChannelElement *che = ac->che[j][i]; if(che) { if(j == ID_CCE && !che->coup.is_indep_coup && (che->coup.domain == 0)) - apply_channel_coupling(ac, che, dependent_coupling); + apply_channel_coupling(ac, che, apply_dependent_coupling); #ifdef AAC_LTP if (ac->m4ac.object_type == AOT_AAC_LTP) { int ret; @@ -2139,7 +2139,7 @@ static int spectral_to_sample(AACContext if(che->ch[1].tns.present) apply_tns(ac, 1, &che->ch[1], che->ch[1].coeffs); if(j == ID_CCE && !che->coup.is_indep_coup && (che->coup.domain == 1)) - apply_channel_coupling(ac, che, dependent_coupling); + apply_channel_coupling(ac, che, apply_dependent_coupling); #ifdef AAC_SSR if (ac->m4ac.object_type == AOT_AAC_SSR) { apply_ssr(ac, &che->ch[0]); @@ -2154,7 +2154,7 @@ static int spectral_to_sample(AACContext } #endif /* AAC_SSR */ if(j == ID_CCE && che->coup.is_indep_coup && (che->coup.domain == 1)) - apply_channel_coupling(ac, che, independent_coupling); + apply_channel_coupling(ac, che, apply_independent_coupling); #ifdef AAC_LTP if (ac->m4ac.object_type == AOT_AAC_LTP) { int ret;

1 0

[soc]: r2903 - mxf/mxfenc.c
by spyfeng 30 Jul '08

30 Jul '08

Author: spyfeng Date: Tue Jul 29 19:01:20 2008 New Revision: 2903 Log: change lower case to upper case of the keys Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Tue Jul 29 19:01:20 2008 @@ -101,22 +101,22 @@ typedef struct { enum CodecType type; } MXFDescriptorWriteTableEntry; -static const uint8_t umid_base[] = {0x06, 0x0a, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0f, 0x00, 0x13, 0x00, 0x00, 0x00}; +static const uint8_t umid_base[] = {0x06, 0x0A, 0x2B, 0x34, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x00, 0x13, 0x00, 0x00, 0x00}; /* complete key */ -static const uint8_t op1a_ul[] = { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x01, 0x0d, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00 }; -static const uint8_t header_partition_key[] = { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0d, 0x01, 0x02, 0x01, 0x01, 0x02, 0x04, 0x00 }; // ClosedComplete -static const uint8_t footer_partition_key[] = {0x06, 0x0e, 0x2b, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0d, 0x01, 0x02, 0x01, 0x01, 0x04, 0x04, 0x00}; // ClosedComplete -static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0d,0x01,0x02,0x01,0x01,0x05,0x01,0x00 }; +static const uint8_t op1a_ul[] = { 0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00 }; +static const uint8_t header_partition_key[] = { 0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x02, 0x04, 0x00 }; // ClosedComplete +static const uint8_t footer_partition_key[] = {0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x04, 0x04, 0x00}; // ClosedComplete +static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 }; static const MXFEssenceElementKey mxf_essence_element_key[] = { - { { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x05,0x00}, CODEC_ID_MPEG2VIDEO}, - { { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x16,0x01,0x01,0x00}, CODEC_ID_PCM_S16LE}, + { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00}, CODEC_ID_MPEG2VIDEO}, + { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00}, CODEC_ID_PCM_S16LE}, { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, CODEC_ID_NONE}, }; /* partial key for header metadata */ -static const uint8_t header_metadata_key[] = {0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01}; +static const uint8_t header_metadata_key[] = {0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01}; /* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */ static const MXFDataDefinitionUL mxf_data_definition_uls[] = {

4 4

[soc]: r2929 - mxf/mxfenc.c
by spyfeng 30 Jul '08

30 Jul '08

Author: spyfeng Date: Wed Jul 30 17:33:11 2008 New Revision: 2929 Log: unify format of the key tables. remove the space; vertically align. Modified: mxf/mxfenc.c Modified: mxf/mxfenc.c ============================================================================== --- mxf/mxfenc.c (original) +++ mxf/mxfenc.c Wed Jul 30 17:33:11 2008 @@ -101,23 +101,23 @@ typedef struct { enum CodecType type; } MXFDescriptorWriteTableEntry; -static const uint8_t umid_base[] = {0x06, 0x0A, 0x2B, 0x34, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x0F, 0x00, 0x13, 0x00, 0x00, 0x00}; +static const uint8_t umid_base[] = { 0x06,0x0A,0x2B,0x34,0x01,0x01,0x01,0x01,0x01,0x01,0x0F,0x00,0x13,0x00,0x00,0x00 }; /* complete key */ -static const uint8_t op1a_ul[] = { 0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x00 }; -static const uint8_t header_partition_key[] = { 0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x02, 0x04, 0x00 }; // ClosedComplete -static const uint8_t footer_partition_key[] = {0x06, 0x0E, 0x2B, 0x34, 0x02, 0x05, 0x01, 0x01, 0x0D, 0x01, 0x02, 0x01, 0x01, 0x04, 0x04, 0x00}; // ClosedComplete -static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 }; +static const uint8_t op1a_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x01,0x01,0x00 }; +static const uint8_t header_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x02,0x04,0x00 }; // ClosedComplete +static const uint8_t footer_partition_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x04,0x04,0x00 }; // ClosedComplete +static const uint8_t primer_pack_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x05,0x01,0x01,0x0D,0x01,0x02,0x01,0x01,0x05,0x01,0x00 }; + +/* partial key for header metadata */ +static const uint8_t header_metadata_key[] = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01 }; static const MXFEssenceElementKey mxf_essence_element_key[] = { - { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00}, CODEC_ID_MPEG2VIDEO}, - { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00}, CODEC_ID_PCM_S16LE}, - { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}, CODEC_ID_NONE}, + { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, CODEC_ID_MPEG2VIDEO}, + { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x16,0x01,0x01,0x00 }, CODEC_ID_PCM_S16LE}, + { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, CODEC_ID_NONE}, }; -/* partial key for header metadata */ -static const uint8_t header_metadata_key[] = {0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0D,0x01,0x01,0x01,0x01}; - /* SMPTE RP224 http://www.smpte-ra.org/mdd/index.html */ static const MXFDataDefinitionUL mxf_data_definition_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, CODEC_TYPE_VIDEO }, @@ -147,7 +147,7 @@ static const MXFCodecUL mxf_codec_uls[] { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, CODEC_ID_NONE }, }; -static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 }; +static const uint8_t multiple_desc_ul[] = { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x03,0x0D,0x01,0x03,0x01,0x02,0x7F,0x01,0x00 }; static const MXFCodecUL mxf_picture_essence_container_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, 14, CODEC_ID_MPEG2VIDEO }, /* MPEG-ES Frame wrapped */

1 0

[soc]: r2928 - aac/aac.c
by superdump 30 Jul '08

30 Jul '08

Author: superdump Date: Wed Jul 30 17:31:55 2008 New Revision: 2928 Log: Rename dynamic_range_info() as decode_dynamic_range() Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Jul 30 17:31:55 2008 @@ -1630,7 +1630,7 @@ static int decode_drc_channel_exclusions * @param cnt length of ID_FIL syntactic element in bytes * @return Returns number of bytes consumed. */ -static int dynamic_range_info(AACContext * ac, GetBitContext * gb, int cnt) { +static int decode_dynamic_range(AACContext * ac, GetBitContext * gb, int cnt) { int n = 1; int drc_num_bands = 1; int i; @@ -1690,7 +1690,7 @@ static int extension_payload(AACContext res = decode_sbr_extension(ac, gb, crc_flag, cnt); break; case EXT_DYNAMIC_RANGE: - res = dynamic_range_info(ac, gb, cnt); + res = decode_dynamic_range(ac, gb, cnt); break; case EXT_FILL: case EXT_FILL_DATA:

1 0