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

[soc]: r3899 - dirac/libavcodec/diracdec.c
by conrad 28 Dec '08

28 Dec '08

Author: conrad Date: Sun Dec 28 08:38:00 2008 New Revision: 3899 Log: Move determining the position of the coeff out of the inner loop Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sun Dec 28 08:31:09 2008 (r3898) +++ dirac/libavcodec/diracdec.c Sun Dec 28 08:38:00 2008 (r3899) @@ -133,7 +133,7 @@ static inline int coeff_dequant(int coef * @param qfact quantizer factor */ static inline void coeff_unpack_arith(DiracContext *s, SubBand *b, - int x, int y, + int16_t *coeffp, int x, int y, int qoffset, int qfactor) { int parent = 0; @@ -142,9 +142,6 @@ static inline void coeff_unpack_arith(Di int coeff; int read_sign; struct dirac_arith_context_set *context; - int16_t *coeffp; - - coeffp = &b->ibuf[y * b->stride + x]; /* The value of the pixel belonging to the lower level. */ if (b->parent) @@ -171,7 +168,7 @@ static inline void coeff_unpack_arith(Di *coeffp = coeff; } -static inline void coeff_unpack_vlc(DiracContext *s, SubBand *b, +static inline void coeff_unpack_vlc(DiracContext *s, SubBand *b, int16_t *buf, int x, int y, int qoffset, int qfactor) { int coeff, sign; @@ -180,7 +177,7 @@ static inline void coeff_unpack_vlc(Dira if (sign && get_bits1(&s->gb)) coeff = -coeff; - b->ibuf[y * b->stride + x] = coeff; + *buf = coeff; } /** @@ -200,6 +197,7 @@ static inline void codeblock(DiracContex { int x, y; unsigned int qoffset, qfactor; + int16_t *buf; if (!blockcnt_one) { int zero_block; @@ -221,13 +219,16 @@ static inline void codeblock(DiracContex qfactor = coeff_quant_factor(*quant); qoffset = coeff_quant_offset(s->refs == 0, *quant) + 2; - for (y = top; y < bottom; y++) + buf = b->ibuf + top*b->stride; + for (y = top; y < bottom; y++) { for (x = left; x < right; x++) { if (is_arith) - coeff_unpack_arith(s, b, x, y, qoffset, qfactor); + coeff_unpack_arith(s, b, buf+x, x, y, qoffset, qfactor); else - coeff_unpack_vlc(s, b, x, y, qoffset, qfactor); + coeff_unpack_vlc(s, b, buf+x, x, y, qoffset, qfactor); } + buf += b->stride; + } } /**

1 0

[soc]: r3898 - dirac/libavcodec/diracdec.c
by conrad 28 Dec '08

28 Dec '08

Author: conrad Date: Sun Dec 28 08:31:09 2008 New Revision: 3898 Log: Don't needlessly recalculate codeblock bounds Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sun Dec 28 08:29:45 2008 (r3897) +++ dirac/libavcodec/diracdec.c Sun Dec 28 08:31:09 2008 (r3898) @@ -195,18 +195,12 @@ static inline void coeff_unpack_vlc(Dira * @param quant quantizer factor */ static inline void codeblock(DiracContext *s, SubBand *b, - int cb_x, int cb_y, int cb_numx, int cb_numy, + int left, int right, int top, int bottom, unsigned int *quant, int blockcnt_one, int is_arith) { - int left, right, top, bottom; int x, y; unsigned int qoffset, qfactor; - left = (b->width * cb_x ) / cb_numx; - right = (b->width * (cb_x+1)) / cb_numx; - top = (b->height * cb_y ) / cb_numy; - bottom = (b->height * (cb_y+1)) / cb_numy; - if (!blockcnt_one) { int zero_block; /* Determine if this codeblock is a zero block. */ @@ -270,6 +264,7 @@ static av_always_inline int decode_subba int cb_numx = s->codeblocksh[b->level + (b->orientation != subband_ll)]; int cb_numy = s->codeblocksv[b->level + (b->orientation != subband_ll)]; int blockcnt_one = (cb_numx + cb_numy) == 2; + int left, right, top, bottom; length = svq3_get_ue_golomb(gb); if (!length) @@ -281,9 +276,17 @@ static av_always_inline int decode_subba if (is_arith) dirac_arith_init(&s->arith, gb, length); - for (cb_y = 0; cb_y < cb_numy; cb_y++) - for (cb_x = 0; cb_x < cb_numx; cb_x++) - codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one, is_arith); + top = 0; + for (cb_y = 0; cb_y < cb_numy; cb_y++) { + bottom = (b->height * (cb_y+1)) / cb_numy; + left = 0; + for (cb_x = 0; cb_x < cb_numx; cb_x++) { + right = (b->width * (cb_x+1)) / cb_numx; + codeblock(s, b, left, right, top, bottom, &quant, blockcnt_one, is_arith); + left = right; + } + top = bottom; + } if (is_arith) dirac_arith_flush(&s->arith);

1 0

[soc]: r3897 - dirac/libavcodec/diracdec.c
by conrad 28 Dec '08

28 Dec '08

Author: conrad Date: Sun Dec 28 08:29:45 2008 New Revision: 3897 Log: Comsmetics: indentation Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sun Dec 28 08:28:33 2008 (r3896) +++ dirac/libavcodec/diracdec.c Sun Dec 28 08:29:45 2008 (r3897) @@ -275,18 +275,18 @@ static av_always_inline int decode_subba if (!length) return; - quant = svq3_get_ue_golomb(gb); - align_get_bits(gb); + quant = svq3_get_ue_golomb(gb); + align_get_bits(gb); - if (is_arith) + if (is_arith) dirac_arith_init(&s->arith, gb, length); - for (cb_y = 0; cb_y < cb_numy; cb_y++) - for (cb_x = 0; cb_x < cb_numx; cb_x++) - codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one, is_arith); - if (is_arith) - dirac_arith_flush(&s->arith); + for (cb_y = 0; cb_y < cb_numy; cb_y++) + for (cb_x = 0; cb_x < cb_numx; cb_x++) + codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one, is_arith); + if (is_arith) + dirac_arith_flush(&s->arith); if (b->orientation == subband_ll && s->refs == 0) intra_dc_prediction(b);

1 0

[soc]: r3896 - dirac/libavcodec/diracdec.c
by conrad 28 Dec '08

28 Dec '08

Author: conrad Date: Sun Dec 28 08:28:33 2008 New Revision: 3896 Log: Just return if the subband is 0 Modified: dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sun Dec 28 08:28:09 2008 (r3895) +++ dirac/libavcodec/diracdec.c Sun Dec 28 08:28:33 2008 (r3896) @@ -272,9 +272,9 @@ static av_always_inline int decode_subba int blockcnt_one = (cb_numx + cb_numy) == 2; length = svq3_get_ue_golomb(gb); - if (! length) { - align_get_bits(gb); - } else { + if (!length) + return; + quant = svq3_get_ue_golomb(gb); align_get_bits(gb); @@ -286,7 +286,7 @@ static av_always_inline int decode_subba codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one, is_arith); if (is_arith) dirac_arith_flush(&s->arith); - } + if (b->orientation == subband_ll && s->refs == 0) intra_dc_prediction(b);

1 0

[soc]: r3895 - in dirac/libavcodec: dirac.h diracdec.c
by conrad 28 Dec '08

28 Dec '08

Author: conrad Date: Sun Dec 28 08:28:09 2008 New Revision: 3895 Log: Add support for VLC/golomb coding of dwt coefficients Modified: dirac/libavcodec/dirac.h dirac/libavcodec/diracdec.c Modified: dirac/libavcodec/dirac.h ============================================================================== --- dirac/libavcodec/dirac.h Sat Dec 27 13:28:29 2008 (r3894) +++ dirac/libavcodec/dirac.h Sun Dec 28 08:28:09 2008 (r3895) @@ -196,6 +196,7 @@ typedef struct DiracContext { int sbheight; ///< number of superblocks (vertically) int zero_res; ///< zero residue flag + int is_arith; ///< whether coeffs use arith or golomb coding int refs; ///< number of reference pictures int globalmc_flag; ///< use global motion compensation flag Modified: dirac/libavcodec/diracdec.c ============================================================================== --- dirac/libavcodec/diracdec.c Sat Dec 27 13:28:29 2008 (r3894) +++ dirac/libavcodec/diracdec.c Sun Dec 28 08:28:09 2008 (r3895) @@ -132,7 +132,7 @@ static inline int coeff_dequant(int coef * @param qoffset quantizer offset * @param qfact quantizer factor */ -static void coeff_unpack(DiracContext *s, SubBand *b, +static inline void coeff_unpack_arith(DiracContext *s, SubBand *b, int x, int y, int qoffset, int qfactor) { @@ -171,6 +171,18 @@ static void coeff_unpack(DiracContext *s *coeffp = coeff; } +static inline void coeff_unpack_vlc(DiracContext *s, SubBand *b, + int x, int y, int qoffset, int qfactor) +{ + int coeff, sign; + coeff = sign = svq3_get_ue_golomb(&s->gb); + coeff = coeff_dequant(coeff, qoffset, qfactor); + if (sign && get_bits1(&s->gb)) + coeff = -coeff; + + b->ibuf[y * b->stride + x] = coeff; +} + /** * Decode a codeblock * @@ -182,9 +194,9 @@ static void coeff_unpack(DiracContext *s * @param quant quantizer offset * @param quant quantizer factor */ -static void codeblock(DiracContext *s, SubBand *b, +static inline void codeblock(DiracContext *s, SubBand *b, int cb_x, int cb_y, int cb_numx, int cb_numy, - unsigned int *quant, int blockcnt_one) + unsigned int *quant, int blockcnt_one, int is_arith) { int left, right, top, bottom; int x, y; @@ -196,20 +208,32 @@ static void codeblock(DiracContext *s, S bottom = (b->height * (cb_y+1)) / cb_numy; if (!blockcnt_one) { + int zero_block; /* Determine if this codeblock is a zero block. */ - if (dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK)) + if (is_arith) + zero_block = dirac_arith_get_bit(&s->arith, ARITH_CONTEXT_ZERO_BLOCK); + else + zero_block = get_bits1(&s->gb); + + if (zero_block) return; - if (s->codeblock_mode) + if (s->codeblock_mode && is_arith) *quant += dirac_arith_read_int(&s->arith, &ff_dirac_context_set_quant); + else if (s->codeblock_mode) + *quant += dirac_get_se_golomb(&s->gb); } qfactor = coeff_quant_factor(*quant); qoffset = coeff_quant_offset(s->refs == 0, *quant) + 2; for (y = top; y < bottom; y++) - for (x = left; x < right; x++) - coeff_unpack(s, b, x, y, qoffset, qfactor); + for (x = left; x < right; x++) { + if (is_arith) + coeff_unpack_arith(s, b, x, y, qoffset, qfactor); + else + coeff_unpack_vlc(s, b, x, y, qoffset, qfactor); + } } /** @@ -217,7 +241,7 @@ static void codeblock(DiracContext *s, S * * @param data coefficients */ -static void intra_dc_prediction(SubBand *b) +static inline void intra_dc_prediction(SubBand *b) { int x, y; int16_t *line = b->ibuf; @@ -237,7 +261,7 @@ static void intra_dc_prediction(SubBand * @param level subband level * @param orientation orientation of the subband */ -static int subband(DiracContext *s, SubBand *b) +static av_always_inline int decode_subband_internal(DiracContext *s, SubBand *b, int is_arith) { GetBitContext *gb = &s->gb; unsigned int length; @@ -252,12 +276,15 @@ static int subband(DiracContext *s, SubB align_get_bits(gb); } else { quant = svq3_get_ue_golomb(gb); + align_get_bits(gb); + if (is_arith) dirac_arith_init(&s->arith, gb, length); for (cb_y = 0; cb_y < cb_numy; cb_y++) for (cb_x = 0; cb_x < cb_numx; cb_x++) - codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one); + codeblock(s, b, cb_x, cb_y, cb_numx, cb_numy, &quant, blockcnt_one, is_arith); + if (is_arith) dirac_arith_flush(&s->arith); } @@ -267,6 +294,16 @@ static int subband(DiracContext *s, SubB return 0; } +static av_noinline int decode_subband_arith(DiracContext *s, SubBand *b) +{ + return decode_subband_internal(s, b, 1); +} + +static av_noinline int decode_subband_vlc(DiracContext *s, SubBand *b) +{ + return decode_subband_internal(s, b, 0); +} + /** * Decode a single component * @@ -283,7 +320,10 @@ static void decode_component(DiracContex for (orientation = (level ? 1 : 0); orientation < 4; orientation++) { SubBand *b = &s->plane[comp].band[level][orientation]; align_get_bits(gb); - subband(s, b); + if (s->is_arith) + decode_subband_arith(s, b); + else + decode_subband_vlc(s, b); } } } @@ -821,6 +861,7 @@ static int alloc_frame(AVCodecContext *a avcodec_get_frame_defaults(pic); s->refs = parse_code & 0x03; + s->is_arith = (parse_code & 0x48) == 0x08; pic->reference = (parse_code & 0x0C) == 0x0C; pic->key_frame = s->refs == 0; pic->pict_type = pict_type[s->refs];

1 0

[soc]: r3884 - amr/amrnbdec.c
by diego 27 Dec '08

27 Dec '08

Author: diego Date: Mon Dec 15 11:13:50 2008 New Revision: 3884 Log: K&R function declaration and whitespace cosmetics Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c (original) +++ amr/amrnbdec.c Mon Dec 15 11:13:50 2008 @@ -76,8 +76,8 @@ typedef struct AMRContext { } AMRContext; -static int amrnb_decode_init(AVCodecContext *avctx) { - +static int amrnb_decode_init(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; // variables needed for cos table generation @@ -126,8 +126,9 @@ static int amrnb_decode_init(AVCodecCont * @return Returns the frame mode */ -enum Mode decode_bitstream(AVCodecContext *avctx, uint8_t *buf, int buf_size, enum Mode *speech_mode) { - +enum Mode decode_bitstream(AVCodecContext *avctx, uint8_t *buf, int buf_size, + enum Mode *speech_mode) +{ AMRContext *p = avctx->priv_data; enum Mode mode; int i; @@ -214,7 +215,8 @@ enum Mode decode_bitstream(AVCodecContex * @param min_dist minimum required separation of lsfs */ -static void reorder_lsf(int *lsf, int min_dist) { +static void reorder_lsf(int *lsf, int min_dist) +{ int i; int lsf_min = min_dist; @@ -234,7 +236,8 @@ static void reorder_lsf(int *lsf, int mi * @param lsp a vector of lsps */ -static void lsf2lsp(int *lsf, int *lsp) { +static void lsf2lsp(int *lsf, int *lsp) +{ int i; int index, offset; @@ -252,8 +255,8 @@ static void lsf2lsp(int *lsf, int *lsp) * @param avctx pointer to the AVCodecContext for AMR */ -static void decode_lsf2lsp_3(AVCodecContext *avctx) { - +static void decode_lsf2lsp_3(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; int lsf1_r[LP_FILTER_ORDER]; // vector of residual lsfs @@ -337,8 +340,8 @@ static void decode_lsf2lsp_3(AVCodecCont * @param avctx pointer to the AVCodecContext for AMR */ -static void decode_lsf2lsp_5(AVCodecContext *avctx) { - +static void decode_lsf2lsp_5(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; int lsf1_r[LP_FILTER_ORDER], lsf2_r[LP_FILTER_ORDER]; // vectors of residual lsfs @@ -421,7 +424,8 @@ static void decode_lsf2lsp_5(AVCodecCont * @return void */ -static void lsp2poly(int *lsp, int *f) { +static void lsp2poly(int *lsp, int *f) +{ int i, j; f[0] = 1<<24; @@ -458,7 +462,8 @@ static void lsp2poly(int *lsp, int *f) { * @return void */ -static void lsp2lpc(int *lsp, int *lpc_coeffs) { +static void lsp2lpc(int *lsp, int *lpc_coeffs) +{ int f1[6], f2[6]; int temp, i; @@ -501,7 +506,8 @@ static void lsp2lpc(int *lsp, int *lpc_c * @return void */ -static void lpc_interp_13(AVCodecContext *avctx, int **lpc_coeffs) { +static void lpc_interp_13(AVCodecContext *avctx, int **lpc_coeffs) +{ AMRContext *p = avctx->priv_data; int lsp[LP_FILTER_ORDER]; int i; @@ -539,7 +545,8 @@ static void lpc_interp_13(AVCodecContext * @return void */ -static void lpc_interp_123(AVCodecContext *avctx, int **lpc_coeffs) { +static void lpc_interp_123(AVCodecContext *avctx, int **lpc_coeffs) +{ AMRContext *p = avctx->priv_data; int lsp[LP_FILTER_ORDER]; int i; @@ -590,7 +597,9 @@ static void lpc_interp_123(AVCodecContex * @return void */ -static void decode_pitch_lag_3(AVCodecContext *avctx, int pitch_index, int *pitch_lag_int, int *pitch_lag_frac) { +static void decode_pitch_lag_3(AVCodecContext *avctx, int pitch_index, + int *pitch_lag_int, int *pitch_lag_frac) +{ AMRContext *p = avctx->priv_data; int tmp_lag; @@ -659,7 +668,9 @@ static void decode_pitch_lag_3(AVCodecCo * @return void */ -static void decode_pitch_lag_6(AVCodecContext *avctx, int pitch_index, int *pitch_lag_int, int *pitch_lag_frac) { +static void decode_pitch_lag_6(AVCodecContext *avctx, int pitch_index, + int *pitch_lag_int, int *pitch_lag_frac) +{ AMRContext *p = avctx->priv_data; int temp; @@ -707,7 +718,8 @@ static void decode_pitch_lag_6(AVCodecCo * @return void */ -static void decode_pitch_vector(AVCodecContext *avctx, int *excitation) { +static void decode_pitch_vector(AVCodecContext *avctx, int *excitation) +{ AMRContext *p = avctx->priv_data; int i, j, temp; int *excitation_temp; @@ -744,7 +756,9 @@ static void decode_pitch_vector(AVCodecC * @return void */ -static void reconstruct_fixed_code(int *fixed_code, int *pulse_position, int sign, int nr_pulses) { +static void reconstruct_fixed_code(int *fixed_code, int *pulse_position, + int sign, int nr_pulses) +{ int i; // reset the code @@ -765,7 +779,8 @@ static void reconstruct_fixed_code(int * * @return void */ -static void fixed2position(int16_t *fixed_index, int *position_index) { +static void fixed2position(int16_t *fixed_index, int *position_index) +{ int MSBs, LSBs, MSBs0_24, divMSB; // indices from track 1 (7+3 bits) @@ -820,7 +835,9 @@ static void fixed2position(int16_t *fixe * @return void */ -static void decode_2_pulses_9bits(AVCodecContext *avctx, int sign, int fixed_index, int *fixed_code) { +static void decode_2_pulses_9bits(AVCodecContext *avctx, int sign, + int fixed_index, int *fixed_code) +{ AMRContext *p = avctx->priv_data; int pulse_position[2]; int pulse_subset; @@ -848,7 +865,8 @@ static void decode_2_pulses_9bits(AVCode * @return void */ -static void decode_2_pulses_11bits(int sign, int fixed_index, int *fixed_code) { +static void decode_2_pulses_11bits(int sign, int fixed_index, int *fixed_code) +{ int pulse_position[2]; int pulse_subset; @@ -881,7 +899,8 @@ static void decode_2_pulses_11bits(int s * @return void */ -static void decode_3_pulses_14bits(int sign, int fixed_index, int *fixed_code) { +static void decode_3_pulses_14bits(int sign, int fixed_index, int *fixed_code) +{ int pulse_position[3]; int pulse_subset; @@ -912,7 +931,8 @@ static void decode_3_pulses_14bits(int s * @return void */ -static void decode_4_pulses_17bits(int sign, int fixed_index, int *fixed_code) { +static void decode_4_pulses_17bits(int sign, int fixed_index, int *fixed_code) +{ int pulse_position[4]; int pulse_subset; @@ -942,7 +962,8 @@ static void decode_4_pulses_17bits(int s * @return void */ -static void decode_8_pulses_31bits(int16_t *fixed_index, int *fixed_code) { +static void decode_8_pulses_31bits(int16_t *fixed_index, int *fixed_code) +{ int position_index[8]; int i, pos1, pos2, sign; @@ -977,7 +998,8 @@ static void decode_8_pulses_31bits(int16 * @return void */ -static void decode_10_pulses_35bits(int16_t *fixed_index, int *fixed_code) { +static void decode_10_pulses_35bits(int16_t *fixed_index, int *fixed_code) +{ int i, pos1, pos2, sign; // reset the code @@ -1010,7 +1032,8 @@ static void decode_10_pulses_35bits(int1 * @return a-b : the result of the comparison */ -int qsort_compare(const int *a, const int *b) { +int qsort_compare(const int *a, const int *b) +{ return (int)(*a - *b); } @@ -1022,7 +1045,8 @@ int qsort_compare(const int *a, const in * @return Returns the median value */ -static int median(int *values, int n) { +static int median(int *values, int n) +{ int temp[9]; // largest n used for median calculation is 9 memcpy(values, temp, n*sizeof(int)); @@ -1042,7 +1066,8 @@ static int median(int *values, int n) { * @return Returns the pitch gain */ -static int find_pitch_gain(AMRDecoderState *state_ptr) { +static int find_pitch_gain(AMRDecoderState *state_ptr) +{ int temp_median; // find the median of the previous five pitch gains @@ -1064,7 +1089,8 @@ static int find_pitch_gain(AMRDecoderSta * @return Returns the pitch gain */ -static int decode_pitch_gain(enum Mode mode, int index) { +static int decode_pitch_gain(enum Mode mode, int index) +{ int gain; if(mode == MODE_122) { @@ -1086,8 +1112,9 @@ static int decode_pitch_gain(enum Mode m * @param pitch_gain pointer to the pitch gain */ -static void pitch_gain_update(AMRDecoderState *state_ptr, int bad_frame_indicator, - int *pitch_gain) { +static void pitch_gain_update(AMRDecoderState *state_ptr, + int bad_frame_indicator, int *pitch_gain) +{ if(bad_frame_indicator == 0) { if(state_ptr->prev_frame_bad != 0) { // if the previous frame was bad, limit the current pitch gain to @@ -1121,7 +1148,8 @@ static void pitch_gain_update(AMRDecoder * @param avctx pointer to the AVCodecContext for AMR */ -void decode_reset(AVCodecContext *avctx) { +void decode_reset(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; p->prev_frame_homing = 1; @@ -1131,9 +1159,9 @@ void decode_reset(AVCodecContext *avctx) } -static int amrnb_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, uint8_t *buf, int buf_size) { - +static int amrnb_decode_frame(AVCodecContext *avctx, void *data, + int *data_size, uint8_t *buf, int buf_size) +{ AMRContext *p = avctx->priv_data; // pointer to private data int16_t *outbuffer = data; // pointer to the output data buffer int i; // counter @@ -1281,8 +1309,8 @@ static int amrnb_decode_frame(AVCodecCon } -static int amrnb_decode_close(AVCodecContext *avctx) { - +static int amrnb_decode_close(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; /* Free allocated memory */ @@ -1295,8 +1323,7 @@ static int amrnb_decode_close(AVCodecCon } -AVCodec amrnb_decoder = -{ +AVCodec amrnb_decoder = { .name = "amrnb", .type = CODEC_TYPE_AUDIO, .id = CODEC_ID_AMR_NB,

5 19

[soc]: r3894 - amr/amrnbfloatdec.c
by diego 27 Dec '08

27 Dec '08

Author: diego Date: Sat Dec 27 13:28:29 2008 New Revision: 3894 Log: K&R-style function declaration and whitespace cosmetics. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Sat Dec 27 13:20:46 2008 (r3893) +++ amr/amrnbfloatdec.c Sat Dec 27 13:28:29 2008 (r3894) @@ -86,7 +86,8 @@ typedef struct AMRContext { } AMRContext; -static void reset_state(AMRContext *p) { +static void reset_state(AMRContext *p) +{ int i; // initialise values for the lsp vector from the 4th subframe of the @@ -121,7 +122,8 @@ static void reset_state(AMRContext *p) { } } -static int amrnb_decode_init(AVCodecContext *avctx) { +static int amrnb_decode_init(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; dsputil_init(&p->dsp, avctx); @@ -155,7 +157,9 @@ static int amrnb_decode_init(AVCodecCont * @return Returns the frame mode */ -enum Mode decode_bitstream(AMRContext *p, uint8_t *buf, int buf_size, enum Mode *speech_mode) { +enum Mode decode_bitstream(AMRContext *p, uint8_t *buf, int buf_size, + enum Mode *speech_mode) +{ enum Mode mode; int i; const AMROrder *order; @@ -246,7 +250,8 @@ enum Mode decode_bitstream(AMRContext *p * @return void */ -static void lsf2lsp(float *lsf, float *lsp) { +static void lsf2lsp(float *lsf, float *lsp) +{ int i; for(i=0; i<LP_FILTER_ORDER; i++) { @@ -262,7 +267,8 @@ static void lsf2lsp(float *lsf, float *l * @return void */ -static void lsf2lsp_5(AMRContext *p) { +static void lsf2lsp_5(AMRContext *p) +{ float lsf_r[2][LP_FILTER_ORDER]; // residual LSF vectors float lsf_q[2][LP_FILTER_ORDER]; // quantified LSF vectors float sign; @@ -324,7 +330,8 @@ static void lsf2lsp_5(AMRContext *p) { * @return void */ -static void lsf2lsp_3(AMRContext *p) { +static void lsf2lsp_3(AMRContext *p) +{ float lsf_r[LP_FILTER_ORDER]; // residual LSF vector float lsf_q[LP_FILTER_ORDER]; // quantified LSF vector const float (*lsf_3_1_tmp)[3], (*lsf_3_3_tmp)[4]; // temp ptrs for switching tables depending on mode @@ -383,7 +390,8 @@ static void lsf2lsp_3(AMRContext *p) { * @return void */ -static void interp_lsp_13(AMRContext *p) { +static void interp_lsp_13(AMRContext *p) +{ int i; for(i=0; i<LP_FILTER_ORDER; i++) { @@ -400,7 +408,8 @@ static void interp_lsp_13(AMRContext *p) * @return void */ -static void interp_lsp_123(AMRContext *p) { +static void interp_lsp_123(AMRContext *p) +{ int i; for(i=0; i<LP_FILTER_ORDER; i++) { @@ -419,7 +428,8 @@ static void interp_lsp_123(AMRContext *p * @return void */ -static void lsp2poly(float *lsp, float *f) { +static void lsp2poly(float *lsp, float *f) +{ int i, j; f[-1] = 0.0; @@ -443,7 +453,8 @@ static void lsp2poly(float *lsp, float * * @return void */ -static void lsp2lpc(float *lsp, float *lpc_coeffs) { +static void lsp2lpc(float *lsp, float *lpc_coeffs) +{ float f1[7], f2[7]; int i; @@ -481,7 +492,8 @@ static void lsp2lpc(float *lsp, float *l * @return void */ -static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe) { +static void decode_pitch_lag_3(AMRContext *p, int pitch_index, int subframe) +{ // subframe 1 or 3 if(!(subframe & 1)) { if(pitch_index < 197) { @@ -533,7 +545,8 @@ static void decode_pitch_lag_3(AMRContex * @return void */ -static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe) { +static void decode_pitch_lag_6(AMRContext *p, int pitch_index, int subframe) +{ // subframe 1 or 3 if(!(subframe & 1)) { if(pitch_index < 463){ @@ -566,7 +579,10 @@ static void decode_pitch_lag_6(AMRContex * @return void */ -static void interp_pitch_vector(float *prev_excitation, int lag_int, int lag_frac, enum Mode mode, float *pitch_vector) { +static void interp_pitch_vector(float *prev_excitation, int lag_int, + int lag_frac, enum Mode mode, + float *pitch_vector) +{ int n, i; const float *b60_idx1, *b60_idx2; float *exc_idx; @@ -613,7 +629,9 @@ static void interp_pitch_vector(float *p * @return void */ -static void reconstruct_fixed_vector(int *pulse_position, int sign, int nr_pulses, float *fixed_vector) { +static void reconstruct_fixed_vector(int *pulse_position, int sign, + int nr_pulses, float *fixed_vector) +{ int i; // reset the code @@ -635,7 +653,9 @@ static void reconstruct_fixed_vector(int * @return void */ -static void decode_2_pulses_9bits(int fixed_index, int sign, int subframe, float *fixed_vector) { +static void decode_2_pulses_9bits(int fixed_index, int sign, int subframe, + float *fixed_vector) +{ int pulse_position[2]; int pulse_subset; @@ -661,7 +681,9 @@ static void decode_2_pulses_9bits(int fi * @return void */ -static void decode_2_pulses_11bits(int fixed_index, int sign, float *fixed_vector) { +static void decode_2_pulses_11bits(int fixed_index, int sign, + float *fixed_vector) +{ int pulse_position[2]; int pulse_subset; @@ -690,7 +712,9 @@ static void decode_2_pulses_11bits(int f * @return void */ -static void decode_3_pulses_14bits(int fixed_index, int sign, float *fixed_vector) { +static void decode_3_pulses_14bits(int fixed_index, int sign, + float *fixed_vector) +{ int pulse_position[3]; int pulse_subset; @@ -720,7 +744,9 @@ static void decode_3_pulses_14bits(int f * @return void */ -static void decode_4_pulses_17bits(int fixed_index, int sign, float *fixed_vector) { +static void decode_4_pulses_17bits(int fixed_index, int sign, + float *fixed_vector) +{ int pulse_position[4]; int pulse_subset; @@ -749,7 +775,8 @@ static void decode_4_pulses_17bits(int f * @return void */ -static void decode_8_pulses_31bits(int16_t *fixed_index, float *fixed_vector) { +static void decode_8_pulses_31bits(int16_t *fixed_index, float *fixed_vector) +{ int pulse_position[8]; int i, pos1, pos2, sign, temp; @@ -805,7 +832,8 @@ static void decode_8_pulses_31bits(int16 * @return void */ -static void decode_10_pulses_35bits(int16_t *fixed_index, float *fixed_vector) { +static void decode_10_pulses_35bits(int16_t *fixed_index, float *fixed_vector) +{ int i, pos1, pos2, sign; // reset the code @@ -841,7 +869,9 @@ static void decode_10_pulses_35bits(int1 * @return Returns the predicted fixed gain */ -static float fixed_gain_prediction(float *fixed_vector, float *prev_pred_error, enum Mode mode) { +static float fixed_gain_prediction(float *fixed_vector, float *prev_pred_error, + enum Mode mode) +{ int i; float energy_pred = 0.0, energy_fixed_mean = 0.0; @@ -874,7 +904,8 @@ static float fixed_gain_prediction(float * @return a-b : the result of the comparison */ -int qsort_compare(const float *a, const float *b) { +int qsort_compare(const float *a, const float *b) +{ float diff = *a - *b; if(diff > 0.0f) return 1; @@ -891,7 +922,8 @@ int qsort_compare(const float *a, const * @return Returns the median value */ -static float medianf(float *values, int n) { +static float medianf(float *values, int n) +{ float temp[9]; // largest n used for median calculation is 9 memcpy(temp, values, n * sizeof(float)); @@ -913,7 +945,8 @@ static float medianf(float *values, int * @param ir_filter pointer to the impulse response filter */ -static void convolve_circ(float *fixed_vector, const float *ir_filter) { +static void convolve_circ(float *fixed_vector, const float *ir_filter) +{ int i, j, k; int npulses = 0, pulse_positions[AMR_SUBFRAME_SIZE]; float fixed_vector_temp[AMR_SUBFRAME_SIZE]; @@ -955,7 +988,9 @@ static void convolve_circ(float *fixed_v * @param overflow 16-bit overflow flag */ -static int synthesis(AMRContext *p, float *excitation, float *lpc, float *samples, uint8_t overflow) { +static int synthesis(AMRContext *p, float *excitation, float *lpc, + float *samples, uint8_t overflow) +{ int i, j, overflow_temp = 0; // if an overflow has been detected, the pitch vector is scaled down by a @@ -1019,7 +1054,8 @@ static int synthesis(AMRContext *p, floa * @param p pointer to the AMRContext */ -static void update_state(AMRContext *p) { +static void update_state(AMRContext *p) +{ // update the previous frame's fourth subframe LSP vector memcpy(p->prev_lsp_sub4, p->lsp[3], LP_FILTER_ORDER * sizeof(float)); @@ -1052,8 +1088,9 @@ static void update_state(AMRContext *p) /*** end of update functions ***/ -static int amrnb_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, uint8_t *buf, int buf_size) { +static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, + uint8_t *buf, int buf_size) +{ AMRContext *p = avctx->priv_data; // pointer to private data int16_t *buf_out = data; // pointer to the output data buffer @@ -1310,7 +1347,8 @@ static int amrnb_decode_frame(AVCodecCon } -static int amrnb_decode_close(AVCodecContext *avctx) { +static int amrnb_decode_close(AVCodecContext *avctx) +{ AMRContext *p = avctx->priv_data; /* Return 0 if everything is ok, -1 if not */ @@ -1318,8 +1356,7 @@ static int amrnb_decode_close(AVCodecCon } -AVCodec amrnb_decoder = -{ +AVCodec amrnb_decoder = { .name = "amrnb", .type = CODEC_TYPE_AUDIO, .id = CODEC_ID_AMR_NB,

1 0

[soc]: r3893 - amr/amr-ffmpeg.diff
by diego 27 Dec '08

27 Dec '08

Author: diego Date: Sat Dec 27 13:20:46 2008 New Revision: 3893 Log: Make patch apply without fuzz and offsets and do not add trailing whitespace. Modified: amr/amr-ffmpeg.diff Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Fri Dec 26 12:04:01 2008 (r3892) +++ amr/amr-ffmpeg.diff Sat Dec 27 13:20:46 2008 (r3893) @@ -26,7 +26,7 @@ Index: doc/general.texi =================================================================== --- doc/general.texi (revision 16142) +++ doc/general.texi (working copy) -@@ -344,8 +344,8 @@ +@@ -346,8 +344,8 @@ @item AAC @tab E @tab X @tab encoding supported through external library libfaac @item AC-3 @tab IX @tab IX @@ -43,10 +43,10 @@ Index: Changelog +++ Changelog (working copy) @@ -142,6 +142,8 @@ - Electronic Arts TGQ decoder - - RV40 decoder + - RV30 and RV40 decoder - QCELP / PureVoice decoder +- AMR-NB decoder -+ ++ version 0.4.9-pre1:

1 0

[soc]: r3892 - nellyenc/nellymoserenc.c
by diego 26 Dec '08

26 Dec '08

Author: diego Date: Fri Dec 26 12:04:01 2008 New Revision: 3892 Log: ASAO Nelly Moser implementation moved to a better place on mphq. Modified: nellyenc/nellymoserenc.c Modified: nellyenc/nellymoserenc.c ============================================================================== --- nellyenc/nellymoserenc.c Thu Dec 25 16:44:57 2008 (r3891) +++ nellyenc/nellymoserenc.c Fri Dec 26 12:04:01 2008 (r3892) @@ -27,7 +27,7 @@ * by Bartlomiej Wolowiec * * Generic codec information: libavcodec/nellymoserdec.c - * Log search algorithm idea: http://www1.mplayerhq.hu/ASAO/ASAO.zip + * Log search algorithm idea: http://samples.mplayerhq.hu/A-codecs/Nelly_Moser/ASAO/ASAO.zip * (Copyright Joseph Artsimovich and UAB "DKD") * * for more information about nellymoser format, visit:

1 0

[soc]: r3891 - dcaenc/readme mlp/mlpdec.c
by diego 25 Dec '08

25 Dec '08

Author: diego Date: Thu Dec 25 16:44:57 2008 New Revision: 3891 Log: Change some mplayerhq.hu references to ffmpeg.org. Modified: dcaenc/readme mlp/mlpdec.c Modified: dcaenc/readme ============================================================================== --- dcaenc/readme Sat Dec 20 19:26:24 2008 (r3890) +++ dcaenc/readme Thu Dec 25 16:44:57 2008 (r3891) @@ -1,5 +1,3 @@ This source is based on code from here: -http://roundup.mplayerhq.hu/roundup/ffmpeg/file153/edts-20080207.tar.gz - - +http://roundup.ffmpeg.org/roundup/ffmpeg/file153/edts-20080207.tar.gz Modified: mlp/mlpdec.c ============================================================================== --- mlp/mlpdec.c Sat Dec 20 19:26:24 2008 (r3890) +++ mlp/mlpdec.c Thu Dec 25 16:44:57 2008 (r3891) @@ -66,7 +66,7 @@ static const char* sample_message = "Please file a bug report following the instructions at " - "http://ffmpeg.mplayerhq.hu/bugreports.html and include " + "http://ffmpeg.org/bugreports.html and include " "a sample of this file."; typedef struct SubStream {

1 0