January 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r7785 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: reimar Date: Wed Jan 31 21:26:32 2007 New Revision: 7785 Modified: trunk/libavcodec/lzo.c Log: Documentation fix: Copy functions should "work" fine for cnt == 0 Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 21:26:32 2007 @@ -81,7 +81,7 @@ /** * \brief copy bytes from input to output buffer with checking - * \param cnt number of bytes to copy, must be > 0 + * \param cnt number of bytes to copy, must be >= 0 */ static inline void copy(LZOContext *c, int cnt) { register uint8_t *src = c->in; @@ -109,7 +109,7 @@ /** * \brief copy previously decoded bytes to current position * \param back how many bytes back we start - * \param cnt number of bytes to copy, must be > 0 + * \param cnt number of bytes to copy, must be >= 0 * * cnt > back is valid, this will copy the bytes we just copied, * thus creating a repeating pattern with a period length of back.

1 0

r7784 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: reimar Date: Wed Jan 31 18:16:13 2007 New Revision: 7784 Modified: trunk/libavcodec/lzo.c Log: Optimize LZO copy operations Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 18:16:13 2007 @@ -66,6 +66,19 @@ return cnt; } +//#define UNALIGNED_LOADSTORE +#define BUILTIN_MEMCPY +#ifdef UNALIGNED_LOADSTORE +#define COPY2(d, s) *(uint16_t *)(d) = *(uint16_t *)(s); +#define COPY4(d, s) *(uint32_t *)(d) = *(uint32_t *)(s); +#elif defined(BUILTIN_MEMCPY) +#define COPY2(d, s) memcpy(d, s, 2); +#define COPY4(d, s) memcpy(d, s, 4); +#else +#define COPY2(d, s) (d)[0] = (s)[0]; (d)[1] = (s)[1]; +#define COPY4(d, s) (d)[0] = (s)[0]; (d)[1] = (s)[1]; (d)[2] = (s)[2]; (d)[3] = (s)[3]; +#endif + /** * \brief copy bytes from input to output buffer with checking * \param cnt number of bytes to copy, must be > 0 @@ -82,10 +95,7 @@ c->error |= LZO_OUTPUT_FULL; } #if defined(INBUF_PADDED) && defined(OUTBUF_PADDED) - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - dst[3] = src[3]; + COPY4(dst, src); src += 4; dst += 4; cnt -= 4; @@ -120,22 +130,16 @@ dst += cnt; } else { #ifdef OUTBUF_PADDED - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - dst[3] = src[3]; + COPY2(dst, src); + COPY2(dst + 2, src + 2); src += 4; dst += 4; cnt -= 4; if (cnt > 0) { - dst[0] = src[0]; - dst[1] = src[1]; - dst[2] = src[2]; - dst[3] = src[3]; - dst[4] = src[4]; - dst[5] = src[5]; - dst[6] = src[6]; - dst[7] = src[7]; + COPY2(dst, src); + COPY2(dst + 2, src + 2); + COPY2(dst + 4, src + 4); + COPY2(dst + 6, src + 6); src += 8; dst += 8; cnt -= 8;

1 0

r7783 - trunk/configure
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: diego Date: Wed Jan 31 15:46:07 2007 New Revision: 7783 Modified: trunk/configure Log: Exit on failed libfaad check. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Jan 31 15:46:07 2007 @@ -1242,9 +1242,7 @@ EOF test $? = 0 && enable libfaad2 else - libfaad="no" - libfaadbin="no" - echo "FAAD test failed." + die "FAAD test failed." fi fi

1 0

r7782 - trunk/configure
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: diego Date: Wed Jan 31 12:52:47 2007 New Revision: 7782 Modified: trunk/configure Log: Move libfaad2 check out of the GPL check. patch by Ramiro Polla, ramiro lisha.ufsc br, simplifications by me Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Jan 31 12:52:47 2007 @@ -686,6 +686,7 @@ libdts="no" libfaac="no" libfaad="no" +libfaad2="no" libfaadbin="no" libgsm="no" libmp3lame="no" @@ -1230,6 +1231,24 @@ die "libogg must be enabled to enable libvorbis." fi +if enabled_any libfaad libfaadbin ; then + if check_header faad.h; then + check_cc << EOF +#include <faad.h> +#ifndef FAAD2_VERSION +ok faad1 +#endif +int main( void ) { return 0; } +EOF + test $? = 0 && enable libfaad2 + else + libfaad="no" + libfaadbin="no" + echo "FAAD test failed." + fi +fi + + if disabled gpl ; then if enabled pp; then die "The Postprocessing code is under GPL and --enable-gpl is not specified." @@ -1251,23 +1270,8 @@ die "libdts is under GPL and --enable-gpl is not specified." fi - if enabled_any libfaad libfaadbin ; then - if check_header faad.h; then - check_cc << EOF - #include <faad.h> - #ifndef FAAD2_VERSION - ok faad1 - #endif - int main( void ) { return 0; } -EOF - if test $? = 0 ; then - die "FAAD2 is under GPL and --enable-gpl is not specified." - fi - else - libfaad="no" - libfaadbin="no" - echo "FAAD test failed." - fi + if enabled libfaad2; then + die "FAAD2 is under GPL and --enable-gpl is not specified." fi if enabled x11grab; then

1 0

r7776 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: michael Date: Wed Jan 31 11:07:22 2007 New Revision: 7776 Modified: trunk/libavcodec/lzo.c Log: replace if(x>>b) by if(x>C) as shifts are slow on some cpus and i have my doubts that gcc can replace the shifts as x is signed, it could in theory but well its gcc ... Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 11:07:22 2007 @@ -184,11 +184,11 @@ } while (!c.error) { int cnt, back; - if (x >> 4) { - if (x >> 6) { + if (x > 15) { + if (x > 63) { cnt = (x >> 5) - 1; back = (GETB(c) << 3) + ((x >> 2) & 7) + 1; - } else if (x >> 5) { + } else if (x > 31) { cnt = get_len(&c, x, 31); x = GETB(c); back = (GETB(c) << 6) + (x >> 2) + 1;

3 2

r7777 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: reimar Date: Wed Jan 31 11:29:58 2007 New Revision: 7777 Modified: trunk/libavcodec/lzo.c Log: Add two extra needed bounds checks Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 11:29:58 2007 @@ -182,6 +182,8 @@ x = GETB(c); if (x < 16) c.error |= LZO_ERROR; } + if (c.in > c.in_end) + c.error |= LZO_INPUT_DEPLETED; while (!c.error) { int cnt, back; if (x > 15) { @@ -209,6 +211,10 @@ cnt = get_len(&c, x, 15); copy(&c, cnt + 3); x = GETB(c); + if (c.in > c.in_end) { + c.error |= LZO_INPUT_DEPLETED; + continue; + } if (x >> 4) continue; cnt = 1;

3 2

r7778 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: michael Date: Wed Jan 31 11:34:13 2007 New Revision: 7778 Modified: trunk/libavcodec/lzo.c Log: simpify state and make code 2% faster reimar, dont hesitate to flame me for not sending patches and feel free to revert any or all of my changes to lzo.c if you dont like them Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 11:34:13 2007 @@ -168,7 +168,7 @@ * LZO_INPUT_PADDING, out must provide LZO_OUTPUT_PADDING additional bytes */ int lzo1x_decode(void *out, int *outlen, void *in, int *inlen) { - enum {COPY, BACKPTR} state = COPY; + int state= 0; int x; LZOContext c; c.in = in; @@ -205,9 +205,7 @@ break; } } - } else - switch (state) { - case COPY: + } else if(!state){ cnt = get_len(&c, x, 15); copy(&c, cnt + 3); x = GETB(c); @@ -219,15 +217,13 @@ continue; cnt = 1; back = (1 << 11) + (GETB(c) << 2) + (x >> 2) + 1; - break; - case BACKPTR: + } else { cnt = 0; back = (GETB(c) << 2) + (x >> 2) + 1; - break; } copy_backptr(&c, back, cnt + 2); + state= cnt = x & 3; - state = cnt ? BACKPTR : COPY; if (cnt) copy(&c, cnt); x = GETB(c);

