May 2009 - ffmpeg-cvslog - lists.ffmpeg.org

r19068 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 20:17:33 2009 New Revision: 19068 Log: mszh decompression: add a special case for an all-0 mask, i.e. 32 uncompressed bytes in a row. About 15% faster mszh_decomp on an Atom N270 for http://samples.mplayerhq.hu/V-codecs/mszh-zlib/avimzsh_sample.avi Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 19:44:35 2009 (r19067) +++ trunk/libavcodec/lcldec.c Sun May 31 20:17:33 2009 (r19068) @@ -102,6 +102,13 @@ static unsigned int mszh_decomp(const un maskbit >>= 1; if (!maskbit) { mask = *srcptr++; + while (!mask) { + if (destptr_end - destptr < 32 || srcptr_end - srcptr < 32) break; + memcpy(destptr, srcptr, 32); + destptr += 32; + srcptr += 32; + mask = *srcptr++; + } maskbit = 0x80; } }

1 0

r19067 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 19:44:35 2009 New Revision: 19067 Log: lcldec: ensure that the offset for av_memcpy_backptr is valid. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 18:30:12 2009 (r19066) +++ trunk/libavcodec/lcldec.c Sun May 31 19:44:35 2009 (r19067) @@ -93,6 +93,7 @@ static unsigned int mszh_decomp(const un unsigned ofs = bytestream_get_le16(&srcptr); unsigned cnt = (ofs >> 11) + 1; ofs &= 0x7ff; + ofs = FFMIN(ofs, destptr - destptr_bak); cnt *= 4; cnt = FFMIN(cnt, destptr_end - destptr); av_memcpy_backptr(destptr, ofs, cnt);

1 0

r19066 - in trunk/libavfilter: avfiltergraph.c avfiltergraph.h
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: stefano Date: Sun May 31 18:30:12 2009 New Revision: 19066 Log: Implement avfilter_graph_config_links(). Modified: trunk/libavfilter/avfiltergraph.c trunk/libavfilter/avfiltergraph.h Modified: trunk/libavfilter/avfiltergraph.c ============================================================================== --- trunk/libavfilter/avfiltergraph.c Sun May 31 13:50:30 2009 (r19065) +++ trunk/libavfilter/avfiltergraph.c Sun May 31 18:30:12 2009 (r19066) @@ -77,6 +77,23 @@ int avfilter_graph_check_validity(AVFilt return 0; } +int avfilter_graph_config_links(AVFilterGraph *graph, AVClass *log_ctx) +{ + AVFilterContext *filt; + int i, ret; + + for (i=0; i < graph->filter_count; i++) { + filt = graph->filters[i]; + + if (!filt->output_count) { + if ((ret = avfilter_config_links(filt))) + return ret; + } + } + + return 0; +} + AVFilterContext *avfilter_graph_get_filter(AVFilterGraph *graph, char *name) { int i; Modified: trunk/libavfilter/avfiltergraph.h ============================================================================== --- trunk/libavfilter/avfiltergraph.h Sun May 31 13:50:30 2009 (r19065) +++ trunk/libavfilter/avfiltergraph.h Sun May 31 18:30:12 2009 (r19066) @@ -57,6 +57,13 @@ int avfilter_graph_add_filter(AVFilterGr int avfilter_graph_check_validity(AVFilterGraph *graphctx, AVClass *log_ctx); /** + * Configures all the links of graphctx. + * + * @return 0 in case of success, a negative value otherwise + */ +int avfilter_graph_config_links(AVFilterGraph *graphctx, AVClass *log_ctx); + +/** * Configures the formats of all the links in the graph. */ int avfilter_graph_config_formats(AVFilterGraph *graphctx);

1 0

r19018 - trunk/libavformat/mov.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: bcoudurier Date: Sun May 31 06:36:26 2009 New Revision: 19018 Log: split audio chunks in mov demuxer Modified: trunk/libavformat/mov.c Modified: trunk/libavformat/mov.c ============================================================================== --- trunk/libavformat/mov.c Sun May 31 06:35:05 2009 (r19017) +++ trunk/libavformat/mov.c Sun May 31 06:36:26 2009 (r19018) @@ -1403,49 +1403,47 @@ static void mov_build_index(MOVContext * } } } - } else { /* read whole chunk */ - unsigned int chunk_samples, chunk_size, chunk_duration; - unsigned int frames = 1; + } else { for (i = 0; i < sc->chunk_count; i++) { + unsigned chunk_samples; + current_offset = sc->chunk_offsets[i]; if (stsc_index + 1 < sc->stsc_count && i + 1 == sc->stsc_data[stsc_index + 1].first) stsc_index++; chunk_samples = sc->stsc_data[stsc_index].count; - /* get chunk size, beware of alaw/ulaw/mace */ - if (sc->samples_per_frame > 0 && - (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0)) { - if (sc->samples_per_frame < 160) - chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame; - else { - chunk_size = sc->bytes_per_frame; - frames = chunk_samples / sc->samples_per_frame; - chunk_samples = sc->samples_per_frame; - } - } else - chunk_size = chunk_samples * sc->sample_size; - for (j = 0; j < frames; j++) { - av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME); - /* get chunk duration */ - chunk_duration = 0; - while (chunk_samples > 0) { - if (chunk_samples < sc->stts_data[stts_index].count) { - chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; - sc->stts_data[stts_index].count -= chunk_samples; - break; + + if (sc->samples_per_frame && chunk_samples % sc->samples_per_frame) { + av_log(mov->fc, AV_LOG_ERROR, "error unaligned chunk\n"); + return; + } + + while (chunk_samples > 0) { + unsigned size, samples; + + if (sc->samples_per_frame >= 160) { // gsm + samples = sc->samples_per_frame; + size = sc->bytes_per_frame; + } else { + if (sc->samples_per_frame > 1) { + samples = FFMIN((1024 / sc->samples_per_frame)* + sc->samples_per_frame, chunk_samples); + size = (samples / sc->samples_per_frame) * sc->bytes_per_frame; } else { - chunk_duration += sc->stts_data[stts_index].duration * chunk_samples; - chunk_samples -= sc->stts_data[stts_index].count; - if (stts_index + 1 < sc->stts_count) - stts_index++; + samples = FFMIN(1024, chunk_samples); + size = samples * sc->sample_size; } } + + av_add_index_entry(st, current_offset, current_dts, size, 0, AVINDEX_KEYFRAME); dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", " "size %d, duration %d\n", st->index, i, current_offset, current_dts, - chunk_size, chunk_duration); - current_offset += sc->bytes_per_frame; - assert(chunk_duration % sc->time_rate == 0); - current_dts += chunk_duration / sc->time_rate; + size, samples); + + current_offset += size; + assert(samples % sc->time_rate == 0); + current_dts += samples / sc->time_rate; + chunk_samples -= samples; } } }

4 6

r19011 - trunk/libavformat/mpegts.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: bcoudurier Date: Sun May 31 05:55:23 2009 New Revision: 19011 Log: add streams even if they are not present in PMT, fix #1092 and #835 Modified: trunk/libavformat/mpegts.c Modified: trunk/libavformat/mpegts.c ============================================================================== --- trunk/libavformat/mpegts.c Sun May 31 05:46:24 2009 (r19010) +++ trunk/libavformat/mpegts.c Sun May 31 05:55:23 2009 (r19011) @@ -540,7 +540,7 @@ static void mpegts_find_stream_type(AVSt } } -static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc) +static AVStream *new_pes_av_stream(PESContext *pes, uint32_t prog_reg_desc, uint32_t code) { AVStream *st = av_new_stream(pes->stream, pes->pid); @@ -564,6 +564,17 @@ static AVStream *new_pes_av_stream(PESCo if (st->codec->codec_id == CODEC_ID_PROBE) mpegts_find_stream_type(st, pes->stream_type, MISC_types); + /* stream was not present in PMT, guess based on PES start code */ + if (st->codec->codec_id == CODEC_ID_PROBE) { + if (code >= 0x1c0 && code <= 0x1df) { + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_MP2; + } else if (code == 0x1bd) { + st->codec->codec_type = CODEC_TYPE_AUDIO; + st->codec->codec_id = CODEC_ID_AC3; + } + } + return st; } @@ -642,7 +653,7 @@ static void pmt_cb(MpegTSFilter *filter, if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably pes = add_pes_stream(ts, pid, pcr_pid, stream_type); if (pes) - st = new_pes_av_stream(pes, prog_reg_desc); + st = new_pes_av_stream(pes, prog_reg_desc, 0); } if (!st) @@ -910,7 +921,14 @@ static int mpegts_push_data(MpegTSFilter pes->header[2] == 0x01) { /* it must be an mpeg2 PES stream */ code = pes->header[3] | 0x100; - if (!pes->st || pes->st->discard == AVDISCARD_ALL || + + /* stream not present in PMT */ + if (!pes->st) + pes->st = new_pes_av_stream(pes, 0, code); + if (!pes->st) + return AVERROR(ENOMEM); + + if (pes->st->discard == AVDISCARD_ALL || !((code >= 0x1c0 && code <= 0x1df) || (code >= 0x1e0 && code <= 0x1ef) || (code == 0x1bd) || (code == 0x1fd)))

2 1

r19065 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 13:50:30 2009 New Revision: 19065 Log: I will take care of the lcl de-/encoder while Roberto is unavailable. Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS Sun May 31 13:47:52 2009 (r19064) +++ trunk/MAINTAINERS Sun May 31 13:50:30 2009 (r19065) @@ -139,7 +139,7 @@ Codecs: interplayvideo.c Mike Melanson jpeg_ls.c Kostya Shishkov kmvc.c Kostya Shishkov - lcl*.c Roberto Togni + lcl*.c Roberto Togni, Reimar Doeffinger libgsm.c Michel Bardiaux libopenjpeg.c Jaikrishnan Menon libx264.c Mans Rullgard, Jason Garrett-Glaser

1 0

r19064 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 13:47:52 2009 New Revision: 19064 Log: Fix memleak due to c->decomp_buf never being freed. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 13:42:50 2009 (r19063) +++ trunk/libavcodec/lcldec.c Sun May 31 13:47:52 2009 (r19064) @@ -573,6 +573,7 @@ static av_cold int decode_init(AVCodecCo zret = inflateInit(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); + av_freep(&c->decomp_buf); return 1; } } @@ -590,6 +591,7 @@ static av_cold int decode_end(AVCodecCon { LclDecContext * const c = avctx->priv_data; + av_freep(&c->decomp_buf); if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); #if CONFIG_ZLIB_DECODER

1 0

r19063 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 13:42:50 2009 New Revision: 19063 Log: Only call inflateEnd when we were actually using the zlib code. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 13:41:49 2009 (r19062) +++ trunk/libavcodec/lcldec.c Sun May 31 13:42:50 2009 (r19063) @@ -593,7 +593,8 @@ static av_cold int decode_end(AVCodecCon if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); #if CONFIG_ZLIB_DECODER - inflateEnd(&c->zstream); + if (avctx->codec_id == CODEC_ID_ZLIB) + inflateEnd(&c->zstream); #endif return 0;

1 0

r19062 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 13:41:49 2009 New Revision: 19062 Log: avctx->priv_data is initialized to 0, get rid of useless extra initialization. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 13:35:20 2009 (r19061) +++ trunk/libavcodec/lcldec.c Sun May 31 13:41:49 2009 (r19062) @@ -443,13 +443,6 @@ static av_cold int decode_init(AVCodecCo unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4) + AV_LZO_OUTPUT_PADDING; unsigned int max_decomp_size; - c->pic.data[0] = NULL; - -#if CONFIG_ZLIB_DECODER - // Needed if zlib unused or init aborted before inflateInit - memset(&c->zstream, 0, sizeof(z_stream)); -#endif - if (avctx->extradata_size < 8) { av_log(avctx, AV_LOG_ERROR, "Extradata size too small.\n"); return 1;

1 0

r19061 - trunk/libavcodec/lcldec.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 13:35:20 2009 New Revision: 19061 Log: Merge variable declaration and initialization. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 13:34:19 2009 (r19060) +++ trunk/libavcodec/lcldec.c Sun May 31 13:35:20 2009 (r19061) @@ -83,7 +83,6 @@ static unsigned int mszh_decomp(const un const unsigned char *srcptr_end = srcptr + srclen; unsigned mask = *srcptr++; unsigned maskbit = 0x80; - unsigned int ofs, cnt; while (srcptr < srcptr_end && destptr < destptr_end) { if (!(mask & maskbit)) { @@ -91,8 +90,8 @@ static unsigned int mszh_decomp(const un destptr += 4; srcptr += 4; } else { - ofs = bytestream_get_le16(&srcptr); - cnt = (ofs >> 11) + 1; + unsigned ofs = bytestream_get_le16(&srcptr); + unsigned cnt = (ofs >> 11) + 1; ofs &= 0x7ff; cnt *= 4; cnt = FFMIN(cnt, destptr_end - destptr);

1 0