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

r18959 - in trunk: libavcodec/mpeg12.c tests/seek.regression.ref
by subversion＠mplayerhq.hu 18 Jun '09

18 Jun '09

Author: bcoudurier Date: Wed May 27 02:14:32 2009 New Revision: 18959 Log: Fix off by one offset with fetch_timestamps, pts_parser_problem.mpg. Patch by Wolfram Gloger, wmglo at dentm dot med dot uni-muenchen dot de. Modified: trunk/libavcodec/mpeg12.c trunk/tests/seek.regression.ref Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c Wed May 27 01:58:30 2009 (r18958) +++ trunk/libavcodec/mpeg12.c Wed May 27 02:14:32 2009 (r18959) @@ -2226,7 +2226,7 @@ int ff_mpeg1_find_frame_end(ParseContext } } if(s && state == PICTURE_START_CODE){ - ff_fetch_timestamp(s, i-4, 1); + ff_fetch_timestamp(s, i-3, 1); } } } Modified: trunk/tests/seek.regression.ref ============================================================================== --- trunk/tests/seek.regression.ref Wed May 27 01:58:30 2009 (r18958) +++ trunk/tests/seek.regression.ref Wed May 27 02:14:32 2009 (r18959) @@ -3601,9 +3601,9 @@ ret: 0 st: 0 dts:0.660000 pts:0.700000 p ret: 0 st:-1 ts:-1.000000 flags:0 ret: 0 st: 0 dts:0.043533 pts:-102481911520608.625000 pos:29328 size:21852 flags:1 ret: 0 st:-1 ts:1.894167 flags:1 -ret: 0 st: 0 dts:1.879533 pts:-102481911520608.625000 pos:-1 size:14260 flags:0 +ret: 0 st: 0 dts:0.780000 pts:0.820000 pos:65800 size:14260 flags:0 ret: 0 st: 0 ts:0.788333 flags:0 -ret: 0 st: 0 dts:0.788733 pts:-102481911520608.625000 pos:-1 size:16309 flags:0 +ret: 0 st: 0 dts:0.700000 pts:0.740000 pos:29328 size:16309 flags:0 ret: 0 st: 0 ts:-0.317500 flags:1 ret: 0 st: 0 dts:0.027333 pts:-102481911520608.625000 pos:48504 size:21852 flags:1 ret: 0 st: 1 ts:2.576667 flags:0 @@ -3621,7 +3621,7 @@ ret: 0 st: 0 dts:1.037133 pts:-102481911 ret: 0 st: 1 ts:-0.058333 flags:0 ret: 0 st: 0 dts:0.043533 pts:-102481911520608.625000 pos:48504 size:21852 flags:1 ret: 0 st: 1 ts:2.835833 flags:1 -ret: 0 st: 0 dts:2.819133 pts:-102481911520608.625000 pos:-1 size:12495 flags:0 +ret: 0 st: 0 dts:0.860000 pts:0.900000 pos:98512 size:12495 flags:0 ret: 0 st:-1 ts:1.730004 flags:0 ret: 0 st: 0 dts:1.755333 pts:-102481911520608.625000 pos:113176 size:852 flags:1 ret: 0 st:-1 ts:0.624171 flags:1 @@ -3631,7 +3631,7 @@ ret: 0 st: 0 dts:0.043533 pts:-102481911 ret: 0 st: 0 ts:2.412500 flags:1 ret: 0 st: 0 dts:2.408733 pts:-102481911520608.625000 pos:29328 size:9604 flags:1 ret: 0 st: 1 ts:1.306667 flags:0 -ret: 0 st: 0 dts:1.317933 pts:-102481911520608.625000 pos:-1 size:14617 flags:0 +ret: 0 st: 0 dts:0.740000 pts:0.780000 pos:48504 size:14617 flags:0 ret: 0 st: 1 ts:0.200844 flags:1 ret: 0 st: 0 dts:0.200133 pts:-102481911520608.625000 pos:65800 size:18588 flags:1 ret: 0 st:-1 ts:-0.904994 flags:0