2 1

r7781 - trunk/libavformat/nuv.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: michael Date: Wed Jan 31 12:24:04 2007 New Revision: 7781 Modified: trunk/libavformat/nuv.c Log: 10l to whoever wrote this (wrong fps, fixes nirvana.nuv) Modified: trunk/libavformat/nuv.c ============================================================================== --- trunk/libavformat/nuv.c (original) +++ trunk/libavformat/nuv.c Wed Jan 31 12:24:04 2007 @@ -154,7 +154,7 @@ vst->codec->height = height; vst->codec->bits_per_sample = 10; vst->codec->sample_aspect_ratio = av_d2q(aspect, 10000); - vst->r_frame_rate = av_d2q(1.0 / fps, 10000); + vst->r_frame_rate = av_d2q(fps, 60000); av_set_pts_info(vst, 32, 1, 1000); } else ctx->v_id = -1;

1 0

r7780 - trunk/libavcodec/bmp.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: diego Date: Wed Jan 31 12:19:48 2007 New Revision: 7780 Modified: trunk/libavcodec/bmp.c Log: Fix memcpy out-of-bounds. patch by Michel Bardiaux, mbardiaux mediaxim be Modified: trunk/libavcodec/bmp.c ============================================================================== --- trunk/libavcodec/bmp.c (original) +++ trunk/libavcodec/bmp.c Wed Jan 31 12:19:48 2007 @@ -187,7 +187,7 @@ switch(depth){ case 24: for(i = 0; i < avctx->height; i++){ - memcpy(ptr, buf, n); + memcpy(ptr, buf, avctx->width*(depth>>3)); buf += n; ptr += linesize; }

1 0

r7779 - trunk/libavcodec/lzo.c
by subversion＠mplayerhq.hu 31 Jan '07

31 Jan '07

Author: michael Date: Wed Jan 31 11:48:08 2007 New Revision: 7779 Modified: trunk/libavcodec/lzo.c Log: another >> vs > Modified: trunk/libavcodec/lzo.c ============================================================================== --- trunk/libavcodec/lzo.c (original) +++ trunk/libavcodec/lzo.c Wed Jan 31 11:48:08 2007 @@ -213,7 +213,7 @@ c.error |= LZO_INPUT_DEPLETED; continue; } - if (x >> 4) + if (x > 15) continue; cnt = 1; back = (1 << 11) + (GETB(c) << 2) + (x >> 2) + 1;

1 0