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

[soc]: r4171 - aacenc/aaccoder.c
by kostya 17 Mar '09

17 Mar '09

Author: kostya Date: Tue Mar 17 18:19:21 2009 New Revision: 4171 Log: Use lambda value passed as argument instead of one taken from the context Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Thu Mar 5 17:12:01 2009 (r4170) +++ aacenc/aaccoder.c Tue Mar 17 18:19:21 2009 (r4171) @@ -632,7 +632,7 @@ static void search_for_quantizers_anmr(A int cb; for(cb = 0; cb <= ESC_BT; cb++){ dists[cb] += quantize_band_cost(coefs + w2*128, sce->ics.swb_sizes[g], - q, cb, s->lambda / band->threshold, INFINITY, NULL); + q, cb, lambda / band->threshold, INFINITY, NULL); } } dist = dists[0];

1 0

FFmpeg Release 0.5 is announced and already in ffmpeg/branches/0.5. hurry up for checking in soc/libavfilter!
by Jürgen Meissner 11 Mar '09

11 Mar '09

Currently there's not too much in ffmpeg/libavfilter, soc/livabfilter/checkout.sh does include much usefull stuff. I appreciated very much, if this could be in the FFmpeg 0.5 Release. mfG J.Meissner

3 2

[soc]: r4170 - libavfilter/Makefile
by victor 06 Mar '09

06 Mar '09

Author: victor Date: Thu Mar 5 17:12:01 2009 New Revision: 4170 Log: CONFIG_SWSCALE disappeared in FFmpeg r17786. Modified: libavfilter/Makefile Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile Thu Mar 5 00:00:57 2009 (r4169) +++ libavfilter/Makefile Thu Mar 5 17:12:01 2009 (r4170) @@ -2,7 +2,7 @@ include $(SUBDIR)../config.mak NAME = avfilter FFLIBS = avcodec avutil -FFLIBS-$(CONFIG_SWSCALE) += swscale +FFLIBS-$(CONFIG_SCALE_FILTER) += swscale FFLIBS-$(CONFIG_AVFILTER_LAVF) += avformat OBJS = allfilters.o \

5 5

