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

[soc]: r4841 - in als: als_data.h alsdec.c
by thilo.borgmann 30 Jul '09

30 Jul '09

Author: thilo.borgmann Date: Thu Jul 30 01:07:08 2009 New Revision: 4841 Log: Removed unnecessary parantheses. Added an #endif comment. Changed to include stdint.h instead of inttypes.h. Fixed broken comment. Modified: als/als_data.h als/alsdec.c Modified: als/als_data.h ============================================================================== --- als/als_data.h Thu Jul 30 00:22:36 2009 (r4840) +++ als/als_data.h Thu Jul 30 01:07:08 2009 (r4841) @@ -30,11 +30,11 @@ #define AVCODEC_ALS_DATA_H -#include <inttypes.h> +#include <stdint.h> /** Rice parameters and corresponding index offsets for decoding the * indices of scaled PARCOR values. The table choosen is set globally - * by the encoder and. + * by the encoder and stored in ALSSpecificConfig. */ int8_t parcor_rice_table[3][20][2] = { { @@ -144,4 +144,4 @@ int32_t parcor_scaled_values[] = {-10485 935456, 967456, 999712, 1032224}; -#endif +#endif AVCODEC_ALS_DATA_H Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Thu Jul 30 00:22:36 2009 (r4840) +++ als/alsdec.c Thu Jul 30 01:07:08 2009 (r4841) @@ -350,9 +350,8 @@ static void all_parcor_to_lpc(unsigned i { int k; - for (k = 0; k < num; k++) { + for (k = 0; k < num; k++) parcor_to_lpc(k, par, cof); - } } @@ -560,9 +559,8 @@ static int read_block_data(ALSDecContext for (smp = 0; smp < progressive; smp++) { y = 1 << 19; - for (sb = 0; sb < smp; sb++) { + for (sb = 0; sb < smp; sb++) y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; - } raw_samples[smp] = res[smp] - (y >> 20); parcor_to_lpc(smp, quant_cof, lpc_cof); @@ -571,9 +569,8 @@ static int read_block_data(ALSDecContext for (; smp < block_length; smp++) { y = 1 << 19; - for (sb = 0; sb < progressive; sb++) { + for (sb = 0; sb < progressive; sb++) y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; - } raw_samples[smp] = res[smp] - (y >> 20); }

3 2

[soc]: r4842 - als/als_data.h
by thilo.borgmann 30 Jul '09

30 Jul '09

Author: thilo.borgmann Date: Thu Jul 30 12:20:39 2009 New Revision: 4842 Log: Commented the #endif trailer. Modified: als/als_data.h Modified: als/als_data.h ============================================================================== --- als/als_data.h Thu Jul 30 01:07:08 2009 (r4841) +++ als/als_data.h Thu Jul 30 12:20:39 2009 (r4842) @@ -144,4 +144,4 @@ int32_t parcor_scaled_values[] = {-10485 935456, 967456, 999712, 1032224}; -#endif AVCODEC_ALS_DATA_H +#endif /* AVCODEC_ALS_DATA_H */

1 0

[soc]: r4840 - in als: als_data.h alsdec.c
by thilo.borgmann 29 Jul '09

29 Jul '09

