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

[soc]: r5376 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 21:25:03 2009 New Revision: 5376 Log: change doxygen tag from WMA9 decoder to wmapro decoder Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 21:23:25 2009 (r5375) +++ wmapro/wmaprodec.c Mon Aug 31 21:25:03 2009 (r5376) @@ -1540,7 +1540,7 @@ static void flush(AVCodecContext *avctx) /** - *@brief WMA9 decoder + *@brief wmapro decoder */ AVCodec wmapro_decoder = { "wmapro",

1 0

[soc]: r5375 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 21:23:25 2009 New Revision: 5375 Log: rename WMA3* struct names to WMAPro Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 20:57:35 2009 (r5374) +++ wmapro/wmaprodec.c Mon Aug 31 21:23:25 2009 (r5375) @@ -142,7 +142,7 @@ typedef struct { uint8_t table_idx; ///< index in sf_offsets for the scale factor reference block float* coeffs; ///< pointer to the subframe decode buffer DECLARE_ALIGNED_16(float, out[WMAPRO_BLOCK_MAX_SIZE + WMAPRO_BLOCK_MAX_SIZE / 2]); ///< output buffer -} WMA3ChannelCtx; +} WMAProChannelCtx; /** * @brief channel group for channel transformations @@ -153,12 +153,12 @@ typedef struct { int8_t transform_band[MAX_BANDS]; ///< controls if the transform is enabled for a certain band float decorrelation_matrix[WMAPRO_MAX_CHANNELS*WMAPRO_MAX_CHANNELS]; float* channel_data[WMAPRO_MAX_CHANNELS]; ///< transformation coefficients -} WMA3ChannelGroup; +} WMAProChannelGrp; /** * @brief main decoder context */ -typedef struct WMA3DecodeContext { +typedef struct WMAProDecodeCtx { /* generic decoder variables */ AVCodecContext* avctx; ///< codec context for av_log DSPContext dsp; ///< accelerated DSP functions @@ -214,17 +214,17 @@ typedef struct WMA3DecodeContext { int8_t esc_len; ///< length of escaped coefficients uint8_t num_chgroups; ///< number of channel groups - WMA3ChannelGroup chgroup[WMAPRO_MAX_CHANNELS]; ///< channel group information + WMAProChannelGrp chgroup[WMAPRO_MAX_CHANNELS]; ///< channel group information - WMA3ChannelCtx channel[WMAPRO_MAX_CHANNELS]; ///< per channel data -} WMA3DecodeContext; + WMAProChannelCtx channel[WMAPRO_MAX_CHANNELS]; ///< per channel data +} WMAProDecodeCtx; /** *@brief helper function to print the most important members of the context *@param s context */ -static void av_cold dump_context(WMA3DecodeContext *s) +static void av_cold dump_context(WMAProDecodeCtx *s) { #define PRINT(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %d\n", a, b); #define PRINT_HEX(a, b) av_log(s->avctx, AV_LOG_DEBUG, " %s = %x\n", a, b); @@ -245,7 +245,7 @@ static void av_cold dump_context(WMA3Dec */ static av_cold int decode_end(AVCodecContext *avctx) { - WMA3DecodeContext *s = avctx->priv_data; + WMAProDecodeCtx *s = avctx->priv_data; int i; for (i = 0; i < WMAPRO_BLOCK_SIZES; i++) @@ -261,7 +261,7 @@ static av_cold int decode_end(AVCodecCon */ static av_cold int decode_init(AVCodecContext *avctx) { - WMA3DecodeContext *s = avctx->priv_data; + WMAProDecodeCtx *s = avctx->priv_data; uint8_t *edata_ptr = avctx->extradata; unsigned int channel_mask; int i; @@ -452,7 +452,7 @@ static av_cold int decode_init(AVCodecCo *@param offset sample offset in the frame *@return decoded subframe length on success, < 0 in case of an error */ -static int decode_subframe_length(WMA3DecodeContext *s, int offset) +static int decode_subframe_length(WMAProDecodeCtx *s, int offset) { int frame_len_shift = 0; int subframe_len; @@ -500,7 +500,7 @@ static int decode_subframe_length(WMA3De *@param s context *@return 0 on success, < 0 in case of an error */ -static int decode_tilehdr(WMA3DecodeContext *s) +static int decode_tilehdr(WMAProDecodeCtx *s) { uint16_t num_samples[WMAPRO_MAX_CHANNELS]; /** sum of samples for all currently known subframes of a channel */ uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; /** flag indicating if a channel contains the current subframe */ @@ -547,7 +547,7 @@ static int decode_tilehdr(WMA3DecodeCont /** add subframes to the individual channels and find new min_channel_len */ min_channel_len += subframe_len; for (c = 0; c < s->num_channels; c++) { - WMA3ChannelCtx* chan = &s->channel[c]; + WMAProChannelCtx* chan = &s->channel[c]; if (contains_subframe[c]) { if (chan->num_subframes >= MAX_SUBFRAMES) { @@ -592,8 +592,8 @@ static int decode_tilehdr(WMA3DecodeCont *@param s codec context *@param chgroup channel group for which the matrix needs to be calculated */ -static void decode_decorrelation_matrix(WMA3DecodeContext *s, - WMA3ChannelGroup *chgroup) +static void decode_decorrelation_matrix(WMAProDecodeCtx *s, + WMAProChannelGrp *chgroup) { int i; int offset = 0; @@ -642,7 +642,7 @@ static void decode_decorrelation_matrix( *@param s codec context *@return 0 in case of success, < 0 in case of bitstream errors */ -static int decode_channel_transform(WMA3DecodeContext* s) +static int decode_channel_transform(WMAProDecodeCtx* s) { int i; /* should never consume more than 1921 bits for the 8 channel case @@ -663,7 +663,7 @@ static int decode_channel_transform(WMA3 for (s->num_chgroups = 0; remaining_channels && s->num_chgroups < s->channels_for_cur_subframe; s->num_chgroups++) { - WMA3ChannelGroup* chgroup = &s->chgroup[s->num_chgroups]; + WMAProChannelGrp* chgroup = &s->chgroup[s->num_chgroups]; float** channel_data = chgroup->channel_data; chgroup->num_channels = 0; chgroup->transform = 0; @@ -755,11 +755,11 @@ static int decode_channel_transform(WMA3 *@param c current channel number *@return 0 on success, < 0 in case of bitstream errors */ -static int decode_coeffs(WMA3DecodeContext *s, int c) +static int decode_coeffs(WMAProDecodeCtx *s, int c) { int vlctable; VLC* vlc; - WMA3ChannelCtx* ci = &s->channel[c]; + WMAProChannelCtx* ci = &s->channel[c]; int rl_mode = 0; int cur_coeff = 0; int num_zeros = 0; @@ -845,7 +845,7 @@ static int decode_coeffs(WMA3DecodeConte *@param s codec context *@return 0 on success, < 0 in case of bitstream errors */ -static int decode_scale_factors(WMA3DecodeContext* s) +static int decode_scale_factors(WMAProDecodeCtx* s) { int i; @@ -936,7 +936,7 @@ static int decode_scale_factors(WMA3Deco *@brief Reconstruct the individual channel data. *@param s codec context */ -static void inverse_channel_transform(WMA3DecodeContext *s) +static void inverse_channel_transform(WMAProDecodeCtx *s) { int i; @@ -988,7 +988,7 @@ static void inverse_channel_transform(WM *@brief Apply sine window and reconstruct the output buffer. *@param s codec context */ -static void wmapro_window(WMA3DecodeContext *s) +static void wmapro_window(WMAProDecodeCtx *s) { int i; for (i = 0; i< s->channels_for_cur_subframe; i++) { @@ -1018,7 +1018,7 @@ static void wmapro_window(WMA3DecodeCont *@param s codec context *@return 0 on success, < 0 when decoding failed */ -static int decode_subframe(WMA3DecodeContext *s) +static int decode_subframe(WMAProDecodeCtx *s) { int offset = s->samples_per_frame; int subframe_len = s->samples_per_frame; @@ -1242,7 +1242,7 @@ static int decode_subframe(WMA3DecodeCon *@return 0 if the trailer bit indicates that this is the last frame, * 1 if there are additional frames */ -static int decode_frame(WMA3DecodeContext *s) +static int decode_frame(WMAProDecodeCtx *s) { GetBitContext* gb = &s->gb; int more_frames = 0; @@ -1369,7 +1369,7 @@ static int decode_frame(WMA3DecodeContex *@param gb bitstream reader context *@return remaining size in bits */ -static int remaining_bits(WMA3DecodeContext *s, GetBitContext* gb) +static int remaining_bits(WMAProDecodeCtx *s, GetBitContext* gb) { return s->buf_bit_size - get_bits_count(gb); } @@ -1381,7 +1381,7 @@ static int remaining_bits(WMA3DecodeCont *@param len length of the partial frame *@param append decides wether to reset the buffer or not */ -static void save_bits(WMA3DecodeContext *s, GetBitContext* gb, int len, +static void save_bits(WMAProDecodeCtx *s, GetBitContext* gb, int len, int append) { int buflen; @@ -1437,7 +1437,7 @@ static int decode_packet(AVCodecContext void *data, int *data_size, AVPacket* avpkt) { GetBitContext gb; - WMA3DecodeContext *s = avctx->priv_data; + WMAProDecodeCtx *s = avctx->priv_data; const uint8_t* buf = avpkt->data; int buf_size = avpkt->size; int more_frames = 1; @@ -1528,7 +1528,7 @@ static int decode_packet(AVCodecContext */ static void flush(AVCodecContext *avctx) { - WMA3DecodeContext *s = avctx->priv_data; + WMAProDecodeCtx *s = avctx->priv_data; int i; /** reset output buffer as a part of it is used during the windowing of a new frame */ @@ -1546,7 +1546,7 @@ AVCodec wmapro_decoder = { "wmapro", CODEC_TYPE_AUDIO, CODEC_ID_WMAPRO, - sizeof(WMA3DecodeContext), + sizeof(WMAProDecodeCtx), decode_init, NULL, decode_end,

1 0

[soc]: r5371 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 20:07:50 2009 New Revision: 5371 Log: let decode_subframe_length return < 0 in case of errors Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 20:00:54 2009 (r5370) +++ wmapro/wmaprodec.c Mon Aug 31 20:07:50 2009 (r5371) @@ -450,7 +450,7 @@ static av_cold int decode_init(AVCodecCo *@brief Decode the subframe length. *@param s context *@param offset sample offset in the frame - *@return decoded subframe length on success, 0 in case of an error + *@return decoded subframe length on success, < 0 in case of an error */ static int decode_subframe_length(WMA3DecodeContext *s, int offset) { @@ -475,7 +475,7 @@ static int decode_subframe_length(WMA3De || subframe_len > s->samples_per_frame) { av_log(s->avctx, AV_LOG_ERROR, "broken frame: subframe_len %i\n", subframe_len); - return 0; + return AVERROR_INVALIDDATA; } return subframe_len; } @@ -541,7 +541,7 @@ static int decode_tilehdr(WMA3DecodeCont } /** get subframe length */ - if (!(subframe_len = decode_subframe_length(s, min_channel_len))) + if ((subframe_len = decode_subframe_length(s, min_channel_len)) <= 0) return AVERROR_INVALIDDATA; /** add subframes to the individual channels and find new min_channel_len */

3 4

[soc]: r5374 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 20:57:35 2009 New Revision: 5374 Log: add some more doxygen comments to decode_tilehdr Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 20:35:11 2009 (r5373) +++ wmapro/wmaprodec.c Mon Aug 31 20:57:35 2009 (r5374) @@ -502,11 +502,11 @@ static int decode_subframe_length(WMA3De */ static int decode_tilehdr(WMA3DecodeContext *s) { - uint16_t num_samples[WMAPRO_MAX_CHANNELS]; - uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; - int channels_for_cur_subframe = s->num_channels; - int fixed_channel_layout = 0; - int min_channel_len = 0; + uint16_t num_samples[WMAPRO_MAX_CHANNELS]; /** sum of samples for all currently known subframes of a channel */ + uint8_t contains_subframe[WMAPRO_MAX_CHANNELS]; /** flag indicating if a channel contains the current subframe */ + int channels_for_cur_subframe = s->num_channels; /** number of channels that contain the current subframe */ + int fixed_channel_layout = 0; /** flag indicating that all channels use the same subframe offsets and sizes */ + int min_channel_len = 0; /** smallest sum of samples (channels with this length will be processed first) */ int c; /* Should never consume more than 3073 bits (256 iterations for the @@ -540,7 +540,7 @@ static int decode_tilehdr(WMA3DecodeCont contains_subframe[c] = 0; } - /** get subframe length */ + /** get subframe length, subframe_len == 0 is not allowed */ if ((subframe_len = decode_subframe_length(s, min_channel_len)) <= 0) return AVERROR_INVALIDDATA;

1 0

[soc]: r5373 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 20:35:11 2009 New Revision: 5373 Log: zero output buffer only when needed Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 20:12:15 2009 (r5372) +++ wmapro/wmaprodec.c Mon Aug 31 20:35:11 2009 (r5373) @@ -817,6 +817,7 @@ static int decode_coeffs(WMA3DecodeConte ci->coeffs[cur_coeff] = (vals[i]^sign) - sign; num_zeros = 0; } else { + ci->coeffs[cur_coeff] = 0; /** switch to run level mode when subframe_len / 128 zeros were found in a row */ rl_mode |= (++num_zeros > s->subframe_len>>8); @@ -827,6 +828,8 @@ static int decode_coeffs(WMA3DecodeConte /** decode run level coded coefficients */ if (rl_mode) { + memset(&ci->coeffs[cur_coeff], 0, + sizeof(*ci->coeffs) * (s->subframe_len - cur_coeff)); if (ff_wma_run_level_decode(s->avctx, &s->gb, vlc, level, run, 1, ci->coeffs, cur_coeff, s->subframe_len, @@ -1081,8 +1084,6 @@ static int decode_subframe(WMA3DecodeCon s->channel[c].coeffs = &s->channel[c].out[(s->samples_per_frame>>1) + offset]; - memset(s->channel[c].coeffs, 0, - sizeof(*s->channel[c].coeffs) * subframe_len); } s->subframe_len = subframe_len; @@ -1178,8 +1179,11 @@ static int decode_subframe(WMA3DecodeCon for (i = 0; i < s->channels_for_cur_subframe; i++) { int c = s->channel_indexes_for_cur_subframe[i]; if (s->channel[c].transmit_coefs && - get_bits_count(&s->gb) < s->num_saved_bits) + get_bits_count(&s->gb) < s->num_saved_bits) { decode_coeffs(s, c); + } else + memset(s->channel[c].coeffs, 0, + sizeof(*s->channel[c].coeffs) * subframe_len); } dprintf(s->avctx, "BITSTREAM: subframe length was %i\n",

1 0

[soc]: r5372 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 20:12:15 2009 New Revision: 5372 Log: rename log2_subframe_len variable as it is not the same as log2(subframe_len) Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Mon Aug 31 20:07:50 2009 (r5371) +++ wmapro/wmaprodec.c Mon Aug 31 20:12:15 2009 (r5372) @@ -454,7 +454,7 @@ static av_cold int decode_init(AVCodecCo */ static int decode_subframe_length(WMA3DecodeContext *s, int offset) { - int log2_subframe_len = 0; + int frame_len_shift = 0; int subframe_len; /** no need to read from the bitstream when only one length is possible */ @@ -464,11 +464,11 @@ static int decode_subframe_length(WMA3De /** 1 bit indicates if the subframe is of maximum length */ if (s->max_subframe_len_bit) { if (get_bits1(&s->gb)) - log2_subframe_len = 1 + get_bits(&s->gb, s->subframe_len_bits-1); + frame_len_shift = 1 + get_bits(&s->gb, s->subframe_len_bits-1); } else - log2_subframe_len = get_bits(&s->gb, s->subframe_len_bits); + frame_len_shift = get_bits(&s->gb, s->subframe_len_bits); - subframe_len = s->samples_per_frame >> log2_subframe_len; + subframe_len = s->samples_per_frame >> frame_len_shift; /** sanity check the length */ if (subframe_len < s->min_samples_per_subframe

1 0

[soc]: r5370 - wmapro/wmaprodec.c
by faust3 31 Aug '09

31 Aug '09

Author: faust3 Date: Mon Aug 31 20:00:54 2009 New Revision: 5370 Log: simplify subframe_len calculation Modified: wmapro/wmaprodec.c Modified: wmapro/wmaprodec.c ============================================================================== --- wmapro/wmaprodec.c Sun Aug 30 01:27:51 2009 (r5369) +++ wmapro/wmaprodec.c Mon Aug 31 20:00:54 2009 (r5370) @@ -468,7 +468,7 @@ static int decode_subframe_length(WMA3De } else log2_subframe_len = get_bits(&s->gb, s->subframe_len_bits); - subframe_len = s->samples_per_frame / (1 << log2_subframe_len); + subframe_len = s->samples_per_frame >> log2_subframe_len; /** sanity check the length */ if (subframe_len < s->min_samples_per_subframe

1 0

[soc]: r5369 - concat/libavformat/avplaylist.c
by gkovacs 30 Aug '09

30 Aug '09

Author: gkovacs Date: Sun Aug 30 01:27:51 2009 New Revision: 5369 Log: provide error message when av_playlist_remove_item is invoked with an item index outside the playlist's size Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 01:23:52 2009 (r5368) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:27:51 2009 (r5369) @@ -139,8 +139,12 @@ int av_playlist_remove_item(AVPlaylistCo unsigned int *nb_streams_list_tmp; AVFormatContext **formatcontext_list_tmp; char **flist_tmp; - if (pos >= ctx->pelist_size || !ctx->flist || !ctx->durations || !ctx->nb_streams_list) + if (pos >= ctx->pelist_size || !ctx->flist || !ctx->durations || !ctx->nb_streams_list) { + av_log(NULL, AV_LOG_ERROR, + "failed to remove item %d which is not present in playlist\n", + pos); return AVERROR_INVALIDDATA; + } --ctx->pelist_size; av_free(ctx->flist[pos]); for (i = pos; i < ctx->pelist_size; ++i)

1 0

[soc]: r5368 - concat/libavformat/avplaylist.c
by gkovacs 30 Aug '09

30 Aug '09

Author: gkovacs Date: Sun Aug 30 01:23:52 2009 New Revision: 5368 Log: remove unneeded parentheses Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 01:18:55 2009 (r5367) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:23:52 2009 (r5368) @@ -49,7 +49,8 @@ int av_playlist_insert_item(AVPlaylistCo AVFormatContext **formatcontext_list_tmp; char **flist_tmp; AVFormatContext *ic; - flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size)); + ++ctx->pelist_size; + flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * ctx->pelist_size); if (!flist_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_insert_item\n"); @@ -57,7 +58,7 @@ int av_playlist_insert_item(AVPlaylistCo } else ctx->flist = flist_tmp; durations_tmp = av_realloc(ctx->durations, - sizeof(*(ctx->durations)) * (ctx->pelist_size)); + sizeof(*(ctx->durations)) * ctx->pelist_size); if (!durations_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for durations in av_playlist_insert_item\n"); @@ -65,7 +66,7 @@ int av_playlist_insert_item(AVPlaylistCo } else ctx->durations = durations_tmp; nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, - sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size)); + sizeof(*(ctx->nb_streams_list)) * ctx->pelist_size); if (!nb_streams_list_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for nb_streams_list in av_playlist_insert_item\n"); @@ -73,7 +74,7 @@ int av_playlist_insert_item(AVPlaylistCo } else ctx->nb_streams_list = nb_streams_list_tmp; formatcontext_list_tmp = av_realloc(ctx->formatcontext_list, - sizeof(*(ctx->formatcontext_list)) * (ctx->pelist_size)); + sizeof(*(ctx->formatcontext_list)) * ctx->pelist_size); if (!formatcontext_list_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for formatcontext_list in av_playlist_insert_item\n"); @@ -144,7 +145,7 @@ int av_playlist_remove_item(AVPlaylistCo av_free(ctx->flist[pos]); for (i = pos; i < ctx->pelist_size; ++i) ctx->flist[i] = ctx->flist[i + 1]; - flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (ctx->pelist_size)); + flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * ctx->pelist_size); if (!flist_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_remove_item\n"); @@ -158,7 +159,7 @@ int av_playlist_remove_item(AVPlaylistCo for (i = pos; i < ctx->pelist_size; ++i) ctx->durations[i] = ctx->durations[i + 1] - cur_offset; durations_tmp = av_realloc(ctx->durations, - sizeof(*(ctx->durations)) * (ctx->pelist_size)); + sizeof(*(ctx->durations)) * ctx->pelist_size); if (!durations_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for durations in av_playlist_remove_item\n"); @@ -172,7 +173,7 @@ int av_playlist_remove_item(AVPlaylistCo for (i = pos; i < ctx->pelist_size; ++i) ctx->nb_streams_list[i] = ctx->nb_streams_list[i + 1] - cur_offset; nb_streams_list_tmp = av_realloc(ctx->nb_streams_list, - sizeof(*(ctx->nb_streams_list)) * (ctx->pelist_size)); + sizeof(*(ctx->nb_streams_list)) * ctx->pelist_size); if (!nb_streams_list_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for nb_stream_list in av_playlist_remove_item\n"); @@ -188,7 +189,7 @@ int av_playlist_remove_item(AVPlaylistCo for (i = pos; i < ctx->pelist_size; ++i) ctx->formatcontext_list[i] = ctx->formatcontext_list[i + 1]; formatcontext_list_tmp = av_realloc(ctx->formatcontext_list, - sizeof(*(ctx->formatcontext_list)) * (ctx->pelist_size)); + sizeof(*(ctx->formatcontext_list)) * ctx->pelist_size); if (!formatcontext_list_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for formatcontext_list in av_playlist_remove_item\n");

1 0

[soc]: r5367 - concat/libavformat/avplaylist.c
by gkovacs 30 Aug '09

30 Aug '09

Author: gkovacs Date: Sun Aug 30 01:18:55 2009 New Revision: 5367 Log: fix indexing issue while shifting flist down in remove_item Modified: concat/libavformat/avplaylist.c Modified: concat/libavformat/avplaylist.c ============================================================================== --- concat/libavformat/avplaylist.c Sun Aug 30 01:16:28 2009 (r5366) +++ concat/libavformat/avplaylist.c Sun Aug 30 01:18:55 2009 (r5367) @@ -140,10 +140,11 @@ int av_playlist_remove_item(AVPlaylistCo char **flist_tmp; if (pos >= ctx->pelist_size || !ctx->flist || !ctx->durations || !ctx->nb_streams_list) return AVERROR_INVALIDDATA; + --ctx->pelist_size; av_free(ctx->flist[pos]); for (i = pos; i < ctx->pelist_size; ++i) ctx->flist[i] = ctx->flist[i + 1]; - flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (--ctx->pelist_size)); + flist_tmp = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (ctx->pelist_size)); if (!flist_tmp) { av_log(NULL, AV_LOG_ERROR, "av_realloc error for flist in av_playlist_remove_item\n");

1 0