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

[soc]: r1997 - libavfilter/Makefile
by vitor 07 Mar '08

07 Mar '08

Author: vitor Date: Fri Mar 7 20:35:02 2008 New Revision: 1997 Log: More syncing with SVN Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Fri Mar 7 20:35:02 2008 @@ -35,7 +35,5 @@ FFLIBS-$(CONFIG_SWSCALER) += swscal FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat NAME=avfilter -LIBVERSION=$(LAVFIVERSION) -LIBMAJOR=$(LAVFIMAJOR) include ../common.mak

1 0

[soc]: r1996 - libavfilter/Makefile
by vitor 07 Mar '08

07 Mar '08

Author: vitor Date: Fri Mar 7 18:05:16 2008 New Revision: 1996 Log: Sync with SVN Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Fri Mar 7 18:05:16 2008 @@ -1,7 +1,5 @@ include ../config.mak -CFLAGS+=-I$(SRC_PATH)/libavformat -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libswscale - OBJS = allfilters.o \ avfilter.o \ avfiltergraph.o \ @@ -31,16 +29,13 @@ OBJS-$(CONFIG_MOVIE_FILTER) += vsrc HEADERS = avfilter.h -EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \ - -L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF) \ - -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) +FFLIBS = avcodec avutil -ifeq ($(CONFIG_AVFILTER_LAVF),yes) -EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS) -endif +FFLIBS-$(CONFIG_SWSCALER) += swscale +FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat NAME=avfilter -LIBVERSION=$(LAVFILTERVERSION) -LIBMAJOR=$(LAVFILTERMAJOR) +LIBVERSION=$(LAVFIVERSION) +LIBMAJOR=$(LAVFIMAJOR) include ../common.mak

1 0

