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

[soc]: r4054 - libavfilter/vf_hflip.c
by stefano 16 Feb '09

16 Feb '09

Author: stefano Date: Mon Feb 16 21:43:34 2009 New Revision: 4054 Log: Add a query_formats() callback to the hflip filter. Currently the algorithm implemented in the draw_slice of hflip only works with planar formats, it should be extended to also support packed ones. Modified: libavfilter/vf_hflip.c Modified: libavfilter/vf_hflip.c ============================================================================== --- libavfilter/vf_hflip.c Sat Feb 14 13:02:20 2009 (r4053) +++ libavfilter/vf_hflip.c Mon Feb 16 21:43:34 2009 (r4054) @@ -27,6 +27,17 @@ typedef struct int vsub; /**< chroma subsampling along height */ } FlipContext; +static int query_formats(AVFilterContext *ctx) +{ + avfilter_set_common_formats(ctx, + avfilter_make_format_list(10, + PIX_FMT_YUV444P, PIX_FMT_YUV422P, PIX_FMT_YUV420P, + PIX_FMT_YUV411P, PIX_FMT_YUV410P, + PIX_FMT_YUVJ444P, PIX_FMT_YUVJ422P, PIX_FMT_YUVJ420P, + PIX_FMT_YUV440P, PIX_FMT_YUVJ440P)); + return 0; +} + static int config_props(AVFilterLink *link) { FlipContext *flip = link->dst->priv; @@ -77,6 +88,7 @@ AVFilter avfilter_vf_hflip = { .name = "hflip", .priv_size = sizeof(FlipContext), + .query_formats = query_formats, .inputs = (AVFilterPad[]) {{ .name = "default", .type = CODEC_TYPE_VIDEO,

1 0

[soc]: r4053 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff
by stefano 14 Feb '09

14 Feb '09

Author: stefano Date: Sat Feb 14 13:02:20 2009 New Revision: 4053 Log: Update to FFmpeg SVN r17222. Modified: libavfilter/checkout.sh libavfilter/diffs/01_ffplay_filters.diff libavfilter/diffs/02_ffmpeg_filters.diff Modified: libavfilter/checkout.sh ============================================================================== --- libavfilter/checkout.sh Fri Feb 13 02:23:03 2009 (r4052) +++ libavfilter/checkout.sh Sat Feb 14 13:02:20 2009 (r4053) @@ -1,7 +1,7 @@ #! /bin/sh echo "checking out pristine ffmpeg" -svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r16809 +svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r17222 echo "patching ffmpeg" for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done Modified: libavfilter/diffs/01_ffplay_filters.diff ============================================================================== --- libavfilter/diffs/01_ffplay_filters.diff Fri Feb 13 02:23:03 2009 (r4052) +++ libavfilter/diffs/01_ffplay_filters.diff Sat Feb 14 13:02:20 2009 (r4053) @@ -1,6 +1,6 @@ Index: ffplay.c =================================================================== ---- ffplay.c (revision 16809) +--- ffplay.c (revision 17222) +++ ffplay.c (working copy) @@ -29,6 +29,12 @@ #include "libavcodec/audioconvert.h" @@ -49,7 +49,7 @@ Index: ffplay.c } VideoState; static void show_help(void); -@@ -211,6 +228,9 @@ +@@ -212,6 +229,9 @@ static int error_recognition = FF_ER_CAREFUL; static int error_concealment = 3; static int decoder_reorder_pts= 0; @@ -59,7 +59,7 @@ Index: ffplay.c /* current context */ static int is_full_screen; -@@ -658,6 +678,13 @@ +@@ -661,6 +681,13 @@ vp = &is->pictq[is->pictq_rindex]; if (vp->bmp) { @@ -73,7 +73,7 @@ Index: ffplay.c /* XXX: use variable in the frame */ if (is->video_st->sample_aspect_ratio.num) aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio); -@@ -665,9 +692,10 @@ +@@ -668,9 +695,10 @@ aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio); else aspect_ratio = 0; @@ -85,7 +85,7 @@ Index: ffplay.c /* if an active format is indicated, then it overrides the mpeg format */ #if 0 -@@ -870,9 +898,15 @@ +@@ -873,9 +901,15 @@ } else if(!is_full_screen && screen_width){ w = screen_width; h = screen_height; @@ -101,7 +101,7 @@ Index: ffplay.c } else { w = 640; h = 480; -@@ -1177,6 +1211,20 @@ +@@ -1180,6 +1214,20 @@ if (vp->bmp) SDL_FreeYUVOverlay(vp->bmp); @@ -122,7 +122,7 @@ Index: ffplay.c #if 0 /* XXX: use generic function */ /* XXX: disable overlay if no hardware acceleration or if RGB format */ -@@ -1194,12 +1242,9 @@ +@@ -1197,12 +1245,9 @@ break; } #endif @@ -136,7 +136,7 @@ Index: ffplay.c SDL_LockMutex(is->pictq_mutex); vp->allocated = 1; -@@ -1216,8 +1261,11 @@ +@@ -1219,8 +1264,11 @@ VideoPicture *vp; int dst_pix_fmt; AVPicture pict; @@ -149,7 +149,7 @@ Index: ffplay.c /* wait until we have space to put a new picture */ SDL_LockMutex(is->pictq_mutex); while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE && -@@ -1233,8 +1281,13 @@ +@@ -1236,8 +1284,13 @@ /* alloc or resize hardware picture buffer */ if (!vp->bmp || @@ -163,7 +163,7 @@ Index: ffplay.c SDL_Event event; vp->allocated = 0; -@@ -1258,6 +1311,12 @@ +@@ -1261,6 +1314,12 @@ /* if the frame is not skipped, then display it */ if (vp->bmp) { @@ -176,7 +176,7 @@ Index: ffplay.c /* get a pointer on the bitmap */ SDL_LockYUVOverlay (vp->bmp); -@@ -1269,18 +1328,30 @@ +@@ -1272,18 +1331,30 @@ pict.linesize[0] = vp->bmp->pitches[0]; pict.linesize[1] = vp->bmp->pitches[2]; pict.linesize[2] = vp->bmp->pitches[1]; @@ -211,7 +211,7 @@ Index: ffplay.c /* update the bitmap content */ SDL_UnlockYUVOverlay(vp->bmp); -@@ -1335,54 +1406,266 @@ +@@ -1338,54 +1409,266 @@ return queue_picture(is, src_frame, pts); } @@ -509,7 +509,7 @@ Index: ffplay.c av_free(frame); return 0; } -@@ -2168,6 +2451,12 @@ +@@ -2181,6 +2464,12 @@ /* free all pictures */ for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) { vp = &is->pictq[i]; @@ -522,7 +522,7 @@ Index: ffplay.c if (vp->bmp) { SDL_FreeYUVOverlay(vp->bmp); vp->bmp = NULL; -@@ -2505,6 +2794,9 @@ +@@ -2519,6 +2808,9 @@ { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options", "bit_mask" }, { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" }, { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" }, @@ -532,10 +532,10 @@ Index: ffplay.c { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, }; -@@ -2553,7 +2845,9 @@ +@@ -2567,7 +2859,9 @@ avctx_opts[i]= avcodec_alloc_context2(i); } - avformat_opts = av_alloc_format_context(); + avformat_opts = avformat_alloc_context(); +#if !CONFIG_AVFILTER sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); +#endif Modified: libavfilter/diffs/02_ffmpeg_filters.diff ============================================================================== --- libavfilter/diffs/02_ffmpeg_filters.diff Fri Feb 13 02:23:03 2009 (r4052) +++ libavfilter/diffs/02_ffmpeg_filters.diff Sat Feb 14 13:02:20 2009 (r4053) @@ -1,6 +1,6 @@ Index: ffmpeg.c =================================================================== ---- ffmpeg.c (revision 16809) +--- ffmpeg.c (revision 17222) +++ ffmpeg.c (working copy) @@ -41,6 +41,13 @@ #include "libavutil/avstring.h" @@ -296,7 +296,7 @@ Index: ffmpeg.c for(i=0;i<nb_ostreams;i++) { int frame_size; -@@ -1354,6 +1563,9 @@ +@@ -1354,6 +1567,9 @@ do_audio_out(os, ost, ist, data_buf, data_size); break; case CODEC_TYPE_VIDEO: @@ -324,7 +324,7 @@ Index: ffmpeg.c av_free(buffer_to_free); /* XXX: allocate the subtitles in the codec ? */ if (subtitle_to_free) { -@@ -1842,10 +2062,21 @@ +@@ -1842,10 +2068,21 @@ fprintf(stderr, "Cannot get resampling context\n"); av_exit(1); } @@ -346,7 +346,7 @@ Index: ffmpeg.c break; case CODEC_TYPE_SUBTITLE: ost->encoding_needed = 1; -@@ -3835,6 +4066,9 @@ +@@ -3835,6 +4072,9 @@ #if CONFIG_VHOOK { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" }, #endif

1 0

[soc]: r4052 - amr/amrnbfloatdec.c
by kmalaussene 13 Feb '09

13 Feb '09

Author: kmalaussene Date: Fri Feb 13 02:23:03 2009 New Revision: 4052 Log: pitch_vector should be initialized to 0, according to reference code. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Fri Feb 13 00:47:56 2009 (r4051) +++ amr/amrnbfloatdec.c Fri Feb 13 02:23:03 2009 (r4052) @@ -477,6 +477,7 @@ static void interp_pitch_vector(float *p exc_idx = &prev_excitation[-lag_int]; for(n=0; n<AMR_SUBFRAME_SIZE; n++) { + pitch_vector[n] = 0.0; for(i=0; i<10; i++) { pitch_vector[n] += b60_idx1[6*i] * exc_idx[-i]; }

1 0

[soc]: r4051 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Fri Feb 13 00:47:56 2009 New Revision: 4051 Log: Fix interp_pitch_vector accroding to reference code: in the loop, the index exc_idx should be incremented only once. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Fri Feb 13 00:45:00 2009 (r4050) +++ amr/amrnbfloatdec.c Fri Feb 13 00:47:56 2009 (r4051) @@ -484,7 +484,6 @@ static void interp_pitch_vector(float *p for(i=0; i<10; i++) { pitch_vector[n] += b60_idx2[6*i] * exc_idx[ i]; } - exc_idx++; } }

1 0

[soc]: r4050 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Fri Feb 13 00:45:00 2009 New Revision: 4050 Log: Fix pitch lag in interp_pitch_vector according to reference code: the index exc_idx should go one step back, not one step forward, when lag_frac < 0. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 12 23:37:34 2009 (r4049) +++ amr/amrnbfloatdec.c Fri Feb 13 00:45:00 2009 (r4050) @@ -469,7 +469,7 @@ static void interp_pitch_vector(float *p if(lag_frac < 0) { lag_frac += 6; - lag_int--; + lag_int++; } b60_idx1 = &b60[ lag_frac];

1 0

[soc]: r4049 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Thu Feb 12 23:37:34 2009 New Revision: 4049 Log: Use Doxygen comment to group functions together. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 12 23:10:22 2009 (r4048) +++ amr/amrnbfloatdec.c Thu Feb 12 23:37:34 2009 (r4049) @@ -215,7 +215,8 @@ enum Mode decode_bitstream(AMRContext *p } -/*** LPC coefficient decoding functions ***/ +/// @defgroup amr_lpc_decoding pitch LPC coefficient decoding functions +/// @{ /** * Convert an lsf vector into an lsp vector. @@ -354,10 +355,11 @@ static void lsp2lpc(float *lsp, float *l ff_celp_lspf2lpc(lsp_double, lpc_coeffs); } -/*** end of LPC coefficient decoding functions ***/ +/// @} -/*** pitch vector decoding functions ***/ +/// @defgroup amr_pitch_vector_decoding pitch vector decoding functions +/// @{ /** * Decode the adaptive codebook index to the integer and fractional parts @@ -486,10 +488,11 @@ static void interp_pitch_vector(float *p } } -/*** end of pitch vector decoding functions ***/ +/// @} -/*** algebraic code book (fixed) vector decoding functions ***/ +/// @defgroup amr_algebraic_code_book algebraic code book (fixed) vector decoding functions +/// @{ /** * Reconstruct the algebraic codebook vector. @@ -714,10 +717,11 @@ static void decode_10_pulses_35bits(cons } } -/*** end of algebraic code book (fixed) vector decoding functions ***/ +/// @} -/*** gain decoding functions ***/ +/// @defgroup amr_gain_decoding gain decoding functions +/// @{ /** * Predict the fixed gain. @@ -750,10 +754,11 @@ static float fixed_gain_prediction(float return powf(10.0, 0.05*(energy_pred + energy_mean[mode] - energy_fixed_mean)); } -/*** end of gain decoding functions ***/ +/// @} -/*** pre-processing functions ***/ +/// @defgroup amr_pre_processing pre-processing functions +/// @{ /** * Comparison function for use with qsort. @@ -832,10 +837,11 @@ static void convolve_circ(float *fixed_v } } -/*** end of pre-processing functions ***/ +/// @} -/*** synthesis functions ***/ +/// @defgroup amr_synthesis synthesis functions +/// @{ /** * Conduct 10th order linear predictive coding synthesis. @@ -902,10 +908,11 @@ static int synthesis(AMRContext *p, floa return overflow_temp; } -/*** end of synthesis functions ***/ +/// @} -/*** update functions ***/ +/// @defgroup amr_update update functions +/// @{ /** * Update buffers and history at the end of decoding a subframe. @@ -944,7 +951,8 @@ static void update_state(AMRContext *p) LP_FILTER_ORDER*sizeof(float)); } -/*** end of update functions ***/ +/// @} + static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size,

1 0

[soc]: r4048 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Thu Feb 12 23:10:22 2009 New Revision: 4048 Log: Add const when needed to parameters of decode_*_pulse_* functions. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 12 03:53:35 2009 (r4047) +++ amr/amrnbfloatdec.c Thu Feb 12 23:10:22 2009 (r4048) @@ -522,7 +522,7 @@ static void reconstruct_fixed_vector(int * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_2_pulses_9bits(int fixed_index, int sign, int subframe, +static void decode_2_pulses_9bits(const int fixed_index, const int sign, int subframe, float *fixed_vector) { int pulse_position[2]; @@ -548,7 +548,7 @@ static void decode_2_pulses_9bits(int fi * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_2_pulses_11bits(int fixed_index, int sign, +static void decode_2_pulses_11bits(const int fixed_index, const int sign, float *fixed_vector) { int pulse_position[2]; @@ -577,7 +577,7 @@ static void decode_2_pulses_11bits(int f * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_3_pulses_14bits(int fixed_index, int sign, +static void decode_3_pulses_14bits(const int fixed_index, const int sign, float *fixed_vector) { int pulse_position[3]; @@ -607,7 +607,7 @@ static void decode_3_pulses_14bits(int f * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_4_pulses_17bits(int fixed_index, int sign, +static void decode_4_pulses_17bits(const int fixed_index, const int sign, float *fixed_vector) { int pulse_position[4]; @@ -636,7 +636,7 @@ static void decode_4_pulses_17bits(int f * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_8_pulses_31bits(int16_t *fixed_index, float *fixed_vector) +static void decode_8_pulses_31bits(const int16_t *fixed_index, float *fixed_vector) { int pulse_position[8]; int i, pos1, pos2, sign, temp; @@ -691,7 +691,7 @@ static void decode_8_pulses_31bits(int16 * @param fixed_vector pointer to the algebraic codebook vector */ -static void decode_10_pulses_35bits(int16_t *fixed_index, float *fixed_vector) +static void decode_10_pulses_35bits(const int16_t *fixed_index, float *fixed_vector) { int i, pos1, pos2, sign;

1 0

[soc]: r4047 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Thu Feb 12 03:53:35 2009 New Revision: 4047 Log: Simplify lsf2lsp_3. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 12 03:46:27 2009 (r4046) +++ amr/amrnbfloatdec.c Thu Feb 12 03:53:35 2009 (r4047) @@ -308,43 +308,17 @@ 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 - int idx, i; - - // assign lsf tables according to mode - if((p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515)) { - lsf_3_1_tmp = lsf_3_1; - lsf_3_3_tmp = lsf_3_3_MODE_515; - }else if(p->cur_frame_mode == MODE_795) { - lsf_3_1_tmp = lsf_3_1_MODE_795; - lsf_3_3_tmp = lsf_3_3; - }else { - lsf_3_1_tmp = lsf_3_1; - lsf_3_3_tmp = lsf_3_3; - } - - // decode split-matrix quantized residual LSF vector + const float *lsf_quantizer; + int i; - idx = p->amr_prms[0]; - lsf_r[0] = lsf_3_1_tmp[ idx ][0]; - lsf_r[1] = lsf_3_1_tmp[ idx ][1]; - lsf_r[2] = lsf_3_1_tmp[ idx ][2]; + lsf_quantizer = (p->cur_frame_mode == MODE_795 ? lsf_3_1_MODE_795 : lsf_3_1)[p->amr_prms[0]]; + memcpy(lsf_r, lsf_quantizer, 3*sizeof(float)); - idx = p->amr_prms[1]; - // MODE_475, MODE_515 only use every other entry as their indexes - // are stored using 1 less bit (8 bits vs 9 bits) - if((p->cur_frame_mode == MODE_475) || (p->cur_frame_mode == MODE_515)) { - idx <<= 1; - } - lsf_r[3] = lsf_3_2[ idx ][0]; - lsf_r[4] = lsf_3_2[ idx ][1]; - lsf_r[5] = lsf_3_2[ idx ][2]; + lsf_quantizer = lsf_3_2[p->amr_prms[1] << (p->cur_frame_mode <= MODE_515)]; + memcpy(lsf_r + 3, lsf_quantizer, 3*sizeof(float)); - idx = p->amr_prms[2]; - lsf_r[6] = lsf_3_3_tmp[ idx ][0]; - lsf_r[7] = lsf_3_3_tmp[ idx ][1]; - lsf_r[8] = lsf_3_3_tmp[ idx ][2]; - lsf_r[9] = lsf_3_3_tmp[ idx ][3]; + lsf_quantizer = (p->cur_frame_mode <= MODE_515 ? lsf_3_3_MODE_515 : lsf_3_3)[p->amr_prms[2]]; + memcpy(lsf_r + 6, lsf_quantizer, 4*sizeof(float)); // calculate mean-removed LSF vector and add mean for(i=0; i<LP_FILTER_ORDER; i++) {

1 0

[soc]: r4046 - amr/amrnbfloatdec.c
by kmalaussene 12 Feb '09

12 Feb '09

Author: kmalaussene Date: Thu Feb 12 03:46:27 2009 New Revision: 4046 Log: Fix r4042 decoding of lsp for mode other than MODE_122: the tables in reference code are flat arrays where lsf_* tables are [][]. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Feb 12 00:19:29 2009 (r4045) +++ amr/amrnbfloatdec.c Thu Feb 12 03:46:27 2009 (r4046) @@ -340,7 +340,7 @@ static void lsf2lsp_3(AMRContext *p) lsf_r[4] = lsf_3_2[ idx ][1]; lsf_r[5] = lsf_3_2[ idx ][2]; - idx = p->amr_prms[2] << 2; + idx = p->amr_prms[2]; lsf_r[6] = lsf_3_3_tmp[ idx ][0]; lsf_r[7] = lsf_3_3_tmp[ idx ][1]; lsf_r[8] = lsf_3_3_tmp[ idx ][2];

1 0

[soc]: r4045 - amr/amrnbfloatdec.c
by kmalaussene 11 Feb '09

11 Feb '09

Author: kmalaussene Date: Thu Feb 12 00:19:29 2009 New Revision: 4045 Log: Factor out LSP interpolation into a generic weighted_vector_sumf function. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Feb 11 10:08:30 2009 (r4044) +++ amr/amrnbfloatdec.c Thu Feb 12 00:19:29 2009 (r4045) @@ -82,6 +82,16 @@ typedef struct AMRContext { } AMRContext; +static void weighted_vector_sumf(float *out, const float *in_a, + const float *in_b, float weight_coeff_a, + float weight_coeff_b, int length) +{ + int i; + + for(i=0; i<length; i++) + out[i] = weight_coeff_a * in_a[i] + + weight_coeff_b * in_b[i]; +} static void reset_state(AMRContext *p) { @@ -282,6 +292,10 @@ static void lsf2lsp_5(AMRContext *p) lsf2lsp_for_mode122(p, p->lsp[1], prev_lsf, lsf_quantizer, 0, p->amr_prms[2] & 1, 0); lsf2lsp_for_mode122(p, p->lsp[3], prev_lsf, lsf_quantizer, 2, p->amr_prms[2] & 1, 1); + + // interpolate LSP vectors at subframes 1 and 3 + weighted_vector_sumf(p->lsp[0], p->prev_lsp_sub4, p->lsp[1], 0.5, 0.5, LP_FILTER_ORDER); + weighted_vector_sumf(p->lsp[2], p->lsp[1] , p->lsp[3], 0.5, 0.5, LP_FILTER_ORDER); } /** @@ -341,40 +355,12 @@ static void lsf2lsp_3(AMRContext *p) // convert LSF vector to LSP vector lsf2lsp(lsf_q, p->lsp[3]); -} -/** - * Interpolate lsp vectors for subframes 1 and 3. - * - * @param p pointer to the AMRContext - */ - -static void interp_lsp_13(AMRContext *p) -{ - int i; - - for(i=0; i<LP_FILTER_ORDER; i++) { - p->lsp[0][i] = 0.5*(p->prev_lsp_sub4[i] + p->lsp[1][i]); - p->lsp[2][i] = 0.5*( p->lsp[1][i] + p->lsp[3][i]); - } + // interpolate LSP vectors at subframes 1, 2 and 3 + for(i=0; i<3; i++) + weighted_vector_sumf(p->lsp[i], p->prev_lsp_sub4, p->lsp[3], 0.25*(3-i), 0.25*(i+1), LP_FILTER_ORDER); } -/** - * Interpolate lsp vectors for subframes 1, 2 and 3. - * - * @param p pointer to the AMRContext - */ - -static void interp_lsp_123(AMRContext *p) -{ - int i; - - for(i=0; i<LP_FILTER_ORDER; i++) { - p->lsp[0][i] = 0.75*p->prev_lsp_sub4[i] + 0.25*p->lsp[3][i]; - p->lsp[1][i] = 0.5*(p->prev_lsp_sub4[i] + p->lsp[3][i]); - p->lsp[2][i] = 0.25*p->prev_lsp_sub4[i] + 0.75*p->lsp[3][i]; - } -} /** * Convert an lsp vector to lpc coefficients. @@ -1007,15 +993,11 @@ static int amrnb_decode_frame(AVCodecCon if(p->cur_frame_mode == MODE_122) { // decode split-matrix quantized lsf vector indexes to lsp vectors lsf2lsp_5(p); - // interpolate LSP vectors at subframes 1 and 3 - interp_lsp_13(p); // advance index into amr_prms index += 5; }else { // decode split-matrix quantized lsf vector indexes to an lsp vector lsf2lsp_3(p); - // interpolate LSP vectors at subframes 1, 2 and 3 - interp_lsp_123(p); // advance index into amr_prms index += 3; } @@ -1026,10 +1008,7 @@ static int amrnb_decode_frame(AVCodecCon } // update averaged lsp vector (used for fixed gain smoothing) - for(i=0; i<LP_FILTER_ORDER; i++) { - // calculate averaged lsp vector - p->lsp_avg[i] = 0.84*p->lsp_avg[i] + 0.16*p->prev_lsp_sub4[i]; - } + weighted_vector_sumf(p->lsp_avg, p->lsp_avg, p->prev_lsp_sub4, 0.84, 0.16, LP_FILTER_ORDER); /*** end of LPC coefficient decoding ***/

1 0