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

[soc]: r4796 - in concat/libavformat: concatgen.c playlist.c playlist.h
by gkovacs 24 Jul '09

24 Jul '09

Author: gkovacs Date: Fri Jul 24 02:03:09 2009 New Revision: 4796 Log: removed PlayElem Modified: concat/libavformat/concatgen.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Fri Jul 24 01:29:45 2009 (r4795) +++ concat/libavformat/concatgen.c Fri Jul 24 02:03:09 2009 (r4796) @@ -43,11 +43,10 @@ int ff_concatgen_read_packet(AVFormatCon ctx = s->priv_data; stream_index = 0; retr: - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; ret = ic->iformat->read_packet(ic, pkt); if (pkt) { stream_index = pkt->stream_index; - ic = ctx->pelist[ctx->pe_curidx]->ic; pkt->stream = ic->streams[pkt->stream_index]; } if (ret >= 0) { @@ -83,7 +82,7 @@ int ff_concatgen_read_seek(AVFormatConte PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; return ic->iformat->read_seek(ic, stream_index, pts, flags); } @@ -95,7 +94,7 @@ int ff_concatgen_read_timestamp(AVFormat PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; if (ic->iformat->read_timestamp) return ic->iformat->read_timestamp(ic, stream_index, pos, pos_limit); return 0; @@ -106,7 +105,7 @@ int ff_concatgen_read_close(AVFormatCont PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; if (ic->iformat->read_close) return ic->iformat->read_close(ic); return 0; @@ -117,7 +116,7 @@ int ff_concatgen_read_play(AVFormatConte PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; return av_read_play(ic); } @@ -126,6 +125,6 @@ int ff_concatgen_read_pause(AVFormatCont PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; - ic = ctx->pelist[ctx->pe_curidx]->ic; + ic = ctx->icl[ctx->pe_curidx]; return av_read_pause(ic); } Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Fri Jul 24 01:29:45 2009 (r4795) +++ concat/libavformat/playlist.c Fri Jul 24 02:03:09 2009 (r4796) @@ -34,16 +34,17 @@ #include "playlist.h" #include "internal.h" -void ff_playlist_init_playelem(PlayElem *pe) +AVFormatContext *ff_playlist_alloc_formatcontext(char *filename) { int err; - pe->ic = av_mallocz(sizeof(*(pe->ic))); - err = av_open_input_file(&(pe->ic), pe->filename, pe->ic->iformat, 0, NULL); + AVFormatContext *ic = av_mallocz(sizeof(*ic)); + err = av_open_input_file(&(ic), filename, ic->iformat, 0, NULL); if (err < 0) - av_log(pe->ic, AV_LOG_ERROR, "Error during av_open_input_file\n"); - err = av_find_stream_info(pe->ic); + av_log(ic, AV_LOG_ERROR, "Error during av_open_input_file\n"); + err = av_find_stream_info(ic); if (err < 0) - av_log(pe->ic, AV_LOG_ERROR, "Could not find stream info\n"); + av_log(ic, AV_LOG_ERROR, "Could not find stream info\n"); + return ic; } void ff_playlist_populate_context(AVFormatContext *s) @@ -51,8 +52,8 @@ void ff_playlist_populate_context(AVForm int i; AVFormatContext *ic; PlaylistContext *ctx = s->priv_data; - ff_playlist_init_playelem(ctx->pelist[ctx->pe_curidx]); - ic = ctx->pelist[ctx->pe_curidx]->ic; + ctx->icl = av_realloc(ctx->icl, sizeof(*(ctx->icl)) * (ctx->pe_curidx+1)); + ic = ctx->icl[ctx->pe_curidx] = ff_playlist_alloc_formatcontext(ctx->flist[ctx->pe_curidx]); ic->iformat->read_header(ic, 0); s->nb_streams = ic->nb_streams; for (i = 0; i < ic->nb_streams; ++i) @@ -78,10 +79,10 @@ void ff_playlist_set_context(AVFormatCon AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index) { - if (ctx && pe_idx < ctx->pelist_size && ctx->pelist && ctx->pelist[pe_idx] && - ctx->pelist[pe_idx]->ic && stream_index < ctx->pelist[pe_idx]->ic->nb_streams && - ctx->pelist[pe_idx]->ic->streams && ctx->pelist[pe_idx]->ic->streams[stream_index]) - return ctx->pelist[pe_idx]->ic->streams[stream_index]; + if (ctx && pe_idx < ctx->pelist_size && ctx->icl && ctx->icl[pe_idx] && + ctx->icl[pe_idx] && stream_index < ctx->icl[pe_idx]->nb_streams && + ctx->icl[pe_idx]->streams && ctx->icl[pe_idx]->streams[stream_index]) + return ctx->icl[pe_idx]->streams[stream_index]; else return NULL; } @@ -132,10 +133,8 @@ PlaylistContext *ff_playlist_from_encode void ff_playlist_add_path(PlaylistContext *ctx, char *itempath) { - ctx->pelist_size++; - ctx->pelist = av_realloc(ctx->pelist, ctx->pelist_size * sizeof(PlayElem*)); - ctx->pelist[ctx->pelist_size-1] = av_mallocz(sizeof(*(ctx->pelist[ctx->pelist_size-1]))); - ctx->pelist[ctx->pelist_size-1]->filename = itempath; + ctx->flist = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * ++ctx->pelist_size); + ctx->flist[ctx->pelist_size-1] = itempath; } // converts list of mixed absolute and relative paths into all absolute paths Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Fri Jul 24 01:29:45 2009 (r4795) +++ concat/libavformat/playlist.h Fri Jul 24 02:03:09 2009 (r4796) @@ -37,29 +37,22 @@ #include "riff.h" #include <libgen.h> -/** @struct PlayElem - * @brief Represents each input file on a playlist. - */ -typedef struct PlayElem { - AVFormatContext *ic; /**< AVFormatContext for this playlist item */ - char *filename; /**< Filename with absolute path of this playlist item */ -} PlayElem; - /** @struct PlaylistContext * @brief Represents the playlist and contains PlayElem for each playlist item. */ typedef struct PlaylistContext { - PlayElem **pelist; /**< List of PlayElem, with each representing a playlist item */ + char **flist; /**< List of file names for each playlist item */ + AVFormatContext **icl; /**< List of FormatContext for each playlist items */ int pelist_size; /**< Number of PlayElem stored in pelist */ int pe_curidx; /**< Index of the PlayElem that packets are being read from */ int64_t time_offset; /**< Time offset, in 10^-6 seconds, for all multimedia streams */ } PlaylistContext; -/** @fn int ff_playlist_init_playelem(PlayElem* pe) - * @brief Opens file, codecs, and streams associated with PlayElem. - * @param pe PlayElem to open. It should already be allocated. +/** @fn int ff_playlist_alloc_playelem(PlayElem* pe) + * @brief Allocates and opens file, codecs, and streams associated with filename. + * @param filename Null-terminated string of file to open. */ -void ff_playlist_init_playelem(PlayElem* pe); +AVFormatContext *ff_playlist_alloc_formatcontext(char *filename); /** @fn void ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index) * @brief Opens the current PlayElem from the PlaylistContext.

1 0

[soc]: r4795 - in concat/libavformat: playlist.c playlist.h
by gkovacs 23 Jul '09

23 Jul '09

Author: gkovacs Date: Fri Jul 24 01:29:45 2009 New Revision: 4795 Log: removed unused attributes from PlayElem Modified: concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Fri Jul 24 01:14:48 2009 (r4794) +++ concat/libavformat/playlist.c Fri Jul 24 01:29:45 2009 (r4795) @@ -37,23 +37,13 @@ void ff_playlist_init_playelem(PlayElem *pe) { int err; - pe->ic = av_malloc(sizeof(*(pe->ic))); - pe->ap = av_mallocz(sizeof(*(pe->ap))); - pe->ap->time_base = (AVRational){1, 25}; - pe->fmt = 0; - err = av_open_input_file(&(pe->ic), pe->filename, pe->fmt, 0, pe->ap); + pe->ic = av_mallocz(sizeof(*(pe->ic))); + err = av_open_input_file(&(pe->ic), pe->filename, pe->ic->iformat, 0, NULL); if (err < 0) av_log(pe->ic, AV_LOG_ERROR, "Error during av_open_input_file\n"); - pe->fmt = pe->ic->iformat; - if (!pe->fmt) - av_log(pe->ic, AV_LOG_ERROR, "Input format not set\n"); err = av_find_stream_info(pe->ic); if (err < 0) av_log(pe->ic, AV_LOG_ERROR, "Could not find stream info\n"); - if (pe->ic->pb) - pe->ic->pb->eof_reached = 0; - else - av_log(pe->ic, AV_LOG_ERROR, "ByteIOContext not set\n"); } void ff_playlist_populate_context(AVFormatContext *s) Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Fri Jul 24 01:14:48 2009 (r4794) +++ concat/libavformat/playlist.h Fri Jul 24 01:29:45 2009 (r4795) @@ -43,8 +43,6 @@ typedef struct PlayElem { AVFormatContext *ic; /**< AVFormatContext for this playlist item */ char *filename; /**< Filename with absolute path of this playlist item */ - AVInputFormat *fmt; /**< AVInputFormat manually specified for this playlist item */ - AVFormatParameters *ap; /**< AVFormatParameters for this playlist item */ } PlayElem; /** @struct PlaylistContext

1 0

[soc]: r4794 - concat/libavformat/playlist.c
by gkovacs 23 Jul '09

23 Jul '09

Author: gkovacs Date: Fri Jul 24 01:14:48 2009 New Revision: 4794 Log: no need to explicitly convert to absolute paths in ff_playlist_from_encodedstring Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Fri Jul 24 01:08:31 2009 (r4793) +++ concat/libavformat/playlist.c Fri Jul 24 01:14:48 2009 (r4794) @@ -127,9 +127,6 @@ PlaylistContext *ff_playlist_from_encode PlaylistContext *ctx; char **flist; int i, len; - char workingdir[1024]; - getcwd(workingdir, 1024); - workingdir[1023] = 0; ff_playlist_split_encodedstring(s, sep, &flist, &len); if (len <= 1) { for (i = 0; i < len; ++i) @@ -138,7 +135,6 @@ PlaylistContext *ff_playlist_from_encode return NULL; } ctx = av_mallocz(sizeof(*ctx)); - ff_playlist_relative_paths(flist, len, workingdir); for (i = 0; i < len; ++i) ff_playlist_add_path(ctx, flist[i]); return ctx;

1 0

[soc]: r4793 - in concat: ffmpeg.c.diff libavformat/concatgen.c libavformat/m3u.c libavformat/playlist.c libavformat/playlist.h libavformat/pls.c libavformat/xspf.c
by gkovacs 23 Jul '09

23 Jul '09

Author: gkovacs Date: Fri Jul 24 01:08:31 2009 New Revision: 4793 Log: use single time offset for all multimedia streams Modified: concat/ffmpeg.c.diff concat/libavformat/concatgen.c concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h concat/libavformat/pls.c concat/libavformat/xspf.c Modified: concat/ffmpeg.c.diff ============================================================================== --- concat/ffmpeg.c.diff Fri Jul 24 00:54:37 2009 (r4792) +++ concat/ffmpeg.c.diff Fri Jul 24 01:08:31 2009 (r4793) @@ -1,5 +1,5 @@ diff --git a/ffmpeg.c b/ffmpeg.c -index 22bfed8..f5b9656 100644 +index 22bfed8..921943f 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -70,6 +70,8 @@ @@ -101,7 +101,7 @@ index 22bfed8..f5b9656 100644 + if (!playlist_ctx) { + ic = avformat_alloc_context(); + av_log(ic, AV_LOG_DEBUG, "Generating playlist ctx\n"); -+ playlist_ctx = ff_playlist_alloc_context(); ++ playlist_ctx = av_mallocz(sizeof(*playlist_ctx)); + ff_playlist_add_path(playlist_ctx, filename); + ic->nb_streams = 2; + ic->iformat = ff_concat_alloc_demuxer(); Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/concatgen.c Fri Jul 24 01:08:31 2009 (r4793) @@ -53,8 +53,8 @@ int ff_concatgen_read_packet(AVFormatCon if (ret >= 0) { if (pkt) { int64_t time_offset; - time_offset = av_rescale_q(ctx->time_offsets[pkt->stream_index], AV_TIME_BASE_Q, ic->streams[stream_index]->time_base); - av_log(ic, "%s conv stream time from %ld to %d/%d is %ld\n", ic->iformat->name, ctx->time_offsets[pkt->stream_index], ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, time_offset); + time_offset = av_rescale_q(ctx->time_offset, AV_TIME_BASE_Q, ic->streams[stream_index]->time_base); + av_log(ic, AV_LOG_DEBUG, "%s conv stream time from %ld to %d/%d is %ld\n", ic->iformat->name, ctx->time_offset, ic->streams[stream_index]->time_base.num, ic->streams[stream_index]->time_base.den, time_offset); // TODO changing either dts or pts leads to timing issues on h264 pkt->dts += time_offset; if (!ic->streams[pkt->stream_index]->codec->has_b_frames) @@ -64,9 +64,7 @@ int ff_concatgen_read_packet(AVFormatCon // TODO switch from AVERROR_EOF to AVERROR_EOS // -32 AVERROR_EOF for avi, -51 for ogg av_log(ic, AV_LOG_DEBUG, "Switching stream %d to %d\n", stream_index, ctx->pe_curidx+1); - for (i = 0; i < ic->nb_streams && i < ctx->time_offsets_size; ++i) { - ctx->time_offsets[i] += av_rescale_q(ic->streams[i]->duration, ic->streams[i]->time_base, AV_TIME_BASE_Q); - } + ctx->time_offset += av_rescale_q(ic->streams[i]->duration, ic->streams[i]->time_base, AV_TIME_BASE_Q); ++ctx->pe_curidx; ff_playlist_populate_context(s); have_switched_streams = 1; Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/m3u.c Fri Jul 24 01:08:31 2009 (r4793) @@ -92,7 +92,7 @@ static int m3u_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_alloc_context(); + PlaylistContext *ctx = av_mallocz(sizeof(*ctx)); m3u_list_files(s->pb, ctx, s->filename); s->priv_data = ctx; ff_playlist_populate_context(s); Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/playlist.c Fri Jul 24 01:08:31 2009 (r4793) @@ -56,15 +56,6 @@ void ff_playlist_init_playelem(PlayElem av_log(pe->ic, AV_LOG_ERROR, "ByteIOContext not set\n"); } -PlaylistContext* ff_playlist_alloc_context(void) -{ - int i; - PlaylistContext *ctx = av_mallocz(sizeof(*ctx)); - ctx->time_offsets_size = 2; // TODO don't assume we have just 2 streams - ctx->time_offsets = av_mallocz(sizeof(*(ctx->time_offsets)) * ctx->time_offsets_size); - return ctx; -} - void ff_playlist_populate_context(AVFormatContext *s) { int i; @@ -146,7 +137,7 @@ PlaylistContext *ff_playlist_from_encode av_free(flist); return NULL; } - ctx = ff_playlist_alloc_context(); + ctx = av_mallocz(sizeof(*ctx)); ff_playlist_relative_paths(flist, len, workingdir); for (i = 0; i < len; ++i) ff_playlist_add_path(ctx, flist[i]); Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/playlist.h Fri Jul 24 01:08:31 2009 (r4793) @@ -54,8 +54,7 @@ typedef struct PlaylistContext { PlayElem **pelist; /**< List of PlayElem, with each representing a playlist item */ int pelist_size; /**< Number of PlayElem stored in pelist */ int pe_curidx; /**< Index of the PlayElem that packets are being read from */ - int time_offsets_size; /**< Number of time offsets (number of multimedia streams), 2 with audio and video. */ - int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */ + int64_t time_offset; /**< Time offset, in 10^-6 seconds, for all multimedia streams */ } PlaylistContext; /** @fn int ff_playlist_init_playelem(PlayElem* pe) @@ -64,12 +63,6 @@ typedef struct PlaylistContext { */ void ff_playlist_init_playelem(PlayElem* pe); -/** @fn PlaylistContext* ff_playlist_alloc_context(void) - * @brief Allocates and returns a PlaylistContext. - * @return Returns the allocated PlaylistContext. - */ -PlaylistContext* ff_playlist_alloc_context(void); - /** @fn void ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index) * @brief Opens the current PlayElem from the PlaylistContext. * @param s AVFormatContext of the concat-type demuxer, which contains the PlaylistContext. Modified: concat/libavformat/pls.c ============================================================================== --- concat/libavformat/pls.c Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/pls.c Fri Jul 24 01:08:31 2009 (r4793) @@ -116,7 +116,7 @@ static int pls_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_alloc_context(); + PlaylistContext *ctx = av_mallocz(sizeof(*ctx)); if (pls_list_files(s->pb, ctx, s->filename)) { fprintf(stderr, "no playlist items found in %s\n", s->filename); return AVERROR_EOF; Modified: concat/libavformat/xspf.c ============================================================================== --- concat/libavformat/xspf.c Fri Jul 24 00:54:37 2009 (r4792) +++ concat/libavformat/xspf.c Fri Jul 24 01:08:31 2009 (r4793) @@ -120,7 +120,7 @@ static int xspf_read_header(AVFormatCont AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_playlist_alloc_context(); + PlaylistContext *ctx = av_mallocz(sizeof(*ctx)); if (xspf_list_files(s->pb, ctx, s->filename)) { fprintf(stderr, "no playlist items found in %s\n", s->filename); return AVERROR_EOF;

1 0

[soc]: r4792 - concat/libavformat/playlist.c
by gkovacs 23 Jul '09

23 Jul '09

Author: gkovacs Date: Fri Jul 24 00:54:37 2009 New Revision: 4792 Log: replaced memsets with av_mallocz Modified: concat/libavformat/playlist.c Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Thu Jul 23 17:38:29 2009 (r4791) +++ concat/libavformat/playlist.c Fri Jul 24 00:54:37 2009 (r4792) @@ -38,12 +38,8 @@ void ff_playlist_init_playelem(PlayElem { int err; pe->ic = av_malloc(sizeof(*(pe->ic))); - pe->ap = av_malloc(sizeof(*(pe->ap))); - memset(pe->ap, 0, sizeof(*(pe->ap))); - pe->ap->width = 0; - pe->ap->height = 0; + pe->ap = av_mallocz(sizeof(*(pe->ap))); pe->ap->time_base = (AVRational){1, 25}; - pe->ap->pix_fmt = 0; pe->fmt = 0; err = av_open_input_file(&(pe->ic), pe->filename, pe->fmt, 0, pe->ap); if (err < 0) @@ -63,12 +59,9 @@ void ff_playlist_init_playelem(PlayElem PlaylistContext* ff_playlist_alloc_context(void) { int i; - PlaylistContext *ctx = av_malloc(sizeof(*ctx)); - memset(ctx, 0, sizeof(*ctx)); + PlaylistContext *ctx = av_mallocz(sizeof(*ctx)); ctx->time_offsets_size = 2; // TODO don't assume we have just 2 streams - ctx->time_offsets = av_malloc(sizeof(*(ctx->time_offsets)) * ctx->time_offsets_size); - for (i = 0; i < ctx->time_offsets_size; ++i) - ctx->time_offsets[i] = 0; + ctx->time_offsets = av_mallocz(sizeof(*(ctx->time_offsets)) * ctx->time_offsets_size); return ctx; } @@ -164,8 +157,7 @@ void ff_playlist_add_path(PlaylistContex { ctx->pelist_size++; ctx->pelist = av_realloc(ctx->pelist, ctx->pelist_size * sizeof(PlayElem*)); - ctx->pelist[ctx->pelist_size-1] = av_malloc(sizeof(*(ctx->pelist[ctx->pelist_size-1]))); - memset(ctx->pelist[ctx->pelist_size-1], 0, sizeof(*(ctx->pelist[ctx->pelist_size-1]))); + ctx->pelist[ctx->pelist_size-1] = av_mallocz(sizeof(*(ctx->pelist[ctx->pelist_size-1]))); ctx->pelist[ctx->pelist_size-1]->filename = itempath; }

1 0

[soc]: r4791 - amr/amrnbfloatdec.c
by cmcq 23 Jul '09

23 Jul '09

Author: cmcq Date: Thu Jul 23 17:38:29 2009 New Revision: 4791 Log: Disable anti-sparseness filter for low levels of fixed gain anti_sparseness now gets the same impNr as the ref decoder (in my tests). Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jul 23 16:14:36 2009 (r4790) +++ amr/amrnbfloatdec.c Thu Jul 23 17:38:29 2009 (r4791) @@ -876,7 +876,11 @@ static void anti_sparseness(AMRContext * ir_filter_strength++; } - //FIXME: disable filtering for very low level of fixed_gain + // Disable filtering for very low level of fixed_gain. + // Note this step is not specified in the technical description but is in + // the reference source in the function Ph_disp. + if (fixed_gain < 5.0) + ir_filter_strength = 2; if (p->cur_frame_mode != MODE_74 && p->cur_frame_mode < MODE_102 && ir_filter_strength < 2) { const float **filters = p->cur_frame_mode == MODE_795 ? ir_filters_lookup_MODE_795

1 0

[soc]: r4785 - amr/amrnbfloatdec.c
by cmcq 23 Jul '09

23 Jul '09

Author: cmcq Date: Thu Jul 23 12:18:54 2009 New Revision: 4785 Log: Reorder decoding processes to match the encoding process and the ref source Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jul 23 12:02:32 2009 (r4784) +++ amr/amrnbfloatdec.c Thu Jul 23 12:18:54 2009 (r4785) @@ -71,7 +71,7 @@ typedef struct AMRContext { float pitch_gain[5]; ///< quantified pitch gains for the current and previous four subframes float fixed_gain[5]; ///< quantified fixed gains for the current and previous four subframes - float beta; ///< beta = pitch_gain, bounded by [0.0,1.0] for 12.2 kbps or [0.0,0.8] for other modes + float beta; ///< beta = previous pitch_gain, bounded by [0.0,0.8] int diff_count; ///< the number of subframes for which diff has been above 0.65 int hang_count; ///< the number of subframes since a hangover period started @@ -764,7 +764,7 @@ static float fixed_gain_smooth(AMRContex } /** - * Decode fixed and pitch gains. + * Decode fixed and pitch gains, and apply pitch sharpening. * * @param p the context * @param amr_subframe unpacked amr subframe @@ -775,6 +775,7 @@ static void decode_gains(AMRContext *p, const enum Mode mode, const int subframe) { float fixed_gain_factor; // fixed gain correction factor {^gamma_gc} for the current frame + int i; // decode pitch gain and fixed gain correction factor if (mode == MODE_122 || mode == MODE_795) { @@ -790,6 +791,24 @@ static void decode_gains(AMRContext *p, fixed_gain_factor = gains[1]; } + // Only 12.2kbit/s mode uses the current pitch gain for pitch sharpening. + // The spec suggests the current pitch gain is always used, but in other + // modes the pitch and codebook gains are joinly quantized (sec 5.8.2) + // so the codebook gain cannot depend on the quantised pitch gain. + if (mode == MODE_122) + p->beta = p->pitch_gain[4]; + + // conduct pitch sharpening as appropriate (section 6.1.2) + if (p->pitch_lag_int < AMR_SUBFRAME_SIZE) + for (i = p->pitch_lag_int; i < AMR_SUBFRAME_SIZE; i++) + p->fixed_vector[i] += p->beta*p->fixed_vector[i-p->pitch_lag_int]; + + // Save pitch sharpening factor for the next subframe + // MODE_475 only updates on the 2nd and 4th subframes - this follows from + // the fact that the gains for two subframes are jointly quantised. + if (mode != MODE_475 || subframe & 1) + p->beta = av_clipf(p->pitch_gain[4], 0.0, 0.8); + // ^g_c = g_c' * ^gamma_gc p->fixed_gain[4] = fixed_gain_factor * fixed_gain_prediction(p->fixed_vector, p->prediction_error, mode); @@ -1140,16 +1159,6 @@ int amrnb_decode_frame(AVCodecContext *a /*** pre-processing ***/ - p->beta = av_clipf(p->pitch_gain[4], 0.0, - p->cur_frame_mode == MODE_122 ? 1.0 : 0.8); - - // conduct pitch sharpening as appropriate (section 6.1.2) - if (p->pitch_lag_int < AMR_SUBFRAME_SIZE) - for (i = p->pitch_lag_int; i < AMR_SUBFRAME_SIZE; i++) - p->fixed_vector[i] += p->beta*p->fixed_vector[i-p->pitch_lag_int]; - - // Fixed gain calculation (section 6.1.3) uses the results of pitch - // sharpening (above) decode_gains(p, amr_subframe, p->cur_frame_mode, subframe); // The excitation feedback is calculated without any processing such

3 3

[soc]: r4790 - amr/amrnbfloatdec.c
by cmcq 23 Jul '09

23 Jul '09

Author: cmcq Date: Thu Jul 23 16:14:36 2009 New Revision: 4790 Log: Doxygen: Make sure all AMR groups are displayed together in the module index Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jul 23 16:04:58 2009 (r4789) +++ amr/amrnbfloatdec.c Thu Jul 23 16:14:36 2009 (r4790) @@ -223,7 +223,7 @@ enum Mode decode_bitstream(AMRContext *p } -/// @defgroup amr_lpc_decoding pitch LPC coefficient decoding functions +/// @defgroup amr_lpc_decoding AMR pitch LPC coefficient decoding functions /// @{ /** @@ -391,7 +391,7 @@ static void lsp2lpc(float *lsp, float *l /// @} -/// @defgroup amr_pitch_vector_decoding pitch vector decoding functions +/// @defgroup amr_pitch_vector_decoding AMR pitch vector decoding functions /// @{ /** @@ -532,7 +532,7 @@ static void decode_pitch_vector(AMRConte /// @} -/// @defgroup amr_algebraic_code_book algebraic code book (fixed) vector decoding functions +/// @defgroup amr_algebraic_code_book AMR algebraic code book (fixed) vector decoding functions /// @{ /** @@ -689,7 +689,7 @@ static void decode_fixed_vector(float *f /// @} -/// @defgroup amr_gain_decoding gain decoding functions +/// @defgroup amr_gain_decoding AMR gain decoding functions /// @{ /** @@ -822,7 +822,7 @@ static void decode_gains(AMRContext *p, /// @} -/// @defgroup amr_pre_processing pre-processing functions +/// @defgroup amr_pre_processing AMR pre-processing functions /// @{ /** @@ -897,7 +897,7 @@ static void anti_sparseness(AMRContext * /// @} -/// @defgroup amr_synthesis synthesis functions +/// @defgroup amr_synthesis AMR synthesis functions /// @{ /** @@ -958,7 +958,7 @@ static int synthesis(AMRContext *p, floa /// @} -/// @defgroup amr_update update functions +/// @defgroup amr_update AMR update functions /// @{ /** @@ -987,7 +987,7 @@ static void update_state(AMRContext *p) /// @} -/// @defgroup amr_postproc Post processing functions +/// @defgroup amr_postproc AMR Post processing functions /// @{ /**

1 0

[soc]: r4789 - amr/amrnbfloatdec.c
by cmcq 23 Jul '09

23 Jul '09

Author: cmcq Date: Thu Jul 23 16:04:58 2009 New Revision: 4789 Log: Cosmetics: rename apply_ir_filter to anti_sparseness and clarify the name Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jul 23 15:03:18 2009 (r4788) +++ amr/amrnbfloatdec.c Thu Jul 23 16:04:58 2009 (r4789) @@ -75,7 +75,7 @@ typedef struct AMRContext { int diff_count; ///< the number of subframes for which diff has been above 0.65 int hang_count; ///< the number of subframes since a hangover period started - float prev_ir_fixed_gain; ///< previous fixed gain used by impulse response filter + float prev_sparse_fixed_gain; ///< previous fixed gain; used by anti-sparseness processing to determine "onset" uint8_t prev_ir_filter_strength; ///< previous impulse response filter strength; 0 - strong, 1 - medium, 2 - none uint8_t ir_filter_onset; ///< flag for impulse response filter strength @@ -826,17 +826,23 @@ static void decode_gains(AMRContext *p, /// @{ /** - * adaptive phase dispersion; forming of total excitation + * Reduce fixed vector sparseness by smoothing with one of three IR filters. + * + * This implements 3GPP TS 26.090 section 6.1(5). + * + * In the patent description "Method and device for coding speech in + * analysis-by-synthesis speech coders" by Ari P. Heikkinen, this method + * is called "adaptive phase dispersion". This name is also used in the + * reference source, but not in the spec. * * @param p the context * @param fixed_vector algebraic codebook vector * @param fixed_gain smoothed gain */ -static void apply_ir_filter(AMRContext *p, float *fixed_vector, float fixed_gain) +static void anti_sparseness(AMRContext *p, float *fixed_vector, float fixed_gain) { int ir_filter_strength; - // anti-sparseness processing if (p->pitch_gain[4] < 0.6) { // strong filtering ir_filter_strength = 0; @@ -849,7 +855,7 @@ static void apply_ir_filter(AMRContext * } // detect 'onset' - if (fixed_gain > 2.0 * p->prev_ir_fixed_gain) { + if (fixed_gain > 2.0 * p->prev_sparse_fixed_gain) { p->ir_filter_onset = 2; } else if (p->ir_filter_onset) { p->ir_filter_onset--; @@ -886,7 +892,7 @@ static void apply_ir_filter(AMRContext * // update ir filter strength history p->prev_ir_filter_strength = ir_filter_strength; - p->prev_ir_fixed_gain = fixed_gain; + p->prev_sparse_fixed_gain = fixed_gain; } /// @} @@ -1175,7 +1181,7 @@ static int amrnb_decode_frame(AVCodecCon synth_fixed_gain = fixed_gain_smooth(p, p->lsf_q[subframe], p->lsf_avg, p->cur_frame_mode); - apply_ir_filter(p, p->fixed_vector, synth_fixed_gain); + anti_sparseness(p, p->fixed_vector, synth_fixed_gain); /*** end of pre-processing ***/

1 0

[soc]: r4788 - amr/amrnbfloatdec.c
by cmcq 23 Jul '09

23 Jul '09

Author: cmcq Date: Thu Jul 23 15:03:18 2009 New Revision: 4788 Log: Make all internal functions static Modified: amr/amrnbfloatdec.c Modified: amr/amrnbfloatdec.c ============================================================================== --- amr/amrnbfloatdec.c Thu Jul 23 12:58:18 2009 (r4787) +++ amr/amrnbfloatdec.c Thu Jul 23 15:03:18 2009 (r4788) @@ -832,7 +832,7 @@ static void decode_gains(AMRContext *p, * @param fixed_vector algebraic codebook vector * @param fixed_gain smoothed gain */ -void apply_ir_filter(AMRContext *p, float *fixed_vector, float fixed_gain) +static void apply_ir_filter(AMRContext *p, float *fixed_vector, float fixed_gain) { int ir_filter_strength; @@ -1094,7 +1094,7 @@ static void post_process(AMRContext *p, * @param high_pass_mem Pointer to two floats for the filter state * @param samples AMR_SUBFRAME_SIZE buffer where the filter is applied */ -void high_pass_filter(float *high_pass_mem, float *samples) +static void high_pass_filter(float *high_pass_mem, float *samples) { int i; float tmp[AMR_SUBFRAME_SIZE + 2]; @@ -1114,7 +1114,7 @@ void high_pass_filter(float *high_pass_m /// @} -int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, +static int amrnb_decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) {

1 0