November 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r5462 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:59 2009 New Revision: 5462 Log: Change vk0 and vk1 to int16_t to prevent a size mismatch on memcpy. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:58 2009 (r5461) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:59 2009 (r5462) @@ -240,7 +240,7 @@ static int sbr_make_f_master(AACContext float warp = spectrum->bs_alter_scale ? 1.3 : 1.0; // bs_alter_scale = {0,1} unsigned int two_regions, num_bands_0; int vdk0_max, vdk1_min; - int vk0[49]; + int16_t vk0[49]; if (sbr->k[2] / (float)sbr->k[0] > 2.2449) { two_regions = 1; @@ -277,7 +277,7 @@ static int sbr_make_f_master(AACContext } if (two_regions) { - int vk1[49]; + int16_t vk1[49]; unsigned int num_bands_1 = lroundf(bands * logf(sbr->k[2] / (float)sbr->k[1]) / (2.0f * logf(2.0f) * warp)) << 1;

1 0

[soc]: r5461 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:58 2009 New Revision: 5461 Log: Allocate vk0 and vk1 on the stack to prevent memory leaks. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:56 2009 (r5460) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:58 2009 (r5461) @@ -240,7 +240,7 @@ static int sbr_make_f_master(AACContext float warp = spectrum->bs_alter_scale ? 1.3 : 1.0; // bs_alter_scale = {0,1} unsigned int two_regions, num_bands_0; int vdk0_max, vdk1_min; - int *vk0; + int vk0[49]; if (sbr->k[2] / (float)sbr->k[0] > 2.2449) { two_regions = 1; @@ -257,7 +257,6 @@ static int sbr_make_f_master(AACContext return -1; } - vk0 = av_malloc((num_bands_0 + 1) * sizeof(int)); vk0[0] = 0; for (k = 0; k < num_bands_0; k++) { @@ -278,12 +277,10 @@ static int sbr_make_f_master(AACContext } if (two_regions) { - int *vk1; + int vk1[49]; unsigned int num_bands_1 = lroundf(bands * logf(sbr->k[2] / (float)sbr->k[1]) / (2.0f * logf(2.0f) * warp)) << 1; - vk1 = av_malloc((num_bands_1 + 1) * sizeof(int)); - for (k = 0; k < num_bands_1; k++) { vk1[k + 1] = lroundf(sbr->k[1] * powf(sbr->k[2] / (float)sbr->k[1], (k + 1) / (float)num_bands_1)) - lroundf(sbr->k[1] * powf(sbr->k[2] / (float)sbr->k[1], k / (float)num_bands_1)); @@ -314,12 +311,10 @@ static int sbr_make_f_master(AACContext memcpy(&sbr->f_master[0], vk0, (num_bands_0 + 1) * sizeof(sbr->f_master[0])); memcpy(&sbr->f_master[num_bands_0 + 1], vk1 + 1, num_bands_1 * sizeof(sbr->f_master[0])); - av_free(vk1); } else { sbr->n_master = num_bands_0; memcpy(sbr->f_master, vk0, (num_bands_0 + 1) * sizeof(sbr->f_master[0])); } - av_free(vk0); } // Requirements (14496-3 sp04 p205) if (sbr->spectrum_params[1].bs_xover_band >= sbr->n_master) {

1 0

[soc]: r5460 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:56 2009 New Revision: 5460 Log: Pass the current spectrum_params to sbr_make_f_master. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:54 2009 (r5459) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:56 2009 (r5460) @@ -779,7 +779,7 @@ static unsigned int sbr_data(AACContext static void sbr_reset(AACContext *ac, SpectralBandReplication *sbr) { int err; - err = sbr_make_f_master(ac, sbr, sbr->spectrum_params); + err = sbr_make_f_master(ac, sbr, &sbr->spectrum_params[1]); if (err >= 0) err = sbr_make_f_derived(ac, sbr); sbr->reset = 0;

1 0

[soc]: r5459 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:54 2009 New Revision: 5459 Log: Set ext_sample_rate for implicit SBR. This is done in the SBR code so that it doesn't have to be duplicated in all of the formats which can contain AAC. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:52 2009 (r5458) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:54 2009 (r5459) @@ -806,6 +806,9 @@ int ff_decode_sbr_extension(AACContext * GetBitContext *gb = &gbc; skip_bits_long(gb_host, cnt*8 - 4); + if (!ac->m4ac.ext_sample_rate) + ac->m4ac.ext_sample_rate = 2 * ac->m4ac.sample_rate; + if (crc) { skip_bits(gb, 10); // bs_sbr_crc_bits; FIXME - implement CRC check num_sbr_bits += 10;

1 0

[soc]: r5458 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:52 2009 New Revision: 5458 Log: If SBR's reset procedure fails switch back to pure upsampling mode. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Thu Nov 26 22:52:50 2009 (r5457) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:52 2009 (r5458) @@ -778,9 +778,15 @@ static unsigned int sbr_data(AACContext static void sbr_reset(AACContext *ac, SpectralBandReplication *sbr) { - sbr_make_f_master(ac, sbr, sbr->spectrum_params); - sbr_make_f_derived(ac, sbr); + int err; + err = sbr_make_f_master(ac, sbr, sbr->spectrum_params); + if (err >= 0) + err = sbr_make_f_derived(ac, sbr); sbr->reset = 0; + if (err < 0) { + av_log(ac->avccontext, AV_LOG_ERROR, "SBR reset failed. Switching SBR to pure upsampling mode.\n"); + sbr->start = 0; + } } /**

1 0

[soc]: r5457 - aac-sbr/aacsbr.c
by alexc 26 Nov '09

26 Nov '09

Author: alexc Date: Thu Nov 26 22:52:50 2009 New Revision: 5457 Log: Read SBR bits from a second GetBitContext to prevent unrecoverable over-reads and get automatic under-read protection. Modified: aac-sbr/aacsbr.c Modified: aac-sbr/aacsbr.c ============================================================================== --- aac-sbr/aacsbr.c Fri Nov 20 21:48:49 2009 (r5456) +++ aac-sbr/aacsbr.c Thu Nov 26 22:52:50 2009 (r5457) @@ -792,9 +792,13 @@ static void sbr_reset(AACContext *ac, Sp * @return Returns number of bytes consumed from the TYPE_FIL element. */ int ff_decode_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, - GetBitContext *gb, int crc, int cnt, int id_aac) + GetBitContext *gb_host, int crc, int cnt, int id_aac) { unsigned int num_sbr_bits = 0, num_align_bits; + unsigned bytes_read; + GetBitContext gbc = *gb_host; + GetBitContext *gb = &gbc; + skip_bits_long(gb_host, cnt*8 - 4); if (crc) { skip_bits(gb, 10); // bs_sbr_crc_bits; FIXME - implement CRC check @@ -812,9 +816,11 @@ int ff_decode_sbr_extension(AACContext * num_sbr_bits += sbr_data(ac, sbr, gb, id_aac); num_align_bits = ((cnt << 3) - 4 - num_sbr_bits) & 7; - skip_bits(gb, num_align_bits); // bs_fill_bits - - return (num_sbr_bits + num_align_bits + 4) >> 3; + bytes_read = ((num_sbr_bits + num_align_bits + 4) / 8); + if (bytes_read > cnt) { + av_log(ac->avccontext, AV_LOG_ERROR, "Expected to read %d SBR bytes actually read %d.\n", cnt, bytes_read); + } + return cnt; } // Time/frequency Grid (14496-3 sp04 p200)

1 0

[soc]: r5456 - in aac-sbr: checkout.sh ffmpeg.diff
by alexc 20 Nov '09

20 Nov '09

Author: alexc Date: Fri Nov 20 21:48:49 2009 New Revision: 5456 Log: Merge changes from trunk such that ffmpeg.diff cleanly applies. Modified: aac-sbr/checkout.sh aac-sbr/ffmpeg.diff Modified: aac-sbr/checkout.sh ============================================================================== --- aac-sbr/checkout.sh Fri Nov 20 21:32:14 2009 (r5455) +++ aac-sbr/checkout.sh Fri Nov 20 21:48:49 2009 (r5456) @@ -1,7 +1,7 @@ #!/bin/sh echo "Checking out FFmpeg..." -svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg -r 20025 +svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg -r 20564 echo "Copying SBR files into FFmpeg tree..." cp aacsbr*.[ch] ffmpeg/libavcodec echo "Applying SBR and build system patch" Modified: aac-sbr/ffmpeg.diff ============================================================================== --- aac-sbr/ffmpeg.diff Fri Nov 20 21:32:14 2009 (r5455) +++ aac-sbr/ffmpeg.diff Fri Nov 20 21:48:49 2009 (r5456) @@ -1,6 +1,6 @@ Index: libavcodec/aac.c =================================================================== ---- libavcodec/aac.c (revision 20025) +--- libavcodec/aac.c (revision 20564) +++ libavcodec/aac.c (working copy) @@ -62,7 +62,7 @@ * N MIDI @@ -21,7 +21,7 @@ Index: libavcodec/aac.c #include "mpeg4audio.h" #include "aac_parser.h" -@@ -474,6 +477,7 @@ +@@ -507,6 +510,7 @@ avccontext->sample_fmt = SAMPLE_FMT_S16; avccontext->frame_size = 1024; @@ -29,7 +29,7 @@ Index: libavcodec/aac.c AAC_INIT_VLC_STATIC( 0, 144); AAC_INIT_VLC_STATIC( 1, 114); AAC_INIT_VLC_STATIC( 2, 188); -@@ -486,6 +490,8 @@ +@@ -519,6 +523,8 @@ AAC_INIT_VLC_STATIC( 9, 248); AAC_INIT_VLC_STATIC(10, 384); @@ -38,7 +38,7 @@ Index: libavcodec/aac.c dsputil_init(&ac->dsp, avccontext); ac->random_state = 0x1f2e3d4c; -@@ -1281,23 +1287,6 @@ +@@ -1314,23 +1320,6 @@ } /** @@ -62,7 +62,7 @@ Index: libavcodec/aac.c * Parse whether channels are to be excluded from Dynamic Range Compression; reference: table 4.53. * * @return Returns number of bytes consumed. -@@ -1377,7 +1366,8 @@ +@@ -1410,7 +1399,8 @@ * * @return Returns number of bytes consumed */ @@ -72,7 +72,7 @@ Index: libavcodec/aac.c { int crc_flag = 0; int res = cnt; -@@ -1385,7 +1375,7 @@ +@@ -1418,7 +1408,7 @@ case EXT_SBR_DATA_CRC: crc_flag++; case EXT_SBR_DATA: @@ -81,7 +81,7 @@ Index: libavcodec/aac.c break; case EXT_DYNAMIC_RANGE: res = decode_dynamic_range(&ac->che_drc, gb, cnt); -@@ -1674,8 +1664,8 @@ +@@ -1709,8 +1699,8 @@ AACContext *ac = avccontext->priv_data; ChannelElement *che = NULL; GetBitContext gb; @@ -92,7 +92,7 @@ Index: libavcodec/aac.c init_get_bits(&gb, buf, buf_size * 8); -@@ -1739,7 +1729,7 @@ +@@ -1774,7 +1764,7 @@ if (elem_id == 15) elem_id += get_bits(&gb, 8) - 1; while (elem_id > 0) @@ -101,7 +101,7 @@ Index: libavcodec/aac.c err = 0; /* FIXME */ break; -@@ -1748,6 +1738,9 @@ +@@ -1783,6 +1773,9 @@ break; } @@ -113,7 +113,7 @@ Index: libavcodec/aac.c } Index: libavcodec/aac.h =================================================================== ---- libavcodec/aac.h (revision 20025) +--- libavcodec/aac.h (revision 20564) +++ libavcodec/aac.h (working copy) @@ -33,6 +33,7 @@ #include "avcodec.h" @@ -123,7 +123,7 @@ Index: libavcodec/aac.h #include <stdint.h> -@@ -221,6 +222,7 @@ +@@ -231,6 +232,7 @@ SingleChannelElement ch[2]; // CCE specific ChannelCoupling coup; @@ -133,14 +133,14 @@ Index: libavcodec/aac.h /** Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 20025) +--- libavcodec/Makefile (revision 20564) +++ libavcodec/Makefile (working copy) -@@ -35,7 +35,7 @@ +@@ -38,7 +38,7 @@ OBJS-$(CONFIG_VDPAU) += vdpau.o # decoders/encoders/hardware accelerators --OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o aac_parser.o aac_ac3_parser.o -+OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o aacsbr.o mpeg4audio.o aac_parser.o aac_ac3_parser.o - OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o aacpsy.o aactab.o psymodel.o iirfilter.o mpeg4audio.o - OBJS-$(CONFIG_AASC_DECODER) += aasc.o msrledec.o - OBJS-$(CONFIG_AC3_DECODER) += ac3dec.o ac3tab.o ac3dec_data.o ac3.o ac3_parser.o aac_ac3_parser.o +-OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o mpeg4audio.o \ ++OBJS-$(CONFIG_AAC_DECODER) += aac.o aactab.o aacsbr.o mpeg4audio.o \ + aac_parser.o aac_ac3_parser.o + OBJS-$(CONFIG_AAC_ENCODER) += aacenc.o aaccoder.o \ + aacpsy.o aactab.o \

1 0

[PATCH]aacsbr: rounding
by Alex Converse 20 Nov '09

20 Nov '09

NINT as specified in 14496-3 is round away from zero which corresponds to lroundf not lrintf. I looked at all the places where it could actually affect the result and I found two places but it might be better to change them all to be safe. Thoughts?

2 3

[PATCH]aacsbr: Replace ceil(log() / M_LN2) with a ceil_log2[] lookup table
by Alex Converse 20 Nov '09

20 Nov '09

I don't trust these bitstream reads to floating point math.

2 2

[PATCH]aacsbr: Read bs_noise_start_value_level when !(bs_coupling && ch)
by Alex Converse 20 Nov '09

20 Nov '09

Note: bs_noise_start_value_level bs_noise_start_value_balence are descriptive throw away labels never to be used again, not real variables.

2 2