Author: thilo.borgmann Date: Thu Jul 30 00:22:36 2009 New Revision: 4840 Log: Added functionality for short-term prediction. Added: als/als_data.h Modified: als/alsdec.c Added: als/als_data.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ als/als_data.h Thu Jul 30 00:22:36 2009 (r4840) @@ -0,0 +1,147 @@ +/* + * ALS header file for common data + * Copyright (c) 2009 Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file libavcodec/als_data.h + * MPEG-4 ALS header file for common data + * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com> + */ + + +#ifndef AVCODEC_ALS_DATA_H +#define AVCODEC_ALS_DATA_H + + +#include <inttypes.h> + +/** Rice parameters and corresponding index offsets for decoding the + * indices of scaled PARCOR values. The table choosen is set globally + * by the encoder and. + */ +int8_t parcor_rice_table[3][20][2] = { + { + {-52, 4}, + {-29, 5}, + {-31, 4}, + { 19, 4}, + {-16, 4}, + { 12, 3}, + { -7, 3}, + { 9, 3}, + { -5, 3}, + { 6, 3}, + { -4, 3}, + { 3, 3}, + { -3, 2}, + { 3, 2}, + { -2, 2}, + { 3, 2}, + { -1, 2}, + { 2, 2}, + { -1, 2}, + { 2, 2} + }, + { + {-58, 3}, + {-42, 4}, + {-46, 4}, + { 37, 5}, + {-36, 4}, + { 29, 4}, + {-29, 4}, + { 25, 4}, + {-23, 4}, + { 20, 4}, + {-17, 4}, + { 16, 4}, + {-12, 4}, + { 12, 3}, + {-10, 4}, + { 7, 3}, + { -4, 4}, + { 3, 3}, + { -1, 3}, + { 1, 3} + }, + { + {-59, 3}, + {-45, 5}, + {-50, 4}, + { 38, 4}, + {-39, 4}, + { 32, 4}, + {-30, 4}, + { 25, 3}, + {-23, 3}, + { 20, 3}, + {-20, 3}, + { 16, 3}, + {-13, 3}, + { 10, 3}, + { -7, 3}, + { 3, 3}, + { 0, 3}, + { -1, 3}, + { 2, 3}, + { -1, 2} + } + }; + + +/** Scaled PARCOR values used for the first two PARCOR coefficients. + * To be indexed by the Rice coded indices. + * Generated by: parcor_scaled_values[i] = 32 + ((i * (i+1)) << 7) - (1 << 20) + */ +int32_t parcor_scaled_values[] = {-1048544, -1048288, -1047776, -1047008, + -1045984, -1044704, -1043168, -1041376, + -1039328, -1037024, -1034464, -1031648, + -1028576, -1025248, -1021664, -1017824, + -1013728, -1009376, -1004768, -999904, + -994784, -989408, -983776, -977888, + -971744, -965344, -958688, -951776, + -944608, -937184, -929504, -921568, + -913376, -904928, -896224, -887264, + -878048, -868576, -858848, -848864, + -838624, -828128, -817376, -806368, + -795104, -783584, -771808, -759776, + -747488, -734944, -722144, -709088, + -695776, -682208, -668384, -654304, + -639968, -625376, -610528, -595424, + -580064, -564448, -548576, -532448, + -516064, -499424, -482528, -465376, + -447968, -430304, -412384, -394208, + -375776, -357088, -338144, -318944, + -299488, -279776, -259808, -239584, + -219104, -198368, -177376, -156128, + -134624, -112864, -90848, -68576, + -46048, -23264, -224, 23072, + 46624, 70432, 94496, 118816, + 143392, 168224, 193312, 218656, + 244256, 270112, 296224, 322592, + 349216, 376096, 403232, 430624, + 458272, 486176, 514336, 542752, + 571424, 600352, 629536, 658976, + 688672, 718624, 748832, 779296, + 810016, 840992, 872224, 903712, + 935456, 967456, 999712, 1032224}; + + +#endif Modified: als/alsdec.c ============================================================================== --- als/alsdec.c Wed Jul 29 19:52:24 2009 (r4839) +++ als/alsdec.c Thu Jul 30 00:22:36 2009 (r4840) @@ -33,6 +33,7 @@ #include "get_bits.h" #include "unary.h" +#include "als_data.h" typedef struct { uint32_t als_id; ///< ALS identifier @@ -77,6 +78,7 @@ typedef struct { unsigned int frame_id; ///< The frame id / number of the current frame. unsigned int js_switch; ///< If true, joint-stereo decoding is enforced. unsigned int num_blocks; ///< Number of blocks used in the current frame. + int64_t *residuals; ///< Decoded residuals of the current block. int64_t **raw_samples; ///< Decoded raw samples for each channel. } ALSDecContext; @@ -324,6 +326,36 @@ static int64_t decode_rice(GetBitContext } +/** Converts PARCOR coefficient k to direct filter coefficient. + */ +static void parcor_to_lpc(unsigned int k, int64_t *par, int64_t *cof) +{ + int i; + int64_t tmp1, tmp2; + + for (i = 0; i < ((k+1) >> 1); i++) { + tmp1 = cof[ i ] + ((par[k] * cof[k - i - 1] + (1 << 19)) >> 20); + tmp2 = cof[k - i - 1] + ((par[k] * cof[ i ] + (1 << 19)) >> 20); + cof[k - i - 1] = tmp2; + cof[ i ] = tmp1; + } + + cof[k] = par[k]; +} + + +/** Converts all PARCOR coefficients to direct filter coefficients. + */ +static void all_parcor_to_lpc(unsigned int num, int64_t *par, int64_t *cof) +{ + int k; + + for (k = 0; k < num; k++) { + parcor_to_lpc(k, par, cof); + } +} + + /** Reads the block data. */ static int read_block_data(ALSDecContext *ctx, unsigned int ra_block, @@ -369,8 +401,10 @@ static int read_block_data(ALSDecContext unsigned int s[8]; unsigned int sub_blocks, sb_length, shift_lsbs; unsigned int opt_order = 1; + int64_t quant_cof[sconf->max_order]; + int64_t lpc_cof[sconf->max_order]; unsigned int start = 0; - int64_t res[block_length]; + int64_t *res = ctx->residuals; unsigned int sb, smp; @@ -407,6 +441,8 @@ static int read_block_data(ALSDecContext if (!sconf->RLSLMS) { + int64_t quant_index; + if (sconf->adapt_order) { int opt_order_length = FFMIN( @@ -418,8 +454,62 @@ static int read_block_data(ALSDecContext opt_order = sconf->max_order; } - for (k = 0; k < opt_order; k++) { - // TODO: prediction + if (opt_order) { + if (sconf->coef_table == 3) { + // read coefficient 0 + quant_index = get_bits(gb, 7) - 64; + quant_cof[0] = parcor_scaled_values[quant_index + 64]; + + // read coefficient 1 + quant_index = get_bits(gb, 7) - 64; + quant_cof[1] = -parcor_scaled_values[quant_index + 64]; + + // read coefficients 2 - opt_order + for (k = 2; k < opt_order; k++) { + quant_index = get_bits(gb, 7) - 64; + quant_cof[k] = (quant_index << 14) + (1 << 13); + } + } else { + int offset, rice_param, k_max; + + // read coefficient 0 + offset = parcor_rice_table[sconf->coef_table][0][0]; + rice_param = parcor_rice_table[sconf->coef_table][0][1]; + quant_index = decode_rice(gb, rice_param) + offset; + quant_cof[0] = parcor_scaled_values[quant_index + 64]; + + // read coefficient 1 + offset = parcor_rice_table[sconf->coef_table][1][0]; + rice_param = parcor_rice_table[sconf->coef_table][1][1]; + quant_index = decode_rice(gb, rice_param) + offset; + quant_cof[1] = -parcor_scaled_values[quant_index + 64]; + + // read coefficients 2 - 20 + k_max = FFMIN(20, opt_order); + for (k = 2; k < k_max; k++) { + offset = parcor_rice_table[sconf->coef_table][k][0]; + rice_param = parcor_rice_table[sconf->coef_table][k][1]; + quant_index = decode_rice(gb, rice_param) + offset; + quant_cof[k] = (quant_index << 14) + (1 << 13); + } + + // read coefficients 20 - 128 + k_max = FFMIN(127, opt_order); + for (k = 20; k < k_max; k++) { + offset = k & 1; + rice_param = 2; + quant_index = decode_rice(gb, rice_param) + offset; + quant_cof[k] = (quant_index << 14) + (1 << 13); + } + + // read coefficients 128 - opt_order + for (k = 127; k < opt_order; k++) { + offset = 0; + rice_param = 1; + quant_index = decode_rice(gb, rice_param) + offset; + quant_cof[k] = (quant_index << 14) + (1 << 13); + } + } } } @@ -442,10 +532,12 @@ static int read_block_data(ALSDecContext start = FFMIN(opt_order, 3); } else { - // TODO: Non random access blocks + // TODO: check if this has to be a function after features are implemented. + all_parcor_to_lpc(opt_order, quant_cof, lpc_cof); } // read all residuals + // TODO: decode directly into ctx->raw_samples[] instead of storing the residuals if (sconf->bgmc_mode) { // TODO: BGMC mode } else { @@ -463,17 +555,27 @@ static int read_block_data(ALSDecContext // reconstruct all samples from residuals if (ra_block) { unsigned int progressive = FFMIN(block_length, opt_order); + int64_t y = 0; for (smp = 0; smp < progressive; smp++) { - // TODO: prediction + y = 1 << 19; + + for (sb = 0; sb < smp; sb++) { + y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; + } + + raw_samples[smp] = res[smp] - (y >> 20); + parcor_to_lpc(smp, quant_cof, lpc_cof); } for (; smp < block_length; smp++) { + y = 1 << 19; + for (sb = 0; sb < progressive; sb++) { - // TODO: prediction + y += lpc_cof[sb] * raw_samples[smp - (sb + 1)]; } - raw_samples[smp] = res[smp]; + raw_samples[smp] = res[smp] - (y >> 20); } } else { // TODO: non random access blocks @@ -651,6 +753,7 @@ static av_cold int decode_end(AVCodecCon unsigned int c; av_freep(&ctx->sconf.chan_pos); + av_freep(&ctx->residuals); if (ctx->raw_samples) for (c = 0; c < sconf->channels; c++) @@ -696,12 +799,21 @@ static av_cold int decode_init(AVCodecCo avctx->frame_size = ctx->sconf.frame_length; + // allocate residual buffer + if (!(ctx->residuals = av_malloc(sizeof(int64_t) * ctx->sconf.frame_length))) { + av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + decode_end(avctx); + return AVERROR_NOMEM; + } + + // allocate raw sample array buffer if (!(ctx->raw_samples = av_malloc(sizeof(int64_t*) * avctx->channels))) { av_log(avctx, AV_LOG_ERROR, "Allocating buffer array failed.\n"); decode_end(avctx); return AVERROR_NOMEM; } + // allocate raw sample buffers for (c = 0; c < avctx->channels; c++) { if(!(ctx->raw_samples[c] = av_malloc(sizeof(int64_t) * ctx->sconf.frame_length))) {