[soc]: r4169 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Thu Mar 5 00:00:57 2009 New Revision: 4169 Log: Fix broken compilation. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 23:59:24 2009 (r4168) +++ amr/amrnbfloatdec.c Thu Mar 5 00:00:57 2009 (r4169) @@ -694,7 +694,7 @@ static float fixed_gain_prediction(float * @return fixed gain smoothed */ -static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg +static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg, const enum Mode mode) { float diff = 0.0; int i;

1 0

[soc]: r4168 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 23:59:24 2009 New Revision: 4168 Log: The hangover period (diff > 0.65) must be updated for every mode, not just the ones for which the fixed gain is smoothed. See 3GPP TS 26.090 eq 71. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 22:44:08 2009 (r4167) +++ amr/amrnbfloatdec.c Wed Mar 4 23:59:24 2009 (r4168) @@ -694,7 +694,8 @@ static float fixed_gain_prediction(float * @return fixed gain smoothed */ -static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg) { +static float fixed_gain_smooth(AMRContext *p , const float *lsp, const float *lsp_avg + const enum Mode mode) { float diff = 0.0; int i; @@ -704,7 +705,8 @@ static float fixed_gain_smooth(AMRContex } // if diff has been >0.65 for 10 frames (40 subframes) no smoothing is applied - if((p->diff_count = diff > 0.65 ? p->diff_count+1 : 0) < 40) { + if((p->diff_count = diff > 0.65 ? p->diff_count+1 : 0) < 40 && + (mode < MODE_74 || mode == MODE_102)) { // calculate the fixed gain smoothing factor (k_m) const float smoothing_factor = FFMIN(1.0, FFMAX(0.0, 4.0*diff - 1.6)); // calculate the mean fixed gain for the current subframe @@ -971,8 +973,7 @@ static int amrnb_decode_frame(AVCodecCon } // smooth fixed gain - if(p->cur_frame_mode < MODE_74 || p->cur_frame_mode == MODE_102) - p->fixed_gain[4] = fixed_gain_smooth(p, p->lsp[subframe], p->lsp_avg); + p->fixed_gain[4] = fixed_gain_smooth(p, p->lsp[subframe], p->lsp_avg, p->cur_frame_mode); apply_ir_filter(p, p->fixed_vector);

1 0

[soc] [propchange]: r4161 - svn:log
by diego 04 Mar '09

04 Mar '09

Author: diego Revision: 4161 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Use memmove instead of assignements. +Use memmove instead of assignments.

2 1

[soc]: r4161 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 20:52:49 2009 New Revision: 4161 Log: Use memmove instead of assignements. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 20:02:04 2009 (r4160) +++ amr/amrnbfloatdec.c Wed Mar 4 20:52:49 2009 (r4161) @@ -719,9 +719,7 @@ static void decode_gains(AMRContext *p, * fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); // update quantified prediction error energy history - p->prediction_error[0] = p->prediction_error[1]; - p->prediction_error[1] = p->prediction_error[2]; - p->prediction_error[2] = p->prediction_error[3]; + memmove(&p->prediction_error[0], &p->prediction_error[1], 3 * sizeof(p->prediction_error[0])); p->prediction_error[3] = 20.0*log10f(fixed_gain_factor); }

2 1

[soc] [propchange]: r4160 - svn:log
by diego 04 Mar '09

04 Mar '09

Author: diego Revision: 4160 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Merge 2 assignements. +Merge 2 assignments.

1 0

[soc]: r4167 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 22:44:08 2009 New Revision: 4167 Log: Replace division by multiplication in fixed_gain_smooth. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 22:42:26 2009 (r4166) +++ amr/amrnbfloatdec.c Wed Mar 4 22:44:08 2009 (r4167) @@ -706,9 +706,9 @@ static float fixed_gain_smooth(AMRContex // if diff has been >0.65 for 10 frames (40 subframes) no smoothing is applied if((p->diff_count = diff > 0.65 ? p->diff_count+1 : 0) < 40) { // calculate the fixed gain smoothing factor (k_m) - const float smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; + const float smoothing_factor = FFMIN(1.0, FFMAX(0.0, 4.0*diff - 1.6)); // calculate the mean fixed gain for the current subframe - const float fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])/5.0; + const float fixed_gain_mean = (p->fixed_gain[0] + p->fixed_gain[1] + p->fixed_gain[2] + p->fixed_gain[3] + p->fixed_gain[4])*0.2; // calculate the smoothed fixed gain p->fixed_gain[4] = smoothing_factor*p->fixed_gain[4] + (1.0 - smoothing_factor)*fixed_gain_mean; }

1 0

[soc]: r4166 - amr/amrnbfloatdec.c
by kmalaussene 04 Mar '09

04 Mar '09

Author: kmalaussene Date: Wed Mar 4 22:42:26 2009 New Revision: 4166 Log: cosmetics: use ? : instead of if else for more compact code. Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Wed Mar 4 22:38:51 2009 (r4165) +++ amr/amrnbfloatdec.c Wed Mar 4 22:42:26 2009 (r4166) @@ -704,13 +704,7 @@ static float fixed_gain_smooth(AMRContex } // if diff has been >0.65 for 10 frames (40 subframes) no smoothing is applied - if(diff > 0.65) { - p->diff_count++; - }else { - p->diff_count = 0; - } - - if(p->diff_count < 40) { + if((p->diff_count = diff > 0.65 ? p->diff_count+1 : 0) < 40) { // calculate the fixed gain smoothing factor (k_m) const float smoothing_factor = FFMIN(0.25, FFMAX(0.0, diff - 0.4))/0.25; // calculate the mean fixed gain for the current subframe

1 0