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

[soc]: r4824 - in concat/libavformat: concat.c m3u.c pls.c xspf.c
by gkovacs 29 Jul '09

29 Jul '09

Author: gkovacs Date: Wed Jul 29 04:48:38 2009 New Revision: 4824 Log: changed internal function declarations implemented elsewhere to extern Modified: concat/libavformat/concat.c concat/libavformat/m3u.c concat/libavformat/pls.c concat/libavformat/xspf.c Modified: concat/libavformat/concat.c ============================================================================== --- concat/libavformat/concat.c Wed Jul 29 04:44:16 2009 (r4823) +++ concat/libavformat/concat.c Wed Jul 29 04:48:38 2009 (r4824) @@ -32,17 +32,17 @@ #include "playlist.h" -static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); +extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); -static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); +extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); -static int ff_concatgen_read_close(AVFormatContext *s); +extern int ff_concatgen_read_close(AVFormatContext *s); -static int ff_concatgen_read_play(AVFormatContext *s); +extern int ff_concatgen_read_play(AVFormatContext *s); -static int ff_concatgen_read_pause(AVFormatContext *s); +extern int ff_concatgen_read_pause(AVFormatContext *s); // The FFmpeg codecs we support, and the IDs they have in the file static const AVCodecTag codec_concat_tags[] = { Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Wed Jul 29 04:44:16 2009 (r4823) +++ concat/libavformat/m3u.c Wed Jul 29 04:48:38 2009 (r4824) @@ -27,17 +27,17 @@ #include "playlist.h" -static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); +extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); -static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); +extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); -static int ff_concatgen_read_close(AVFormatContext *s); +extern int ff_concatgen_read_close(AVFormatContext *s); -static int ff_concatgen_read_play(AVFormatContext *s); +extern int ff_concatgen_read_play(AVFormatContext *s); -static int ff_concatgen_read_pause(AVFormatContext *s); +extern int ff_concatgen_read_pause(AVFormatContext *s); /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_m3u_tags[] = { Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Wed Jul 29 04:44:16 2009 (r4823) +++ concat/libavformat/pls.c Wed Jul 29 04:48:38 2009 (r4824) @@ -27,17 +27,17 @@ #include "playlist.h" -static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); +extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); -static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); +extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); -static int ff_concatgen_read_close(AVFormatContext *s); +extern int ff_concatgen_read_close(AVFormatContext *s); -static int ff_concatgen_read_play(AVFormatContext *s); +extern int ff_concatgen_read_play(AVFormatContext *s); -static int ff_concatgen_read_pause(AVFormatContext *s); +extern int ff_concatgen_read_pause(AVFormatContext *s); /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_pls_tags[] = { Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Wed Jul 29 04:44:16 2009 (r4823) +++ concat/libavformat/xspf.c Wed Jul 29 04:48:38 2009 (r4824) @@ -30,17 +30,17 @@ #include "playlist.h" -static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); +extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); -static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); +extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); -static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); +extern int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); -static int ff_concatgen_read_close(AVFormatContext *s); +extern int ff_concatgen_read_close(AVFormatContext *s); -static int ff_concatgen_read_play(AVFormatContext *s); +extern int ff_concatgen_read_play(AVFormatContext *s); -static int ff_concatgen_read_pause(AVFormatContext *s); +extern int ff_concatgen_read_pause(AVFormatContext *s); /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_xspf_tags[] = {

1 0

[soc]: r4823 - concat/libavformat/xspf.c
by gkovacs 29 Jul '09

29 Jul '09