3 2

[soc] [propchange]: r4840 - svn:log
by thilo.borgmann 29 Jul '09

29 Jul '09

Author: thilo.borgmann Revision: 4840 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,2 @@ -Added functionality for short-term prediction. \ No newline at end of file +Added functionality for short-term prediction. +Introduced als_data.h which contents common data tables.

1 0

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

29 Jul '09

Author: gkovacs Date: Wed Jul 29 19:47:08 2009 New Revision: 4838 Log: moved ff_concatgen declarations into concatgen.h Added: concat/libavformat/concatgen.h 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 16:41:37 2009 (r4837) +++ concat/libavformat/concat.c Wed Jul 29 19:47:08 2009 (r4838) @@ -30,19 +30,7 @@ * the PlaylistContext in the AVFormatContext. */ -#include "playlist.h" - -extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); - -extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); - -extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); - -extern int ff_concatgen_read_close(AVFormatContext *s); - -extern int ff_concatgen_read_play(AVFormatContext *s); - -extern int ff_concatgen_read_pause(AVFormatContext *s); +#include "concatgen.h" // The FFmpeg codecs we support, and the IDs they have in the file static const AVCodecTag codec_concat_tags[] = { Added: concat/libavformat/concatgen.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ concat/libavformat/concatgen.h Wed Jul 29 19:47:08 2009 (r4838) @@ -0,0 +1,40 @@ +/* + * Generic functions used by playlist/concatenation demuxers + * Copyright (c) 2009 Geza Kovacs + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVFORMAT_CONCATGEN_H +#define AVFORMAT_CONCATGEN_H + +#include "playlist.h" + +int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); + +int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); + +int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); + +int ff_concatgen_read_close(AVFormatContext *s); + +int ff_concatgen_read_play(AVFormatContext *s); + +int ff_concatgen_read_pause(AVFormatContext *s); + +#endif /* AVFORMAT_CONCATGEN_H */ + Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Wed Jul 29 16:41:37 2009 (r4837) +++ concat/libavformat/m3u.c Wed Jul 29 19:47:08 2009 (r4838) @@ -25,19 +25,7 @@ * @brief M3U playlist demuxer */ -#include "playlist.h" - -extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); - -extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); - -extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); - -extern int ff_concatgen_read_close(AVFormatContext *s); - -extern int ff_concatgen_read_play(AVFormatContext *s); - -extern int ff_concatgen_read_pause(AVFormatContext *s); +#include "concatgen.h" /* 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 16:41:37 2009 (r4837) +++ concat/libavformat/pls.c Wed Jul 29 19:47:08 2009 (r4838) @@ -25,19 +25,7 @@ * @brief PLS playlist demuxer */ -#include "playlist.h" - -extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); - -extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); - -extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); - -extern int ff_concatgen_read_close(AVFormatContext *s); - -extern int ff_concatgen_read_play(AVFormatContext *s); - -extern int ff_concatgen_read_pause(AVFormatContext *s); +#include "concatgen.h" /* 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 16:41:37 2009 (r4837) +++ concat/libavformat/xspf.c Wed Jul 29 19:47:08 2009 (r4838) @@ -25,22 +25,7 @@ * @brief XSPF playlist demuxer */ -#include "avformat.h" - - -#include "playlist.h" - -extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt); - -extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags); - -extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit); - -extern int ff_concatgen_read_close(AVFormatContext *s); - -extern int ff_concatgen_read_play(AVFormatContext *s); - -extern int ff_concatgen_read_pause(AVFormatContext *s); +#include "concatgen.h" /* The ffmpeg codecs we support, and the IDs they have in the file */ static const AVCodecTag codec_xspf_tags[] = {