7 15

r18936 - in trunk/libavcodec: Makefile mlpdsp.c
by subversion＠mplayerhq.hu 03 Jun '09

03 Jun '09

Author: ramiro Date: Mon May 25 03:53:43 2009 New Revision: 18936 Log: mlp: Re-enable x86-optimized DSP functions. Modified: trunk/libavcodec/Makefile trunk/libavcodec/mlpdsp.c Modified: trunk/libavcodec/Makefile ============================================================================== --- trunk/libavcodec/Makefile Mon May 25 03:52:05 2009 (r18935) +++ trunk/libavcodec/Makefile Mon May 25 03:53:43 2009 (r18936) @@ -445,8 +445,10 @@ MMX-OBJS-$(CONFIG_CAVS_DECODER) + MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o MMX-OBJS-$(CONFIG_FLAC_ENCODER) += x86/flacdsp_mmx.o MMX-OBJS-$(CONFIG_GPL) += x86/idct_mmx.o +MMX-OBJS-$(CONFIG_MLP_DECODER) += x86/mlpdsp.o MMX-OBJS-$(CONFIG_SNOW_DECODER) += x86/snowdsp_mmx.o MMX-OBJS-$(CONFIG_THEORA_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o +MMX-OBJS-$(CONFIG_TRUEHD_DECODER) += x86/mlpdsp.o MMX-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_mmx.o MMX-OBJS-$(CONFIG_VP3_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o MMX-OBJS-$(CONFIG_VP5_DECODER) += x86/vp3dsp_mmx.o x86/vp3dsp_sse2.o Modified: trunk/libavcodec/mlpdsp.c ============================================================================== --- trunk/libavcodec/mlpdsp.c Mon May 25 03:52:05 2009 (r18935) +++ trunk/libavcodec/mlpdsp.c Mon May 25 03:53:43 2009 (r18936) @@ -55,7 +55,11 @@ static void ff_mlp_filter_channel(int32_ } } +void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); + void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) { c->mlp_filter_channel = ff_mlp_filter_channel; + if (ARCH_X86) + ff_mlp_init_x86(c, avctx); }

6 10

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

31 May '09

