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

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

31 May '09

Author: reimar Date: Sun May 31 13:34:19 2009 New Revision: 19060 Log: Use int-size types instead of char where it makes no difference. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 13:32:03 2009 (r19059) +++ trunk/libavcodec/lcldec.c Sun May 31 13:34:19 2009 (r19060) @@ -81,8 +81,8 @@ static unsigned int mszh_decomp(const un unsigned char *destptr_bak = destptr; unsigned char *destptr_end = destptr + destsize; const unsigned char *srcptr_end = srcptr + srclen; - unsigned char mask = *srcptr++; - unsigned char maskbit = 0x80; + unsigned mask = *srcptr++; + unsigned maskbit = 0x80; unsigned int ofs, cnt; while (srcptr < srcptr_end && destptr < destptr_end) {

1 0

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

31 May '09

Author: reimar Date: Sun May 31 13:32:03 2009 New Revision: 19059 Log: Take advantage of available input padding to optimize mszh_decomp Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:58:20 2009 (r19058) +++ trunk/libavcodec/lcldec.c Sun May 31 13:32:03 2009 (r19059) @@ -73,7 +73,7 @@ typedef struct LclDecContext { /** - * \param srcptr compressed source buffer, must be padded with at least 4 extra bytes + * \param srcptr compressed source buffer, must be padded with at least 5 extra bytes * \param destptr must be padded sufficiently for av_memcpy_backptr */ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize) @@ -81,16 +81,11 @@ static unsigned int mszh_decomp(const un unsigned char *destptr_bak = destptr; unsigned char *destptr_end = destptr + destsize; const unsigned char *srcptr_end = srcptr + srclen; - unsigned char mask = 0; - unsigned char maskbit = 0; + unsigned char mask = *srcptr++; + unsigned char maskbit = 0x80; unsigned int ofs, cnt; while (srcptr < srcptr_end && destptr < destptr_end) { - if (maskbit == 0) { - mask = *srcptr++; - maskbit = 0x80; - continue; - } if (!(mask & maskbit)) { memcpy(destptr, srcptr, 4); destptr += 4; @@ -105,6 +100,10 @@ static unsigned int mszh_decomp(const un destptr += cnt; } maskbit >>= 1; + if (!maskbit) { + mask = *srcptr++; + maskbit = 0x80; + } } return destptr - destptr_bak;

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:58:20 2009 New Revision: 19058 Log: Change maskbit variable to contain (1 << maskbit) Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:53:47 2009 (r19057) +++ trunk/libavcodec/lcldec.c Sun May 31 12:58:20 2009 (r19058) @@ -88,10 +88,10 @@ static unsigned int mszh_decomp(const un while (srcptr < srcptr_end && destptr < destptr_end) { if (maskbit == 0) { mask = *srcptr++; - maskbit = 8; + maskbit = 0x80; continue; } - if ((mask & (1 << (--maskbit))) == 0) { + if (!(mask & maskbit)) { memcpy(destptr, srcptr, 4); destptr += 4; srcptr += 4; @@ -104,6 +104,7 @@ static unsigned int mszh_decomp(const un av_memcpy_backptr(destptr, ofs, cnt); destptr += cnt; } + maskbit >>= 1; } return destptr - destptr_bak;

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:53:47 2009 New Revision: 19057 Log: Remove check that thanks to padding is no longer necessary. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:50:54 2009 (r19056) +++ trunk/libavcodec/lcldec.c Sun May 31 12:53:47 2009 (r19057) @@ -92,8 +92,6 @@ static unsigned int mszh_decomp(const un continue; } if ((mask & (1 << (--maskbit))) == 0) { - if (destptr_end - destptr < 4) - break; memcpy(destptr, srcptr, 4); destptr += 4; srcptr += 4;

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:50:54 2009 New Revision: 19056 Log: 100l, the compression field in lcl extradata must be interpreted as int8_t, not uint8_t to allow -1 for "no compression". The original code worked, but only when char was signed. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:44:42 2009 (r19055) +++ trunk/libavcodec/lcldec.c Sun May 31 12:50:54 2009 (r19056) @@ -512,7 +512,7 @@ static av_cold int decode_init(AVCodecCo } /* Detect compression method */ - c->compression = avctx->extradata[5]; + c->compression = (int8_t)avctx->extradata[5]; switch (avctx->codec_id) { case CODEC_ID_MSZH: switch (c->compression) {

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:44:42 2009 New Revision: 19055 Log: One more use for FFMIN. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:42:26 2009 (r19054) +++ trunk/libavcodec/lcldec.c Sun May 31 12:44:42 2009 (r19055) @@ -102,9 +102,7 @@ static unsigned int mszh_decomp(const un cnt = (ofs >> 11) + 1; ofs &= 0x7ff; cnt *= 4; - if (destptr_end - destptr < cnt) { - cnt = destptr_end - destptr; - } + cnt = FFMIN(cnt, destptr_end - destptr); av_memcpy_backptr(destptr, ofs, cnt); destptr += cnt; }

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:42:26 2009 New Revision: 19054 Log: Pad the decompression buffer and use av_memcpy_backptr for the mszh decompression. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:38:17 2009 (r19053) +++ trunk/libavcodec/lcldec.c Sun May 31 12:42:26 2009 (r19054) @@ -44,6 +44,7 @@ #include "avcodec.h" #include "bytestream.h" #include "lcl.h" +#include "libavutil/lzo.h" #if CONFIG_ZLIB_DECODER #include <zlib.h> @@ -73,6 +74,7 @@ typedef struct LclDecContext { /** * \param srcptr compressed source buffer, must be padded with at least 4 extra bytes + * \param destptr must be padded sufficiently for av_memcpy_backptr */ static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize) { @@ -103,10 +105,8 @@ static unsigned int mszh_decomp(const un if (destptr_end - destptr < cnt) { cnt = destptr_end - destptr; } - for (; cnt > 0; cnt--) { - *destptr = *(destptr - ofs); - destptr++; - } + av_memcpy_backptr(destptr, ofs, cnt); + destptr += cnt; } } @@ -445,7 +445,7 @@ static av_cold int decode_init(AVCodecCo { LclDecContext * const c = avctx->priv_data; unsigned int basesize = avctx->width * avctx->height; - unsigned int max_basesize = FFALIGN(avctx->width, 4) * FFALIGN(avctx->height, 4); + 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;

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:38:17 2009 New Revision: 19053 Log: Mark srcptr as const in mszh_decomp Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:37:05 2009 (r19052) +++ trunk/libavcodec/lcldec.c Sun May 31 12:38:17 2009 (r19053) @@ -74,11 +74,11 @@ typedef struct LclDecContext { /** * \param srcptr compressed source buffer, must be padded with at least 4 extra bytes */ -static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize) +static unsigned int mszh_decomp(const unsigned char * srcptr, int srclen, unsigned char * destptr, unsigned int destsize) { unsigned char *destptr_bak = destptr; unsigned char *destptr_end = destptr + destsize; - unsigned char *srcptr_end = srcptr + srclen; + const unsigned char *srcptr_end = srcptr + srclen; unsigned char mask = 0; unsigned char maskbit = 0; unsigned int ofs, cnt;

1 0

r19052 - in trunk/libavcodec: lcldec.c lclenc.c
by subversion＠mplayerhq.hu 31 May '09

31 May '09

Author: reimar Date: Sun May 31 12:37:05 2009 New Revision: 19052 Log: Remove unnecessary put_bits/get_bits includes. Modified: trunk/libavcodec/lcldec.c trunk/libavcodec/lclenc.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:35:39 2009 (r19051) +++ trunk/libavcodec/lcldec.c Sun May 31 12:37:05 2009 (r19052) @@ -42,7 +42,6 @@ #include <stdlib.h> #include "avcodec.h" -#include "get_bits.h" #include "bytestream.h" #include "lcl.h" Modified: trunk/libavcodec/lclenc.c ============================================================================== --- trunk/libavcodec/lclenc.c Sun May 31 12:35:39 2009 (r19051) +++ trunk/libavcodec/lclenc.c Sun May 31 12:37:05 2009 (r19052) @@ -42,7 +42,6 @@ #include <stdlib.h> #include "avcodec.h" -#include "put_bits.h" #include "lcl.h" #include <zlib.h>

1 0

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

31 May '09

Author: reimar Date: Sun May 31 12:35:39 2009 New Revision: 19051 Log: Use bytestream_get_le16 to simplify offset/count calculation for mszh decompression. Modified: trunk/libavcodec/lcldec.c Modified: trunk/libavcodec/lcldec.c ============================================================================== --- trunk/libavcodec/lcldec.c Sun May 31 12:31:37 2009 (r19050) +++ trunk/libavcodec/lcldec.c Sun May 31 12:35:39 2009 (r19051) @@ -43,6 +43,7 @@ #include "avcodec.h" #include "get_bits.h" +#include "bytestream.h" #include "lcl.h" #if CONFIG_ZLIB_DECODER @@ -96,10 +97,8 @@ static unsigned int mszh_decomp(unsigned destptr += 4; srcptr += 4; } else { - ofs = *srcptr++; - cnt = *srcptr++; - ofs += cnt * 256; - cnt = (cnt >> 3) + 1; + ofs = bytestream_get_le16(&srcptr); + cnt = (ofs >> 11) + 1; ofs &= 0x7ff; cnt *= 4; if (destptr_end - destptr < cnt) {

1 0