3 3

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

29 Jul '09

Author: gkovacs Date: Wed Jul 29 19:52:24 2009 New Revision: 4839 Log: included concatgen.h in concatgen.c and fixed return type Modified: concat/libavformat/concatgen.c Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Wed Jul 29 19:47:08 2009 (r4838) +++ concat/libavformat/concatgen.c Wed Jul 29 19:52:24 2009 (r4839) @@ -29,7 +29,7 @@ * process. */ -#include "playlist.h" +#include "concatgen.h" int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -90,10 +90,10 @@ int ff_concatgen_read_seek(AVFormatConte return ic->iformat->read_seek(ic, stream_index, pts, flags); } -int ff_concatgen_read_timestamp(AVFormatContext *s, - int stream_index, - int64_t *pos, - int64_t pos_limit) +int64_t ff_concatgen_read_timestamp(AVFormatContext *s, + int stream_index, + int64_t *pos, + int64_t pos_limit) { PlaylistContext *ctx; AVFormatContext *ic;

1 0

[soc]: r4837 - amr/amrnbdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 16:41:37 2009 New Revision: 4837 Log: Cosmetics: adjust space for the previous simplification of the postfilter Modified: amr/amrnbdec.c Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Wed Jul 29 16:38:54 2009 (r4836) +++ amr/amrnbdec.c Wed Jul 29 16:41:37 2009 (r4837) @@ -1034,8 +1034,8 @@ static void postfilter(AMRContext *p, fl float postfilter_gain; float tmp[AMR_SUBFRAME_SIZE + LP_FILTER_ORDER]; const float *gamma_n, *gamma_d; // Formant filter factor table - float lpc_n[LP_FILTER_ORDER], // Transfer function coefficients - lpc_d[LP_FILTER_ORDER]; // + float lpc_n[LP_FILTER_ORDER], // Transfer function coefficients + lpc_d[LP_FILTER_ORDER]; // if (p->cur_frame_mode == MODE_122 || p->cur_frame_mode == MODE_102) { gamma_n = formant_high_n; @@ -1046,8 +1046,8 @@ static void postfilter(AMRContext *p, fl } for (i = 0; i < LP_FILTER_ORDER; i++) { - lpc_n[i] = lpc[i] * gamma_n[i]; - lpc_d[i] = lpc[i] * gamma_d[i]; + lpc_n[i] = lpc[i] * gamma_n[i]; + lpc_d[i] = lpc[i] * gamma_d[i]; } // Apply transfer function given by lpc_n and lpc_d

1 0

[soc]: r4836 - in amr: amr-ffmpeg.diff amrnbdec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 16:38:54 2009 New Revision: 4836 Log: Simplify the zero filter because it is no longer used by the high-pass filter The difference from ff_celp_lp_synthesis_filterf was a headache, and scaling can always be done separately if needed. Modified: amr/amr-ffmpeg.diff amr/amrnbdec.c Modified: amr/amr-ffmpeg.diff ============================================================================== --- amr/amr-ffmpeg.diff Wed Jul 29 14:31:04 2009 (r4835) +++ amr/amr-ffmpeg.diff Wed Jul 29 16:38:54 2009 (r4836) @@ -85,81 +85,14 @@ Index: libavcodec/celp_filters.c void ff_celp_lp_synthesis_filterf( float *out, const float* filter_coeffs, -@@ -113,13 +138,10 @@ - { - int i,n; - -- // Avoids a +1 in the inner loop. -- filter_length++; -- - for(n=0; n<buffer_length; n++) +@@ -120,6 +145,6 @@ { -- out[n] = in[n]; -- for(i=1; i<filter_length; i++) + out[n] = in[n]; + for(i=1; i<filter_length; i++) - out[n] -= filter_coeffs[i-1] * in[n-i]; -+ out[n] = 0; -+ for(i=0; i<filter_length; i++) -+ out[n] += filter_coeffs[i] * in[n-i]; ++ out[n] += filter_coeffs[i-1] * in[n-i]; } } -Index: libavcodec/celp_filters.h -=================================================================== ---- libavcodec/celp_filters.h (revision 19401) -+++ libavcodec/celp_filters.h (working copy) -@@ -70,14 +70,31 @@ - int rounder); - - /** -+ * Circularly convolve fixed vector with a phase dispersion impulse -+ * response filter (D.6.2 of G.729 and 6.1.5 of AMR). -+ * @param fc_out vector with filter applied -+ * @param fc_in source vector -+ * @param filter phase filter coefficients -+ * -+ * fc_out[n] = sum(i,0,len-1){ fc_in[i] * filter[(len + n - i)%len] } -+ * -+ * \note fc_in and fc_out should not overlap! -+ */ -+void ff_celp_convolve_circf( -+ float* fc_out, -+ const float* fc_in, -+ const float* filter, -+ int len); -+ -+/** - * LP synthesis filter. - * @param out [out] pointer to output buffer - * - the array out[-filter_length, -1] must - * contain the previous result of this filter -- * @param filter_coeffs filter coefficients. -+ * @param filter_coeffs filter coefficients not including z^0 - * @param in input signal - * @param buffer_length amount of data to process -- * @param filter_length filter length (10 for 10th order LP filter) -+ * @param filter_length filter_coeffs length (10 for 10th order LP filter) - * - * @note Output buffer must contain filter_length samples of past - * speech data before pointer. -@@ -94,16 +111,13 @@ - /** - * LP zero synthesis filter. - * @param out [out] pointer to output buffer -- * @param filter_coeffs filter coefficients. -+ * @param filter_coeffs filter coefficients including z^0 coefficient - * @param in input signal -- * - the array in[-filter_length, -1] must -+ * - the array in[-filter_length+1, -1] must - * contain the previous input of this filter - * @param buffer_length amount of data to process -- * @param filter_length filter length (10 for 10th order LP filter) -+ * @param filter_length filter_coeffs length (11 for 10th order LP filter) - * -- * @note Output buffer must contain filter_length samples of past -- * speech data before pointer. -- * - * 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) Modified: amr/amrnbdec.c ============================================================================== --- amr/amrnbdec.c Wed Jul 29 14:31:04 2009 (r4835) +++ amr/amrnbdec.c Wed Jul 29 16:38:54 2009 (r4836) @@ -973,7 +973,7 @@ static void update_state(AMRContext *p) /** * Get the tilt factor of a formant filter from its transfer function * - * @param lpc_n LP_FILTER_ORDER + 1 coefficients of the numerator + * @param lpc_n LP_FILTER_ORDER coefficients of the numerator * @param lpc_d LP_FILTER_ORDER coefficients of the denominator */ static float tilt_factor(float *lpc_n, float *lpc_d) @@ -985,7 +985,8 @@ static float tilt_factor(float *lpc_n, f float rh0 = 0.0, rh1 = 0.0; // Get impulse response of the transfer function given by lpc_n and lpc_d - memcpy(hf, lpc_n, sizeof(float) * (LP_FILTER_ORDER + 1)); + hf[0] = 1.0; + memcpy(hf + 1, lpc_n, sizeof(float) * LP_FILTER_ORDER); ff_celp_lp_synthesis_filterf(hf, lpc_d, hf, AMR_TILT_RESPONSE, LP_FILTER_ORDER); @@ -1033,7 +1034,7 @@ static void postfilter(AMRContext *p, fl float postfilter_gain; float tmp[AMR_SUBFRAME_SIZE + LP_FILTER_ORDER]; const float *gamma_n, *gamma_d; // Formant filter factor table - float lpc_n[LP_FILTER_ORDER + 1], // Transfer function coefficients + float lpc_n[LP_FILTER_ORDER], // Transfer function coefficients lpc_d[LP_FILTER_ORDER]; // if (p->cur_frame_mode == MODE_122 || p->cur_frame_mode == MODE_102) { @@ -1044,9 +1045,8 @@ static void postfilter(AMRContext *p, fl gamma_d = formant_low_d; } - lpc_n[0] = 1; for (i = 0; i < LP_FILTER_ORDER; i++) { - lpc_n[i + 1] = lpc[i] * gamma_n[i]; + lpc_n[i] = lpc[i] * gamma_n[i]; lpc_d[i] = lpc[i] * gamma_d[i]; } @@ -1057,7 +1057,7 @@ static void postfilter(AMRContext *p, fl memcpy(p->postfilter_mem, tmp + AMR_SUBFRAME_SIZE, sizeof(float) * LP_FILTER_ORDER); ff_celp_lp_zero_synthesis_filterf(buf_out, lpc_n, tmp + LP_FILTER_ORDER, - AMR_SUBFRAME_SIZE, LP_FILTER_ORDER + 1); + AMR_SUBFRAME_SIZE, LP_FILTER_ORDER); // Apply tilt compensation tilt_compensation(&p->tilt_mem, tilt_factor(lpc_n, lpc_d), buf_out);

1 0

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

29 Jul '09

Author: cmcq Date: Wed Jul 29 14:26:19 2009 New Revision: 4833 Log: Rename to reflect that the floating-point decoder will be the default. Makefile and include changes will follow in a separate patch. Added: amr/amrnbdata.h (props changed) - copied unchanged from r4831, amr/amrnbfloatdata.h amr/amrnbdec.c (props changed) - copied unchanged from r4831, amr/amrnbfloatdec.c Deleted: amr/amrnbfloatdata.h amr/amrnbfloatdec.c

3 4

[soc]: r4835 - in amr: amrfixeddata.h amrnbfixeddec.c
by cmcq 29 Jul '09

29 Jul '09

Author: cmcq Date: Wed Jul 29 14:31:04 2009 New Revision: 4835 Log: Adopt the new filenames in the fixed-point code Modified: amr/amrfixeddata.h amr/amrnbfixeddec.c Modified: amr/amrfixeddata.h ============================================================================== --- amr/amrfixeddata.h Wed Jul 29 14:28:57 2009 (r4834) +++ amr/amrfixeddata.h Wed Jul 29 14:31:04 2009 (r4835) @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_AMRDATA_H -#define AVCODEC_AMRDATA_H +#ifndef AVCODEC_AMRFIXEDDATA_H +#define AVCODEC_AMRFIXEDDATA_H /** - * @file libavcodec/amrdata.h + * @file libavcodec/amrfixeddata.h * AMR data and definitions */ @@ -1181,4 +1181,4 @@ static const uint16_t pitch_gain_quant[N /**************************** end of tables *****************************/ -#endif /* AVCODEC_AMRDATA_H */ +#endif /* AVCODEC_AMRFIXEDDATA_H */ Modified: amr/amrnbfixeddec.c ============================================================================== --- amr/amrnbfixeddec.c Wed Jul 29 14:28:57 2009 (r4834) +++ amr/amrnbfixeddec.c Wed Jul 29 14:31:04 2009 (r4835) @@ -1,5 +1,5 @@ /* - * AMR narrowband decoder + * AMR narrowband decoder (fixed point) * Copyright (c) 2006-2007 Robert Swain * * This file is part of FFmpeg. @@ -21,7 +21,7 @@ /** - * @file libavcodec/amrnbdec.c + * @file libavcodec/amrnbfixeddec.c * AMR narrowband decoder */ @@ -34,7 +34,7 @@ #include "avcodec.h" #include "get_bits.h" #include "common.h" -#include "amrdata.h" +#include "amrfixeddata.h" typedef struct AMRContext {

1 0