[soc]: r1995 - aac/aactab.h
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 16:29:54 2008 New Revision: 1995 Log: Remove pointless comments. Modified: aac/aactab.h Modified: aac/aactab.h ============================================================================== --- aac/aactab.h (original) +++ aac/aactab.h Fri Mar 7 16:29:54 2008 @@ -35,7 +35,6 @@ 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[] = { 0, 4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56, 64, 72, 80, 88, 96, 108, 120, 132, 144, 156, 172, 188, 212, 240, @@ -131,7 +130,6 @@ static const float ltp_coef[] = { 0.570829, 0.696616, 0.813004, 0.911304, 0.984900, 1.067894, 1.194601, 1.369533 }; -// TNS tables static const uint8_t tns_max_bands_1024[] = { 31, 31, 34, 40, 42, 51, 46, 46, 42, 42, 42, 39 };

1 0

[soc]: r1994 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 15:02:06 2008 New Revision: 1994 Log: Remove an old TODO, this should be acomplished via a decent audio API instead. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 15:02:06 2008 @@ -27,12 +27,6 @@ * @author Maxim Gavrilov ( maxim.gavrilov gmail com ) */ -/** TODO - * To reduce the memory required, reorder the ret buffer so all buffers are - * after each other. And then try to do the interleaving inplace. - */ - - /** * AAC SSR (Scalable Sample Rate) is currently not working, and therefore * not compiled in. SSR files play without crashing but produce audible

1 0

[soc]: r1993 - aac/ffmpeg.patch
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 14:19:49 2008 New Revision: 1993 Log: Sync with ffmpeg trunk. Modified: aac/ffmpeg.patch Modified: aac/ffmpeg.patch ============================================================================== --- aac/ffmpeg.patch (original) +++ aac/ffmpeg.patch Fri Mar 7 14:19:49 2008 @@ -1,8 +1,8 @@ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 12224) +--- libavcodec/Makefile (revision 12357) +++ libavcodec/Makefile (working copy) -@@ -31,6 +31,7 @@ +@@ -26,6 +26,7 @@ OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o @@ -12,7 +12,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o Index: libavcodec/allcodecs.c =================================================================== ---- libavcodec/allcodecs.c (revision 12224) +--- libavcodec/allcodecs.c (revision 12357) +++ libavcodec/allcodecs.c (working copy) @@ -172,6 +172,7 @@ REGISTER_ENCDEC (ZMBV, zmbv); @@ -24,14 +24,14 @@ Index: libavcodec/allcodecs.c REGISTER_DECODER (ALAC, alac); Index: libavformat/mov.c =================================================================== ---- libavformat/mov.c (revision 12224) +--- libavformat/mov.c (revision 12357) +++ libavformat/mov.c (working copy) -@@ -817,7 +817,7 @@ - st->codec->width= 0; /* let decoder init width/height */ - st->codec->height= 0; - break; +@@ -1556,7 +1556,7 @@ + st->codec->width= 0; /* let decoder init width/height */ + st->codec->height= 0; + break; -#ifdef CONFIG_LIBFAAD +#if defined(CONFIG_LIBFAAD) || defined(CONFIG_AAC_DECODER) - case CODEC_ID_AAC: + case CODEC_ID_AAC: #endif #ifdef CONFIG_VORBIS_DECODER

1 0

[soc]: r1992 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 13:39:59 2008 New Revision: 1992 Log: Remove another unused context variable. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 13:39:59 2008 @@ -186,8 +186,6 @@ typedef struct { */ typedef struct { int intensity_present; - int noise_present; - int max_sfb; int window_sequence; int window_shape; ///< If set, use Kaiser-Bessel window, otherwise use a sinus window @@ -1183,7 +1181,6 @@ static int scale_factor_data(AACContext int noise = global_gain - 90; int noise_flag = 1; ics->intensity_present = 0; - ics->noise_present = 0; for (g = 0; g < ics->num_window_groups; g++) { for (i = 0; i < ics->max_sfb; i++) { if (cb[g][i] == ZERO_HCB) { @@ -1198,7 +1195,6 @@ static int scale_factor_data(AACContext } sf[g][i] = ac->intensity_tab[intensity]; } else if (cb[g][i] == NOISE_HCB) { - ics->noise_present = 1; if (noise_flag) { noise_flag = 0; noise += get_bits(gb, 9) - 256;

1 0

[soc]: r1991 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 13:38:54 2008 New Revision: 1991 Log: More doxygen and rearrangement of context structs. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 13:38:54 2008 @@ -61,7 +61,9 @@ #define MAX_CHANNELS 64 #define MAX_TAGID 16 -// Audio Object Types +/** + * Audio Object Types + */ enum { AOT_NULL = 0x0, AOT_AAC_MAIN, @@ -91,7 +93,9 @@ enum { AOT_SSC }; -// IDs for raw_data_block +/** + * IDs for raw_data_block + */ enum { ID_SCE = 0x0, ID_CPE, @@ -103,7 +107,9 @@ enum { ID_END }; -// IDs for extension_payload +/** + * IDs for extension_payload + */ enum { EXT_FILL = 0x0, EXT_FILL_DATA, @@ -113,7 +119,9 @@ enum { EXT_SBR_DATA_CRC = 0xe }; -// window sequences +/** + * Window sequences + */ enum { ONLY_LONG_SEQUENCE = 0, LONG_START_SEQUENCE, @@ -121,7 +129,9 @@ enum { LONG_STOP_SEQUENCE }; -// special codebooks +/** + * Special codebooks + */ #define ZERO_HCB 0 #define FIRST_PAIR_HCB 5 #define ESC_HCB 11 @@ -130,15 +140,22 @@ enum { #define INTENSITY_HCB 15 #define ESC_FLAG 16 -//ltp -#define MAX_LTP_LONG_SFB 40 - +/** + * Channel types + */ #define AAC_CHANNEL_FRONT 1 #define AAC_CHANNEL_SIDE 2 #define AAC_CHANNEL_BACK 3 #define AAC_CHANNEL_LFE 4 #define AAC_CHANNEL_CC 5 + +/** + * Program config. This describes how channels are arranged. + * + * Either read from stream (ID_PCE) or created based on a default + * fixed channel arrangement. + */ typedef struct { int sce_type[MAX_TAGID]; int cpe_type[MAX_TAGID]; @@ -152,6 +169,11 @@ typedef struct { } program_config_struct; + +/** + * Long Term Prediction + */ +#define MAX_LTP_LONG_SFB 40 typedef struct { int present; int lag; @@ -173,16 +195,17 @@ typedef struct { int num_window_groups; uint8_t grouping; uint8_t group_len[8]; - // ltp ltp_struct ltp; ltp_struct ltp2; - // calculated const uint16_t *swb_offset; int num_swb; int num_windows; int tns_max_bands; } ics_struct; +/** + * Temporal Noise Shaping + */ typedef struct { int present; int n_filt[8]; @@ -193,6 +216,9 @@ typedef struct { int coef[8][4][TNS_MAX_ORDER]; } tns_struct; +/** + * M/S joint channel coding + */ typedef struct { int present; int mask[8][64]; @@ -217,6 +243,9 @@ typedef struct { int prog_ref_level_reserved_bits; } drc_struct; +/** + * Pulse tool + */ typedef struct { int present; int num_pulse; @@ -251,14 +280,11 @@ typedef struct { typedef struct { int ind_sw; ///< Set if independant coupling (i.e. after IMDCT) int domain; ///< Controls if coupling is performed before (0) or after (1) the TNS decoding of the target channels - - int num_coupled; ///< Number of target elements int is_cpe[9]; ///< Set if target is an CPE (otherwise it's an SCE) int tag_select[9]; ///< Element tag index int l[9]; ///< Apply gain to left channel of an CPE int r[9]; ///< Apply gain to right channel of an CPE - float gain[18][8][64]; } coupling_struct; @@ -268,7 +294,10 @@ typedef struct { * Used for both SCE and LFE elements */ typedef struct { - float mixing_gain; + float mixing_gain; /**< Channel gain (not used by AAC bitstream). + * Note that this is applied before joint stereo decoding. + * Thus, when used inside CPE elements, both channels must have equal gain. + */ ics_struct ics; tns_struct tns; int cb[8][64]; ///< Codebooks @@ -297,30 +326,46 @@ typedef struct { sce_struct ch; } cc_struct; +/** + * Main AAC context + */ typedef struct { - // objects AVCodecContext * avccontext; - // main config int audioObjectType; - int ext_audioObjectType; - int sbr_present; int sampling_index; - int ext_sampling_index; int sample_rate; - int ext_sample_rate; + int is_saved; ///< Set if elements have stored overlap from previous frame. + drc_struct * che_drc; - // decoder param + /** + * @defgroup sbr These are applicable if the bitstream uses SBR. + * @{ + */ + int sbr_present; + int ext_audioObjectType; + int ext_sampling_index; ///< index after SBR is applied + int ext_sample_rate; ///< rate after SBR is applied + /** @} */ + + /** + * @defgroup elements + * @{ + */ program_config_struct pcs; sce_struct * che_sce[MAX_TAGID]; cpe_struct * che_cpe[MAX_TAGID]; sce_struct * che_lfe[MAX_TAGID]; cc_struct * che_cc[MAX_TAGID]; - drc_struct * che_drc; + /** @} */ + /** + * @defgroup temporary Aligned temporary buffers (We do not want to have these on stack) + * @{ + */ DECLARE_ALIGNED_16(float, buf_mdct[2048]); DECLARE_ALIGNED_16(float, revers[1024]); - int is_saved; + /** @} */ /** * @defgroup tables Computed / setup during init

1 0

[soc]: r1990 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 11:49:30 2008 New Revision: 1990 Log: Remove superfluous parentheses. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 11:49:30 2008 @@ -1143,7 +1143,7 @@ static int scale_factor_data(AACContext for (i = 0; i < ics->max_sfb; i++) { if (cb[g][i] == ZERO_HCB) { sf[g][i] = 0.; - } else if ((cb[g][i] == INTENSITY_HCB) || (cb[g][i] == INTENSITY_HCB2)) { + } else if (cb[g][i] == INTENSITY_HCB || cb[g][i] == INTENSITY_HCB2) { ics->intensity_present = 1; intensity += get_vlc2(gb, ac->mainvlc.table, 7, 3) - 60; if(intensity > 255) { @@ -1464,9 +1464,9 @@ static void intensity_tool(AACContext * for (gp = 0; gp < ics->group_len[g]; gp++) { for (i = 0; i < ics->max_sfb; i++) { if (sce1->cb[g][i] == INTENSITY_HCB || sce1->cb[g][i] == INTENSITY_HCB2) { - c = (-1 + 2 * (sce1->cb[g][i] - 14)); + c = -1 + 2 * (sce1->cb[g][i] - 14); if (cpe->ms.present) - c *= (1 - 2 * cpe->ms.mask[g][i]); + c *= 1 - 2 * cpe->ms.mask[g][i]; scale = c * sce1->sf[g][i]; for (k = offsets[i] + gp*128; k < offsets[i+1] + gp*128; k++) { sce1->coeffs[k] = scale * sce0->coeffs[k];

1 0

[soc]: r1989 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 10:50:26 2008 New Revision: 1989 Log: 'global_gain' can be a local variable Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 10:50:26 2008 @@ -268,7 +268,6 @@ typedef struct { * Used for both SCE and LFE elements */ typedef struct { - int global_gain; float mixing_gain; ics_struct ics; tns_struct tns; @@ -1387,9 +1386,10 @@ static int individual_channel_stream(AAC tns_struct * tns = &sce->tns; ics_struct * ics = &sce->ics; float * out = sce->coeffs; + int global_gain; memset(&pulse, 0, sizeof(pulse)); - sce->global_gain = get_bits(gb, 8); + global_gain = get_bits(gb, 8); if (!common_window && !scale_flag) { if (ics_info(ac, gb, 0, ics) < 0) @@ -1398,7 +1398,7 @@ static int individual_channel_stream(AAC if (section_data(ac, gb, ics, sce->cb) < 0) return -1; - if (scale_factor_data(ac, gb, sce->mixing_gain, sce->global_gain, ics, sce->cb, sce->sf) < 0) + if (scale_factor_data(ac, gb, sce->mixing_gain, global_gain, ics, sce->cb, sce->sf) < 0) return -1; if (!scale_flag) {

1 0

[soc]: r1988 - aac/aac.c
by andoma 07 Mar '08

07 Mar '08

Author: andoma Date: Fri Mar 7 10:48:24 2008 New Revision: 1988 Log: Doxygenify DRC struct Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Fri Mar 7 10:48:24 2008 @@ -198,7 +198,11 @@ typedef struct { int mask[8][64]; } ms_struct; -// dynamic range compression +/** + * Dyanmic Range Control + * + * DRC is decoded from bitstream but not further processed. + */ typedef struct { int pce_instance_tag; int drc_tag_reserved_bits;

1 0