Author: gkovacs Date: Wed Jul 29 04:44:16 2009 New Revision: 4823 Log: fixed wrong array initialized size Modified: concat/libavformat/xspf.c Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Wed Jul 29 01:24:30 2009 (r4822) +++ concat/libavformat/xspf.c Wed Jul 29 04:44:16 2009 (r4823) @@ -68,7 +68,7 @@ static int xspf_list_files(ByteIOContext char state; char **flist; char buf[1024]; - char s[5]; + char s[10]; char t[] = "<location>"; state = flist = buflen = i = j = 0; while ((c = url_fgetc(b))) {

1 0

[soc]: r4821 - in amr: amrnbfloatdata.h amrnbfloatdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Tue Jul 28 18:17:23 2009 New Revision: 4821 Log: Don't include headers already included by libavutil/common.h Modified: amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Tue Jul 28 18:14:29 2009 (r4820) +++ amr/amrnbfloatdata.h Tue Jul 28 18:17:23 2009 (r4821) @@ -30,7 +30,6 @@ #include <stdint.h> #include <stddef.h> -#include <math.h> #include "libavutil/common.h" Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 18:14:29 2009 (r4820) +++ amr/amrnbfloatdec.c Tue Jul 28 18:17:23 2009 (r4821) @@ -26,15 +26,11 @@ */ -#include <math.h> #include <stddef.h> -#include <stdio.h> -#include <stdlib.h> #include "avcodec.h" #include "get_bits.h" #include "libavutil/common.h" -#include "internal.h" #include "celp_math.h" #include "celp_filters.h" #include "acelp_filters.h"

3 3

[soc]: r4820 - amr/amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 18:14:29 2009 New Revision: 4820 Log: Remove unnecessary check that the result of get_bits(&p->gb, 4) is positive Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 18:11:00 2009 (r4819) +++ amr/amrnbfloatdec.c Tue Jul 28 18:14:29 2009 (r4820) @@ -143,7 +143,7 @@ enum Mode decode_bitstream(AMRContext *p p->bad_frame_indicator = !get_bits1(&p->gb); skip_bits(&p->gb, 2); - if (MODE_475 <= mode && mode <= MODE_DTX) { + if (mode <= MODE_DTX) { uint16_t *data = (uint16_t *)&p->frame; const AMROrder *order = amr_unpacking_bitmaps_per_mode[mode]; int i;

1 0

[soc]: r4819 - amr/TODO
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 18:11:00 2009 New Revision: 4819 Log: There are currently no FIXMEs Modified: amr/TODO Modified: amr/TODO ============================================================================== --- amr/TODO Tue Jul 28 18:08:57 2009 (r4818) +++ amr/TODO Tue Jul 28 18:11:00 2009 (r4819) @@ -1,6 +1,5 @@ TODO (for narrow band decoder) ==== -- check for FIXMEs and fix them - add handling of MODE_DTX - when all this is complete, request a review from Michael

1 0

[soc]: r4818 - in amr: amr-ffmpeg.diff amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 18:08:57 2009 New Revision: 4818 Log: Put ff_apply_gain_ctrl in acelp_vectors.h with sensible behavior on 0 Modified: amr/amr-ffmpeg.diff amr/amrnbfloatdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Tue Jul 28 17:59:26 2009 (r4817) +++ amr/amr-ffmpeg.diff Tue Jul 28 18:08:57 2009 (r4818) @@ -199,3 +199,57 @@ Index: libavcodec/acelp_filters.h +void ff_acelp_high_pass_filterf(float *samples, float mem[2], int length); + #endif /* AVCODEC_ACELP_FILTERS_H */ +Index: libavcodec/acelp_vectors.c +=================================================================== +--- libavcodec/acelp_vectors.c (revision 19401) ++++ libavcodec/acelp_vectors.c (working copy) +@@ -22,6 +22,7 @@ + + #include <inttypes.h> + #include "avcodec.h" ++#include "celp_math.h" + #include "acelp_vectors.h" + + const uint8_t ff_fc_2pulses_9bits_track1[16] = +@@ -155,3 +156,14 @@ + out[i] = weight_coeff_a * in_a[i] + + weight_coeff_b * in_b[i]; + } ++ ++void ff_apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in, ++ const int length) ++{ ++ int i; ++ float scalefactor = ff_dot_productf(v_in, v_in, length); ++ if (scalefactor) ++ scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, length) / scalefactor); ++ for (i = 0; i < length; i++) ++ v_out[i] = scalefactor * v_in[i]; ++} +Index: libavcodec/acelp_vectors.h +=================================================================== +--- libavcodec/acelp_vectors.h (revision 19401) ++++ libavcodec/acelp_vectors.h (working copy) +@@ -164,4 +164,22 @@ + void ff_weighted_vector_sumf(float *out, const float *in_a, const float *in_b, + float weight_coeff_a, float weight_coeff_b, int length); + ++/** ++ * Apply adaptive gain control by gain scaling. ++ * ++ * @param v_out output vector ++ * @param v_in gain-controlled vector ++ * @param v_ref vector to control gain of ++ * @param length vectors length ++ * ++ * @note If v_in is zero (or its energy underflows), the output is zero. ++ * This is the behavior of the AMR reference decoder. The QCELP ++ * reference decoder seems to have undefined behavior. ++ * ++ * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6 ++ * 3GPP TS 26.090 6.1 (6) ++ */ ++void ff_apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in, ++ const int length); ++ + #endif /* AVCODEC_ACELP_VECTORS_H */ Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 17:59:26 2009 (r4817) +++ amr/amrnbfloatdec.c Tue Jul 28 18:08:57 2009 (r4818) @@ -89,36 +89,6 @@ typedef struct AMRContext { } AMRContext; -/** - * @note this function should be moved to acelp_vectors.[ch] - * and used in qcelpdec.c - * - * Apply adaptive gain control by gain scaling. - * - * @param v_out output vector - * @param v_in gain-controlled vector - * @param v_ref vector to control gain of - * @param length vectors length - * - * FIXME: If v_ref is a zero vector, it energy is zero - * and the behavior of the gain control is - * undefined in the specs. - * - * TIA/EIA/IS-733 2.4.8.3-2/3/4/5, 2.4.8.6 - */ -void ff_apply_gain_ctrl(float *v_out, const float *v_ref, const float *v_in, - const int length) -{ - int i; - float scalefactor = ff_dot_productf(v_in, v_in, length); - if (scalefactor) - scalefactor = sqrt(ff_dot_productf(v_ref, v_ref, length) / scalefactor); - else - av_log_missing_feature(NULL, "Zero energy for gain control", 1); - for (i = 0; i < length; i++) - v_out[i] = scalefactor * v_in[i]; -} - static void reset_state(AMRContext *p) { int i;

1 0

[soc]: r4817 - in amr: amr-ffmpeg.diff amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 17:59:26 2009 New Revision: 4817 Log: ff_weighted_vector_sumf has been moved to acelp_vectors.c Modified: amr/amr-ffmpeg.diff amr/amrnbfloatdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Tue Jul 28 17:52:32 2009 (r4816) +++ amr/amr-ffmpeg.diff Tue Jul 28 17:59:26 2009 (r4817) @@ -6,7 +6,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o -+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o ++OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o acelp_vectors.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 17:52:32 2009 (r4816) +++ amr/amrnbfloatdec.c Tue Jul 28 17:59:26 2009 (r4817) @@ -38,6 +38,7 @@ #include "celp_math.h" #include "celp_filters.h" #include "acelp_filters.h" +#include "acelp_vectors.h" #include "amrnbfloatdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc); @@ -92,31 +93,6 @@ typedef struct AMRContext { * @note this function should be moved to acelp_vectors.[ch] * and used in qcelpdec.c * - * weighted sum of two vectors with rounding. - * @param out [out] result of addition - * @param in_a first vector - * @param in_b second vector - * @param weight_coeff_a first vector weight coefficient - * @param weight_coeff_b second vector weight coefficient - * @param length vectors length - * - * @note It is safe to pass the same buffer for out and in_a or in_b. - */ -void ff_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]; -} - -/** - * @note this function should be moved to acelp_vectors.[ch] - * and used in qcelpdec.c - * * Apply adaptive gain control by gain scaling. * * @param v_out output vector

1 0

[soc]: r4816 - in amr: amr-ffmpeg.diff amrnbfloatdata.h amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 17:52:32 2009 New Revision: 4816 Log: Add a floating-point high-pass filter to acelp_filters and use it Modified: amr/amr-ffmpeg.diff amr/amrnbfloatdata.h amr/amrnbfloatdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Tue Jul 28 17:43:39 2009 (r4815) +++ amr/amr-ffmpeg.diff Tue Jul 28 17:52:32 2009 (r4816) @@ -6,7 +6,7 @@ Index: libavcodec/Makefile OBJS-$(CONFIG_AC3_ENCODER) += ac3enc.o ac3tab.o ac3.o OBJS-$(CONFIG_ALAC_DECODER) += alac.o OBJS-$(CONFIG_ALAC_ENCODER) += alacenc.o lpc.o -+OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o ++OBJS-$(CONFIG_AMRNB_DECODER) += amrnbfloatdec.o qcelp_lsp.o celp_filters.o celp_math.o acelp_filters.o OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_APE_DECODER) += apedec.o OBJS-$(CONFIG_ASV1_DECODER) += asv1.o mpeg12data.o @@ -160,3 +160,42 @@ Index: libavcodec/celp_filters.h * Routine applies A(z) filter to given speech data. */ void ff_celp_lp_zero_synthesis_filterf( +Index: libavcodec/acelp_filters.c +=================================================================== +--- libavcodec/acelp_filters.c (revision 19401) ++++ libavcodec/acelp_filters.c (working copy) +@@ -93,3 +93,17 @@ + hpf_f[0] = tmp; + } + } ++ ++void ff_acelp_high_pass_filterf(float *buf, float *mem, int length) ++{ ++ int i; ++ float tmp; ++ ++ for (i = 0; i < length; i++) { ++ tmp = buf[i] + 1.933105469 * mem[0] - 0.935913085 * mem[1]; ++ buf[i] = 0.939819335 * (tmp - 2 * mem[0] + mem[1]); ++ ++ mem[1] = mem[0]; ++ mem[0] = tmp; ++ } ++} +Index: libavcodec/acelp_filters.h +=================================================================== +--- libavcodec/acelp_filters.h (revision 19401) ++++ libavcodec/acelp_filters.h (working copy) +@@ -81,4 +81,12 @@ + void ff_acelp_high_pass_filter(int16_t* out, int hpf_f[2], + const int16_t* in, int length); + ++/** ++ * high-pass filtering (6.2.2 of 3GPP TS 26.090) ++ * @param samples [in/out]· ++ * @param mem intermediate values used by filter (should be 0 initially) ++ * @param length input data size ++ */ ++void ff_acelp_high_pass_filterf(float *samples, float mem[2], int length); ++ + #endif /* AVCODEC_ACELP_FILTERS_H */ Modified: amr/amrnbfloatdata.h ============================================================================== --- amr/amrnbfloatdata.h Tue Jul 28 17:43:39 2009 (r4815) +++ amr/amrnbfloatdata.h Tue Jul 28 17:52:32 2009 (r4816) @@ -2360,10 +2360,6 @@ static const float *formant_low_d = form // Adaptive gain control factor used in post-filter #define AMR_AGC_ALPHA 0.9 -// High-pass filter coefficients (section 6.2.2) -static const float high_pass_n[] = {0.939819335, -1.879638672, 0.939819335}; -static const float high_pass_d[] = { -1.933105469, 0.935913085}; - /**************************** end of tables *****************************/ #endif /* AVCODEC_AMRNBFLOATDATA_H */ Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 17:43:39 2009 (r4815) +++ amr/amrnbfloatdec.c Tue Jul 28 17:52:32 2009 (r4816) @@ -37,6 +37,7 @@ #include "internal.h" #include "celp_math.h" #include "celp_filters.h" +#include "acelp_filters.h" #include "amrnbfloatdata.h" void ff_celp_lspf2lpc(const double *lspf, float *lpc); @@ -1129,24 +1130,6 @@ static void postfilter(AMRContext *p, fl } } -/** - * High-pass filtering and up-scaling - * - * @param high_pass_mem Pointer to two floats for the filter state - * @param samples AMR_SUBFRAME_SIZE buffer where the filter is applied - */ -static void high_pass_filter(float *high_pass_mem, float *samples) -{ - float tmp[AMR_BLOCK_SIZE + 2]; - - memcpy(tmp, high_pass_mem, sizeof(float) * 2); - ff_celp_lp_synthesis_filterf(tmp + 2, high_pass_d, samples, - AMR_BLOCK_SIZE, 2); - memcpy(high_pass_mem, tmp + AMR_BLOCK_SIZE, sizeof(float) * 2); - ff_celp_lp_zero_synthesis_filterf(samples, high_pass_n, tmp + 2, - AMR_BLOCK_SIZE, 3); -} - /// @} static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, @@ -1248,7 +1231,7 @@ static int amrnb_decode_frame(AVCodecCon update_state(p); } - high_pass_filter(p->high_pass_mem, buf_out); + ff_acelp_high_pass_filterf(buf_out, p->high_pass_mem, 160); for (i = 0; i < AMR_BLOCK_SIZE; i++) // Post-processing up-scales by 2. It's convenient to

1 0

[soc]: r4815 - amr/amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 17:43:39 2009 New Revision: 4815 Log: Seperate high-pass filter from upscaling Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 17:41:58 2009 (r4814) +++ amr/amrnbfloatdec.c Tue Jul 28 17:43:39 2009 (r4815) @@ -1137,7 +1137,6 @@ static void postfilter(AMRContext *p, fl */ static void high_pass_filter(float *high_pass_mem, float *samples) { - int i; float tmp[AMR_BLOCK_SIZE + 2]; memcpy(tmp, high_pass_mem, sizeof(float) * 2); @@ -1146,11 +1145,6 @@ static void high_pass_filter(float *high memcpy(high_pass_mem, tmp + AMR_BLOCK_SIZE, sizeof(float) * 2); ff_celp_lp_zero_synthesis_filterf(samples, high_pass_n, tmp + 2, AMR_BLOCK_SIZE, 3); - - for (i = 0; i < AMR_BLOCK_SIZE; i++) - // Post-processing up-scales by 2. It's convenient to - // scale from PCM values to [-1,1] here too. - samples[i] *= 2.0 * AMR_SAMPLE_SCALE; } /// @} @@ -1256,6 +1250,11 @@ static int amrnb_decode_frame(AVCodecCon high_pass_filter(p->high_pass_mem, buf_out); + for (i = 0; i < AMR_BLOCK_SIZE; i++) + // Post-processing up-scales by 2. It's convenient to + // scale from PCM values to [-1,1] here too. + buf_out[i] *= 2.0 * AMR_SAMPLE_SCALE; + /* Update averaged lsf vector (used for fixed gain smoothing). * * Note that lsf_avg should not incorporate the current frame's LSFs

1 0

[soc]: r4814 - amr/amrnbfloatdec.c
by cmcq 28 Jul '09

28 Jul '09

Author: cmcq Date: Tue Jul 28 17:41:58 2009 New Revision: 4814 Log: The high-pass filter can work on a frame at once Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Tue Jul 28 17:33:24 2009 (r4813) +++ amr/amrnbfloatdec.c Tue Jul 28 17:41:58 2009 (r4814) @@ -1138,16 +1138,16 @@ static void postfilter(AMRContext *p, fl static void high_pass_filter(float *high_pass_mem, float *samples) { int i; - float tmp[AMR_SUBFRAME_SIZE + 2]; + float tmp[AMR_BLOCK_SIZE + 2]; memcpy(tmp, high_pass_mem, sizeof(float) * 2); ff_celp_lp_synthesis_filterf(tmp + 2, high_pass_d, samples, - AMR_SUBFRAME_SIZE, 2); - memcpy(high_pass_mem, tmp + AMR_SUBFRAME_SIZE, sizeof(float) * 2); + AMR_BLOCK_SIZE, 2); + memcpy(high_pass_mem, tmp + AMR_BLOCK_SIZE, sizeof(float) * 2); ff_celp_lp_zero_synthesis_filterf(samples, high_pass_n, tmp + 2, - AMR_SUBFRAME_SIZE, 3); + AMR_BLOCK_SIZE, 3); - for (i = 0; i < AMR_SUBFRAME_SIZE; i++) + for (i = 0; i < AMR_BLOCK_SIZE; i++) // Post-processing up-scales by 2. It's convenient to // scale from PCM values to [-1,1] here too. samples[i] *= 2.0 * AMR_SAMPLE_SCALE; @@ -1248,13 +1248,14 @@ static int amrnb_decode_frame(AVCodecCon /*** end of synthesis ***/ postfilter(p, p->lpc[subframe], buf_out + subframe * AMR_SUBFRAME_SIZE); - high_pass_filter(p->high_pass_mem, buf_out + subframe * AMR_SUBFRAME_SIZE); // update buffers and history memcpy(p->excitation, exc_feedback, AMR_SUBFRAME_SIZE * sizeof(float)); update_state(p); } + high_pass_filter(p->high_pass_mem, buf_out); + /* Update averaged lsf vector (used for fixed gain smoothing). * * Note that lsf_avg should not incorporate the current frame's LSFs

1 0