Author: reimar Date: Sun May 31 12:14:27 2009 New Revision: 19045 Log: Fix decoding of multithread-encoded lcl files on big-endian. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:05:21 2009 (r19044) +++ trunk/libavcodec/lcldec.c Sun May 31 12:14:27 2009 (r19045) @@ -189,9 +189,9 @@ static int decode_frame(AVCodecContext * switch (c->compression) { case COMP_MSZH: if (c->flags & FLAG_MULTITHREAD) { - mthread_inlen = *(unsigned int*)encoded; + mthread_inlen = AV_RL32(encoded); mthread_inlen = FFMIN(mthread_inlen, len - 8); - mthread_outlen = *(unsigned int*)(encoded+4); + mthread_outlen = AV_RL32(encoded+4); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); mszh_dlen = mszh_decomp(encoded + 8, mthread_inlen, c->decomp_buf, c->decomp_size); if (mthread_outlen != mszh_dlen) { @@ -236,9 +236,9 @@ static int decode_frame(AVCodecContext * break; if (c->flags & FLAG_MULTITHREAD) { int ret; - mthread_inlen = *(unsigned int*)encoded; + mthread_inlen = AV_RL32(encoded); mthread_inlen = FFMIN(mthread_inlen, len - 8); - mthread_outlen = *(unsigned int*)(encoded+4); + mthread_outlen = AV_RL32(encoded+4); mthread_outlen = FFMIN(mthread_outlen, c->decomp_size); ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen); if (ret < 0) return ret;

3 2

No subject
by bogus＠does.not.exist.com 31 May '09

31 May '09

1 0

No subject
by bogus＠does.not.exist.com 31 May '09

31 May '09

a _Complex or _Imaginary type complex p[MAXORDER + 1];

1 0

No subject
by bogus＠does.not.exist.com 31 May '09

31 May '09

1 0

r19071 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: ramiro Date: Sun May 31 22:19:16 2009 New Revision: 19071 Log: indent Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Sun May 31 22:17:58 2009 (r19070) +++ trunk/ffmpeg.c Sun May 31 22:19:16 2009 (r19071) @@ -760,14 +760,14 @@ static void pre_process_video_frame(AVIn picture2 = &picture_tmp; avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height); - if(avpicture_deinterlace(picture2, picture, - dec->pix_fmt, dec->width, dec->height) < 0) { - /* if error, do not deinterlace */ - fprintf(stderr, "Deinterlacing failed\n"); - av_free(buf); - buf = NULL; - picture2 = picture; - } + if(avpicture_deinterlace(picture2, picture, + dec->pix_fmt, dec->width, dec->height) < 0) { + /* if error, do not deinterlace */ + fprintf(stderr, "Deinterlacing failed\n"); + av_free(buf); + buf = NULL; + picture2 = picture; + } } else { picture2 = picture; }

1 0

r19070 - trunk/ffmpeg.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: ramiro Date: Sun May 31 22:17:58 2009 New Revision: 19070 Log: Remove useless if(), leftover from the vhook removal. Modified: trunk/ffmpeg.c Modified: trunk/ffmpeg.c ============================================================================== --- trunk/ffmpeg.c Sun May 31 21:51:21 2009 (r19069) +++ trunk/ffmpeg.c Sun May 31 22:17:58 2009 (r19070) @@ -760,7 +760,6 @@ static void pre_process_video_frame(AVIn picture2 = &picture_tmp; avpicture_fill(picture2, buf, dec->pix_fmt, dec->width, dec->height); - if (do_deinterlace){ if(avpicture_deinterlace(picture2, picture, dec->pix_fmt, dec->width, dec->height) < 0) { /* if error, do not deinterlace */ @@ -769,9 +768,6 @@ static void pre_process_video_frame(AVIn buf = NULL; picture2 = picture; } - } else { - av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); - } } else { picture2 = picture; }

1 0

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

31 May '09

Author: reimar Date: Sun May 31 11:51:46 2009 New Revision: 19040 Log: Factor out zlib decompression code to avoid massive code duplication, particularly due to error checks. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 11:28:29 2009 (r19039) +++ trunk/libavcodec/lcldec.c Sun May 31 11:51:46 2009 (r19040) @@ -115,6 +115,38 @@ static unsigned int mszh_decomp(unsigned } +/** + * \brief decompress a zlib-compressed data block into decomp_buf + * \param src compressed input buffer + * \param src_len data length in input buffer + * \param offset offset in decomp_buf + * \param expected expected decompressed length + */ +static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, int offset, int expected) +{ + LclDecContext *c = avctx->priv_data; + int zret = inflateReset(&c->zstream); + if (zret != Z_OK) { + av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); + return -1; + } + c->zstream.next_in = src; + c->zstream.avail_in = src_len; + c->zstream.next_out = c->decomp_buf + offset; + c->zstream.avail_out = c->decomp_size - offset; + zret = inflate(&c->zstream, Z_FINISH); + if (zret != Z_OK && zret != Z_STREAM_END) { + av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); + return -1; + } + if (expected != (unsigned int)c->zstream.total_out) { + av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n", + expected, c->zstream.total_out); + return -1; + } + return c->zstream.total_out; +} + /* * @@ -137,9 +169,6 @@ static int decode_frame(AVCodecContext * unsigned char yq, y1q, uq, vq; int uqvq; unsigned int mthread_inlen, mthread_outlen; -#if CONFIG_ZLIB_DECODER - int zret; // Zlib return code -#endif unsigned int len = buf_size; if(c->pic.data[0]) @@ -205,64 +234,20 @@ static int decode_frame(AVCodecContext * if (c->compression == COMP_ZLIB_NORMAL && c->imgtype == IMGTYPE_RGB24 && len == width * height * 3) break; - zret = inflateReset(&c->zstream); - if (zret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); - return -1; - } if (c->flags & FLAG_MULTITHREAD) { + int ret; mthread_inlen = *(unsigned int*)encoded; mthread_outlen = *(unsigned int*)(encoded+4); if (mthread_outlen > c->decomp_size) mthread_outlen = c->decomp_size; - c->zstream.next_in = encoded + 8; - c->zstream.avail_in = mthread_inlen; - c->zstream.next_out = c->decomp_buf; - c->zstream.avail_out = c->decomp_size; - zret = inflate(&c->zstream, Z_FINISH); - if (zret != Z_OK && zret != Z_STREAM_END) { - av_log(avctx, AV_LOG_ERROR, "Mthread1 inflate error: %d\n", zret); - return -1; - } - if (mthread_outlen != (unsigned int)c->zstream.total_out) { - av_log(avctx, AV_LOG_ERROR, "Mthread1 decoded size differs (%u != %lu)\n", - mthread_outlen, c->zstream.total_out); - return -1; - } - zret = inflateReset(&c->zstream); - if (zret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate reset error: %d\n", zret); - return -1; - } - c->zstream.next_in = encoded + 8 + mthread_inlen; - c->zstream.avail_in = len - mthread_inlen; - c->zstream.next_out = c->decomp_buf + mthread_outlen; - c->zstream.avail_out = c->decomp_size - mthread_outlen; - zret = inflate(&c->zstream, Z_FINISH); - if (zret != Z_OK && zret != Z_STREAM_END) { - av_log(avctx, AV_LOG_ERROR, "Mthread2 inflate error: %d\n", zret); - return -1; - } - if (mthread_outlen != (unsigned int)c->zstream.total_out) { - av_log(avctx, AV_LOG_ERROR, "Mthread2 decoded size differs (%d != %lu)\n", - mthread_outlen, c->zstream.total_out); - return -1; - } + ret = zlib_decomp(avctx, encoded + 8, mthread_inlen, 0, mthread_outlen); + if (ret < 0) return ret; + ret = zlib_decomp(avctx, encoded + 8 + mthread_inlen, len - mthread_inlen, + mthread_outlen, mthread_outlen); + if (ret < 0) return ret; } else { - c->zstream.next_in = encoded; - c->zstream.avail_in = len; - c->zstream.next_out = c->decomp_buf; - c->zstream.avail_out = c->decomp_size; - zret = inflate(&c->zstream, Z_FINISH); - if (zret != Z_OK && zret != Z_STREAM_END) { - av_log(avctx, AV_LOG_ERROR, "Inflate error: %d\n", zret); - return -1; - } - if (c->decomp_size != (unsigned int)c->zstream.total_out) { - av_log(avctx, AV_LOG_ERROR, "Decoded size differs (%d != %lu)\n", - c->decomp_size, c->zstream.total_out); - return -1; - } + int ret = zlib_decomp(avctx, encoded, len, 0, c->decomp_size); + if (ret < 0) return ret; } encoded = c->decomp_buf; len = c->decomp_size;

3 2

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

31 May '09

Author: reimar Date: Sun May 31 21:51:21 2009 New Revision: 19069 Log: add #if CONFIG_ZLIB_DECODER around zlib_decomp function. Fixes compilation when zlib is not available. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 20:17:33 2009 (r19068) +++ trunk/libavcodec/lcldec.c Sun May 31 21:51:21 2009 (r19069) @@ -124,6 +124,7 @@ static unsigned int mszh_decomp(const un * \param offset offset in decomp_buf * \param expected expected decompressed length */ +#if CONFIG_ZLIB_DECODER static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, int offset, int expected) { LclDecContext *c = avctx->priv_data; @@ -148,6 +149,7 @@ static int zlib_decomp(AVCodecContext *a } return c->zstream.total_out; } +#endif /*

1 0