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

[soc]: r1969 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:56:30 2008 New Revision: 1969 Log: Add missing newline char at end of log formats. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:56:30 2008 @@ -567,7 +567,7 @@ static int output_configure(AACContext * channels = avctx->request_channels; } else { - av_log(avctx, AV_LOG_WARNING, "Matrix mixing from %d to %d channels in not supported", + av_log(avctx, AV_LOG_WARNING, "Matrix mixing from %d to %d channels in not supported\n", channels, avctx->request_channels); } } @@ -609,7 +609,7 @@ static int program_config_element(AACCon ac->sampling_index = get_bits(gb, 4); if(ac->sampling_index > 12) { - av_log(ac->avccontext, AV_LOG_ERROR, "Invalid sampling rate index %d", ac->sampling_index); + av_log(ac->avccontext, AV_LOG_ERROR, "Invalid sampling rate index %d\n", ac->sampling_index); return -1; } ac->sample_rate = sampling_table[ac->sampling_index]; @@ -708,7 +708,7 @@ static int program_config_element_defaul break; default: - av_log(ac->avccontext, AV_LOG_ERROR, "Invalid default channel configuration (%d channels)", + av_log(ac->avccontext, AV_LOG_ERROR, "Invalid default channel configuration (%d channels)\n", channels); return -1; } @@ -724,7 +724,7 @@ static int GASpecificConfig(AACContext * int ext = 0; if(get_bits1(gb)) { // frameLengthFlag - av_log(ac->avccontext, AV_LOG_ERROR, "960/120 MDCT window is not supported"); + av_log(ac->avccontext, AV_LOG_ERROR, "960/120 MDCT window is not supported\n"); return -1; } @@ -835,7 +835,7 @@ static int AudioSpecificConfig(AACContex return -1; break; default: - av_log(ac->avccontext, AV_LOG_ERROR, "Audio object type %s%d is not supported", + av_log(ac->avccontext, AV_LOG_ERROR, "Audio object type %s%d is not supported\n", ac->sbr_present ? "SBR+" : "", ac->audioObjectType); return -1; } @@ -1396,7 +1396,7 @@ static int individual_channel_stream(AAC #ifdef AAC_SSR if (gain_control_data(ac, gb, sce)) return -1; #else - av_log(ac->avccontext, AV_LOG_ERROR, "SSR not supprted"); + av_log(ac->avccontext, AV_LOG_ERROR, "SSR not supprted\n"); return -1; #endif }

2 1

[soc]: r1968 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:55:03 2008 New Revision: 1968 Log: vector_fmul_dst() is not needed unless we compile with SSR or LTP support. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:55:03 2008 @@ -347,10 +347,12 @@ typedef struct { //aux // TODO: Maybe add to dsputil?! +#if defined(AAC_LTP) || defined(AAC_SSR) static void vector_fmul_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { memcpy(dst, src0, len * sizeof(float)); ac->dsp.vector_fmul(dst, src1, len); } +#endif static void vector_fmul_add_add_add(AACContext * ac, float * dst, const float * src0, const float * src1, const float * src2, const float * src3, float src4, int len) { int i;

1 0

[soc]: r1967 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:53:58 2008 New Revision: 1967 Log: Vertical alignment fix. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:53:58 2008 @@ -299,7 +299,7 @@ typedef struct { sce_struct * che_sce[MAX_TAGID]; cpe_struct * che_cpe[MAX_TAGID]; sce_struct * che_lfe[MAX_TAGID]; - cc_struct * che_cc[MAX_TAGID]; + cc_struct * che_cc[MAX_TAGID]; drc_struct * che_drc; DECLARE_ALIGNED_16(float, buf_mdct[2048]);

1 0

[soc]: r1966 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:52:58 2008 New Revision: 1966 Log: Conditionally compile LTP support (currently disabled). Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:52:58 2008 @@ -40,6 +40,14 @@ */ //#define AAC_SSR +/** + * AAC LTP (Long Term Preditction) is currently not working, and therefore + * not compiled in. Playing LTP files with LTP support compiled in results + * in crashes due to SSE alignment issues. Also, there are major audible + * artifacts. + */ +//#define AAC_LTP + #include "avcodec.h" #include "bitstream.h" @@ -818,7 +826,9 @@ static int AudioSpecificConfig(AACContex #ifdef AAC_SSR case AOT_AAC_SSR: #endif /* AAC_SSR */ +#ifdef AAC_LTP case AOT_AAC_LTP: +#endif /* AAC_LTP */ if (GASpecificConfig(ac, &gb, channels)) return -1; break; @@ -994,6 +1004,7 @@ static int data_stream_element(AACContex return 0; } +#ifdef AAC_LTP static void ltp_data(AACContext * ac, GetBitContext * gb, int max_sfb, ltp_struct * ltp) { int sfb; if (ac->audioObjectType == AOT_ER_AAC_LD) { @@ -1005,6 +1016,7 @@ static void ltp_data(AACContext * ac, Ge ltp->used[sfb] = get_bits1(gb); } } +#endif /* AAC_LTP */ /** * Decode Individual Channel Stream info @@ -1046,6 +1058,7 @@ static int ics_info(AACContext * ac, Get ics->tns_max_bands = ac->tns_max_bands_1024; ics->predictor = get_bits1(gb); if (ics->predictor) { +#ifdef AAC_LTP if (ac->audioObjectType == AOT_AAC_MAIN) { assert(0); } else { @@ -1058,6 +1071,11 @@ static int ics_info(AACContext * ac, Get } } } +#else /* AAC_LTP */ + av_log(ac->avccontext, AV_LOG_ERROR, + "Predictor bit set but LTP is not supported\n"); + return -1; +#endif /* AAC_LTP */ } else { ics->ltp.present = 0; ics->ltp2.present = 0; @@ -1729,6 +1747,7 @@ static void tns_trans(AACContext * ac, s tns_filter_tool(ac, 1, sce, sce->coeffs); } +#ifdef AAC_LTP static void window_ltp_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; const float * lwindow = (ics->window_shape) ? ac->kbd_long_1024 : ac->sine_long_1024; @@ -1815,6 +1834,7 @@ static void ltp_update_trans(AACContext } } } +#endif /* AAC_LTP */ static void window_trans(AACContext * ac, sce_struct * sce) { ics_struct * ics = &sce->ics; @@ -2078,8 +2098,10 @@ static void transform_sce_tool(AACContex static void spec_to_sample(AACContext * ac) { coupling_tool(ac, 0, 0); +#ifdef AAC_LTP if (ac->audioObjectType == AOT_AAC_LTP) transform_sce_tool(ac, ltp_trans); +#endif /* AAC_LTP */ transform_sce_tool(ac, tns_trans); coupling_tool(ac, 0, 1); #ifdef AAC_SSR @@ -2089,8 +2111,10 @@ static void spec_to_sample(AACContext * #endif /* AAC_SSR */ transform_sce_tool(ac, window_trans); coupling_tool(ac, 1, 1); +#ifdef AAC_LTP if (ac->audioObjectType == AOT_AAC_LTP) transform_sce_tool(ac, ltp_update_trans); +#endif /* AAC_LTP */ }

1 0

[soc]: r1964 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:31:54 2008 New Revision: 1964 Log: Spelling fixes. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:31:54 2008 @@ -297,7 +297,7 @@ typedef struct { DECLARE_ALIGNED_16(float, buf_mdct[2048]); int is_saved; - //cashes + //caches const uint16_t *swb_offset_1024; const uint16_t *swb_offset_128; int num_swb_1024; @@ -1537,11 +1537,11 @@ static int coupling_channel_element(AACC for (c = 0; c < num_gain; c++) { int cge = 1; int gain = 0; - float gain_cash = 1.; + float gain_cache = 1.; if (c != 0) { cge = coup->ind_sw ? 1 : get_bits1(gb); gain = cge ? get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60: 0; - gain_cash = pow(scale, (float)gain); + gain_cache = pow(scale, (float)gain); } for (g = 0; g < sce->ics.num_window_groups; g++) for (sfb = 0; sfb < sce->ics.max_sfb; sfb++) @@ -1549,7 +1549,7 @@ static int coupling_channel_element(AACC coup->gain[c][g][sfb] = 0; } else { if (cge) { - coup->gain[c][g][sfb] = gain_cash; + coup->gain[c][g][sfb] = gain_cache; } else { if (sign) { int t = get_vlc2(gb, ac->mainvlc.table, 7, 3);

1 0

[soc]: r1963 - aac/aactab.h
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:30:10 2008 New Revision: 1963 Log: Only include 'ssr_q_table' if AAC_SSR is defined. Modified: aac/aactab.h Modified: aac/aactab.h ============================================================================== --- aac/aactab.h (original) +++ aac/aactab.h Wed Mar 5 13:30:10 2008 @@ -179,7 +179,7 @@ static const float *tns_tmp2_map[4] = { tns_tmp2_map_1_4 }; - +#ifdef AAC_SSR static const float ssr_q_table[] = { 9.7655291007575512E-05, 1.3809589379038567E-04, @@ -230,6 +230,7 @@ static const float ssr_q_table[] = { 1.0068321641150089E+00, 1.0737914947736096E+00 }; +#endif /* AAC_SSR */ static const uint32_t code[121] = { 0x3ffe8, 0x3ffe6, 0x3ffe7, 0x3ffe5, 0x7fff5, 0x7fff1, 0x7ffed, 0x7fff6,

1 0

[soc]: r1962 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:27:25 2008 New Revision: 1962 Log: Remove redundant declaration of 'TNS_MAX_ORDER' (already in aactab.h). Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:27:25 2008 @@ -122,9 +122,6 @@ enum { #define INTENSITY_HCB 15 #define ESC_FLAG 16 -//tns -#define TNS_MAX_ORDER 20 - //ltp #define MAX_LTP_LONG_SFB 40

1 0

[soc]: r1961 - aac/aactab.h
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:26:38 2008 New Revision: 1961 Log: use uint32_t for samplerates Modified: aac/aactab.h Modified: aac/aactab.h ============================================================================== --- aac/aactab.h (original) +++ aac/aactab.h Wed Mar 5 13:26:38 2008 @@ -32,8 +32,8 @@ #define TNS_MAX_ORDER 20 -static const int sampling_table[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350 }; -static const int inv_sampling_table[] = { 92017, 75132, 55426, 46009, 37655, 27713, 23004, 18783, 13856, 11502, 9391 }; +static const uint32_t sampling_table[] = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350 }; +static const uint32_t inv_sampling_table[] = { 92017, 75132, 55426, 46009, 37655, 27713, 23004, 18783, 13856, 11502, 9391 }; // scalefactor bands static const uint16_t swb_offset_1024_96[] = {

1 0

[soc]: r1960 - in aac: aac.c aactab.h
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 13:21:02 2008 New Revision: 1960 Log: constify all tables in aactab.h Modified: aac/aac.c aac/aactab.h Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 13:21:02 2008 @@ -182,7 +182,7 @@ typedef struct { int length[8][4]; int direction[8][4]; int order[8][4]; - float *tmp2_map[8]; + const float *tmp2_map[8]; int coef[8][4][TNS_MAX_ORDER]; } tns_struct; Modified: aac/aactab.h ============================================================================== --- aac/aactab.h (original) +++ aac/aactab.h Wed Mar 5 13:21:02 2008 @@ -140,7 +140,7 @@ static const uint8_t tns_max_bands_128[] 9, 9, 10, 14, 14, 14, 14, 14, 14, 14, 14, 14 }; -static float tns_tmp2_map_1_3[TNS_MAX_ORDER] = { +static const float tns_tmp2_map_1_3[TNS_MAX_ORDER] = { 0.00000000, 0.43388373, -0.64278758, -0.34202015, 0.97492790, 0.78183150, -0.64278758, -0.34202015, -0.43388373, -0.78183150, -0.64278758, -0.34202015, @@ -148,7 +148,7 @@ static float tns_tmp2_map_1_3[TNS_MAX_OR 0.78183150, 0.97492790, -0.64278758, -0.34202015 }; -static float tns_tmp2_map_0_3[TNS_MAX_ORDER] = { +static const float tns_tmp2_map_0_3[TNS_MAX_ORDER] = { 0.00000000, 0.43388373, 0.78183150, 0.97492790, -0.98480773, -0.86602539, -0.64278758, -0.34202015, -0.43388373, -0.78183150, -0.97492790, -0.97492790, @@ -156,7 +156,7 @@ static float tns_tmp2_map_0_3[TNS_MAX_OR 0.78183150, 0.97492790, 0.97492790, 0.78183150 }; -static float tns_tmp2_map_1_4[TNS_MAX_ORDER] = { +static const float tns_tmp2_map_1_4[TNS_MAX_ORDER] = { 0.00000000, 0.20791170, 0.40673664, 0.58778524, -0.67369562, -0.52643216, -0.36124167, -0.18374951, 0.99452192, 0.95105648, 0.86602539, 0.74314481, @@ -164,7 +164,7 @@ static float tns_tmp2_map_1_4[TNS_MAX_OR -0.20791176, -0.40673670, -0.58778530, -0.74314487 }; -static float tns_tmp2_map_0_4[TNS_MAX_ORDER] = { +static const float tns_tmp2_map_0_4[TNS_MAX_ORDER] = { 0.00000000, 0.20791170, 0.40673664, 0.58778524, 0.74314481, 0.86602539, 0.95105654, 0.99452192, -0.99573416, -0.96182561, -0.89516330, -0.79801720, @@ -172,14 +172,15 @@ static float tns_tmp2_map_0_4[TNS_MAX_OR -0.20791176, -0.40673670, -0.58778530, -0.74314487 }; -static float *tns_tmp2_map[4] = { +static const float *tns_tmp2_map[4] = { tns_tmp2_map_0_3, tns_tmp2_map_0_4, tns_tmp2_map_1_3, tns_tmp2_map_1_4 }; -static float ssr_q_table[] = { + +static const float ssr_q_table[] = { 9.7655291007575512E-05, 1.3809589379038567E-04, 9.8400749256623534E-05,

1 0

[soc]: r1958 - aac/aac.c
by andoma 05 Mar '08

05 Mar '08

Author: andoma Date: Wed Mar 5 11:19:57 2008 New Revision: 1958 Log: Conditionally compile SSR support (currently disabled). Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 11:19:57 2008 @@ -370,6 +370,7 @@ static void sine_window_init(float *wind window[i] = sin((i + 0.5) * alpha); } +#ifdef AAC_SSR static void ssr_context_init(ssr_context * ctx) { int b, i; for (b = 0; b < 2; b++) { @@ -392,6 +393,7 @@ static void ssr_context_init(ssr_context } } } +#endif /* AAC_SSR */ /** * Free a Single Channel Element @@ -821,7 +823,9 @@ static int AudioSpecificConfig(AACContex switch (ac->audioObjectType) { case AOT_AAC_LC: +#ifdef AAC_SSR case AOT_AAC_SSR: +#endif /* AAC_SSR */ case AOT_AAC_LTP: if (GASpecificConfig(ac, &gb, channels)) return -1; @@ -950,6 +954,7 @@ static int aac_decode_init(AVCodecContex 0) < 0) return -1; +#ifdef AAC_SSR if (ac->audioObjectType == AOT_AAC_SSR) { ff_mdct_init(&ac->mdct, 9, 1); ff_mdct_init(&ac->mdct_small, 6, 1); @@ -960,6 +965,7 @@ static int aac_decode_init(AVCodecContex sine_window_init(ac->sine_short_128, 64); ssr_context_init(&ac->ssrctx); } else { +#endif /* AAC_SSR */ ff_mdct_init(&ac->mdct, 11, 1); ff_mdct_init(&ac->mdct_small, 8, 1); // windows init @@ -967,7 +973,9 @@ static int aac_decode_init(AVCodecContex ff_kbd_window_init(ac->kbd_short_128, 6.0, 128); sine_window_init(ac->sine_long_1024, 2048); sine_window_init(ac->sine_short_128, 256); +#ifdef AAC_SSR } +#endif /* AAC_SSR */ for (i = 0; i < 128; i++) { ac->sine_short_128[i] *= 8.; ac->kbd_short_128[i] *= 8.; @@ -1174,6 +1182,7 @@ static void tns_data(AACContext * ac, Ge } } +#ifdef AAC_SSR static int gain_control_data(AACContext * ac, GetBitContext * gb, sce_struct * sce) { // wd_num wd_test aloc_size static const int gain_mode[4][3] = { @@ -1202,6 +1211,7 @@ static int gain_control_data(AACContext } return 0; } +#endif /* AAC_SSR */ static int ms_data(AACContext * ac, GetBitContext * gb, cpe_struct * cpe) { ms_struct * ms = &cpe->ms; @@ -1370,8 +1380,14 @@ static int individual_channel_stream(AAC pulse_data(ac, gb, &pulse); if ((tns->present = get_bits1(gb))) tns_data(ac, gb, ics, tns); - if (get_bits1(gb)) + if (get_bits1(gb)) { +#ifdef AAC_SSR if (gain_control_data(ac, gb, sce)) return -1; +#else + av_log(ac->avccontext, AV_LOG_ERROR, "SSR not supprted"); + return -1; +#endif + } } if (spectral_data(ac, gb, ics, sce->cb, icoeffs) < 0) @@ -1844,6 +1860,7 @@ static void window_trans(AACContext * ac } } +#ifdef AAC_SSR static void window_ssr_tool(AACContext * ac, sce_struct * sce, float * in, float * out) { ics_struct * ics = &sce->ics; const float * lwindow = (ics->window_shape) ? ac->kbd_long_1024 : ac->sine_long_1024; @@ -1963,6 +1980,7 @@ static void ssr_trans(AACContext * ac, s } ssr_ipqf_tool(ac, sce, tmp_ret); } +#endif /* AAC_SSR */ static void coupling_dependent_trans(AACContext * ac, cc_struct * cc, sce_struct * sce, int index) { ics_struct * ics = &cc->ch.ics; @@ -2054,9 +2072,11 @@ static void spec_to_sample(AACContext * transform_sce_tool(ac, ltp_trans); transform_sce_tool(ac, tns_trans); coupling_tool(ac, 0, 1); +#ifdef AAC_SSR if (ac->audioObjectType == AOT_AAC_SSR) transform_sce_tool(ac, ssr_trans); else +#endif /* AAC_SSR */ transform_sce_tool(ac, window_trans); coupling_tool(ac, 1, 1); if (ac->audioObjectType == AOT_AAC_LTP)

3 2