June 2007 - ffmpeg-cvslog - lists.ffmpeg.org

r8865 - trunk/libavcodec/mpeg12.c
by subversion＠mplayerhq.hu 24 Jan '10

24 Jan '10

Author: benoit Date: Wed May 2 10:18:28 2007 New Revision: 8865 Log: make mpeg decoder handle mid-stream changes in resolution patch by Heikki Lindholm holindho at cs helsinki fi original thread: [Ffmpeg-devel] [PATCH] fix mid-stream resolution changes date: Sat Mar 31 13:52:50 CEST 2007 Modified: trunk/libavcodec/mpeg12.c Modified: trunk/libavcodec/mpeg12.c ============================================================================== --- trunk/libavcodec/mpeg12.c (original) +++ trunk/libavcodec/mpeg12.c Wed May 2 10:18:28 2007 @@ -2084,6 +2084,7 @@ typedef struct Mpeg1Context { int slice_count; int swap_uv;//indicate VCR2 int save_aspect_info; + int save_width, save_height; AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator } Mpeg1Context; @@ -2138,6 +2139,8 @@ static int mpeg_decode_postinit(AVCodecC (s1->mpeg_enc_ctx_allocated == 0)|| avctx->coded_width != s->width || avctx->coded_height != s->height|| + s1->save_width != s->width || + s1->save_height != s->height || s1->save_aspect_info != s->aspect_ratio_info|| 0) { @@ -2155,6 +2158,8 @@ static int mpeg_decode_postinit(AVCodecC avcodec_set_dimensions(avctx, s->width, s->height); avctx->bit_rate = s->bit_rate; s1->save_aspect_info = s->aspect_ratio_info; + s1->save_width = s->width; + s1->save_height = s->height; //low_delay may be forced, in this case we will have B frames //that behave like P frames

3 2

r9326 - in trunk: doc/hooks.texi vhook/imlib2.c
by subversion＠mplayerhq.hu 07 Aug '07

07 Aug '07

Author: ramiro Date: Fri Jun 15 22:40:14 2007 New Revision: 9326 Log: Allow user to specify rgb.txt for imlib2 vhook Modified: trunk/doc/hooks.texi trunk/vhook/imlib2.c Modified: trunk/doc/hooks.texi ============================================================================== --- trunk/doc/hooks.texi (original) +++ trunk/doc/hooks.texi Fri Jun 15 22:40:14 2007 @@ -67,8 +67,13 @@ with the full path to the font file, as @end example where 20 is the point size. +You can specify the filename to read RGB color names from. If none are +specified, these defaults are used: @file{/usr/share/X11/rgb.txt} and + at file{/usr/lib/X11/rgb.txt} + Options: @multitable @columnfractions .2 .8 + at item @option{-C <rgb.txt>} @tab The filename to read RGB color names from @item @option{-c <color>} @tab The color of the text @item @option{-F <fontname>} @tab The font face and size @item @option{-t <text>} @tab The text @@ -137,6 +142,14 @@ Usage examples: a newline are treated as end-of-file. To create blank lines, use lines that consist of space characters only. + # Scrolling credits with custom color from a text file + ffmpeg -i input.avi -vhook \ + 'vhook/imlib2.so -C rgb.txt -c CustomColor1 -F VeraBd.ttf/16 -x 100 -y -1.0*N -f credits.txt' \ + -sameq output.avi + + This example does the same as the one above, but specifies an rgb.txt file + to be used, which has a custom made color in it. + # scrolling credits from a graphics file ffmpeg -sameq -i input.avi \ -vhook 'vhook/imlib2.so -x 0 -y -1.0*N -i credits.png' output.avi Modified: trunk/vhook/imlib2.c ============================================================================== --- trunk/vhook/imlib2.c (original) +++ trunk/vhook/imlib2.c Fri Jun 15 22:40:14 2007 @@ -15,6 +15,10 @@ * * Options: * + * -C <rgb.txt> The filename to read RGB color names from + * Defaults if none specified: + * /usr/share/X11/rgb.txt + * /usr/lib/X11/rgb.txt * -c <color> The color of the text * -F <fontname> The font face and size * -t <text> The text @@ -176,6 +180,7 @@ int Configure(void **ctxp, int argc, cha { int c; ContextInfo *ci; + char *rgbtxt = 0; char *font = "LucidaSansDemiBold/16"; char *fp = getenv("FONTPATH"); char *color = 0; @@ -203,8 +208,11 @@ int Configure(void **ctxp, int argc, cha imlib_add_path_to_font_path(fp); - while ((c = getopt(argc, argv, "c:f:F:t:x:y:i:")) > 0) { + while ((c = getopt(argc, argv, "C:c:f:F:t:x:y:i:")) > 0) { switch (c) { + case 'C': + rgbtxt = optarg; + break; case 'c': color = optarg; break; @@ -246,11 +254,16 @@ int Configure(void **ctxp, int argc, cha char buff[256]; int done = 0; + if (rgbtxt) + f = fopen(rgbtxt, "r"); + else + { f = fopen("/usr/share/X11/rgb.txt", "r"); if (!f) f = fopen("/usr/lib/X11/rgb.txt", "r"); + } if (!f) { - fprintf(stderr, "Failed to find rgb.txt\n"); + fprintf(stderr, "Failed to find RGB color names file\n"); return -1; } while (fgets(buff, sizeof(buff), f)) {

4 5

r9044 - trunk/libavformat/http.c
by subversion＠mplayerhq.hu 03 Aug '07

03 Aug '07

Author: alex Date: Thu May 17 12:30:03 2007 New Revision: 9044 Log: use usleep instead sleep Modified: trunk/libavformat/http.c Modified: trunk/libavformat/http.c ============================================================================== --- trunk/libavformat/http.c (original) +++ trunk/libavformat/http.c Thu May 17 12:30:03 2007 @@ -245,7 +245,7 @@ static int http_connect(URLContext *h, c s->off = 0; s->filesize = -1; if (post) { - sleep(1); + usleep(1000*1000); return 0; }

4 4

r9000 - trunk/libavcodec/i386/dsputil_mmx.c
by subversion＠mplayerhq.hu 16 Jul '07

16 Jul '07

Author: lorenm Date: Sat May 12 03:16:06 2007 New Revision: 9000 Log: sse2 & ssse3 versions of hadamard. unroll and inline diff_pixels. core2: before mmx2=193 cycles. after mmx2=174 sse2=122 ssse3=115 (cycles). k8: before mmx2=205. after mmx2=184 sse2=180. p4: before mmx2=342. after mmx2=314 sse2=309. Modified: trunk/libavcodec/i386/dsputil_mmx.c Modified: trunk/libavcodec/i386/dsputil_mmx.c ============================================================================== --- trunk/libavcodec/i386/dsputil_mmx.c (original) +++ trunk/libavcodec/i386/dsputil_mmx.c Sat May 12 03:16:06 2007 @@ -196,16 +196,16 @@ static const uint64_t ff_pb_FC attribute #undef DEF #undef PAVGB -#define SBUTTERFLY(a,b,t,n)\ - "movq " #a ", " #t " \n\t" /* abcd */\ +#define SBUTTERFLY(a,b,t,n,m)\ + "mov" #m " " #a ", " #t " \n\t" /* abcd */\ "punpckl" #n " " #b ", " #a " \n\t" /* aebf */\ "punpckh" #n " " #b ", " #t " \n\t" /* cgdh */\ #define TRANSPOSE4(a,b,c,d,t)\ - SBUTTERFLY(a,b,t,wd) /* a=aebf t=cgdh */\ - SBUTTERFLY(c,d,b,wd) /* c=imjn b=kolp */\ - SBUTTERFLY(a,c,d,dq) /* a=aeim d=bfjn */\ - SBUTTERFLY(t,b,c,dq) /* t=cgko c=dhlp */ + SBUTTERFLY(a,b,t,wd,q) /* a=aebf t=cgdh */\ + SBUTTERFLY(c,d,b,wd,q) /* c=imjn b=kolp */\ + SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\ + SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */ /***********************************/ /* standard MMX */ @@ -1503,6 +1503,76 @@ static void sub_hfyu_median_prediction_m *left = src2[w-1]; } +#define DIFF_PIXELS_1(m,a,t,p1,p2)\ + "mov"#m" "#p1", "#a" \n\t"\ + "mov"#m" "#p2", "#t" \n\t"\ + "punpcklbw "#a", "#t" \n\t"\ + "punpcklbw "#a", "#a" \n\t"\ + "psubw "#t", "#a" \n\t"\ + +#define DIFF_PIXELS_8(m0,m1,mm,p1,p2,stride,temp) {\ + uint8_t *p1b=p1, *p2b=p2;\ + asm volatile(\ + DIFF_PIXELS_1(m0, mm##0, mm##7, (%1), (%2))\ + DIFF_PIXELS_1(m0, mm##1, mm##7, (%1,%3), (%2,%3))\ + DIFF_PIXELS_1(m0, mm##2, mm##7, (%1,%3,2), (%2,%3,2))\ + "add %4, %1 \n\t"\ + "add %4, %2 \n\t"\ + DIFF_PIXELS_1(m0, mm##3, mm##7, (%1), (%2))\ + DIFF_PIXELS_1(m0, mm##4, mm##7, (%1,%3), (%2,%3))\ + DIFF_PIXELS_1(m0, mm##5, mm##7, (%1,%3,2), (%2,%3,2))\ + DIFF_PIXELS_1(m0, mm##6, mm##7, (%1,%4), (%2,%4))\ + "mov"#m1" "#mm"0, %0 \n\t"\ + DIFF_PIXELS_1(m0, mm##7, mm##0, (%1,%3,4), (%2,%3,4))\ + "mov"#m1" %0, "#mm"0 \n\t"\ + : "=m"(temp), "+r"(p1b), "+r"(p2b)\ + : "r"((long)stride), "r"((long)stride*3)\ + );\ +} + +#define DIFF_PIXELS_4x8(p1,p2,stride,temp) DIFF_PIXELS_8(d, q, %%mm, p1, p2, stride, temp) +#define DIFF_PIXELS_8x8(p1,p2,stride,temp) DIFF_PIXELS_8(q, dqa, %%xmm, p1, p2, stride, temp) + +#ifdef ARCH_X86_64 +// permutes 01234567 -> 05736421 +#define TRANSPOSE8(a,b,c,d,e,f,g,h,t)\ + SBUTTERFLY(a,b,%%xmm8,wd,dqa)\ + SBUTTERFLY(c,d,b,wd,dqa)\ + SBUTTERFLY(e,f,d,wd,dqa)\ + SBUTTERFLY(g,h,f,wd,dqa)\ + SBUTTERFLY(a,c,h,dq,dqa)\ + SBUTTERFLY(%%xmm8,b,c,dq,dqa)\ + SBUTTERFLY(e,g,b,dq,dqa)\ + SBUTTERFLY(d,f,g,dq,dqa)\ + SBUTTERFLY(a,e,f,qdq,dqa)\ + SBUTTERFLY(%%xmm8,d,e,qdq,dqa)\ + SBUTTERFLY(h,b,d,qdq,dqa)\ + SBUTTERFLY(c,g,b,qdq,dqa)\ + "movdqa %%xmm8, "#g" \n\t" +#else +#define TRANSPOSE8(a,b,c,d,e,f,g,h,t)\ + "movdqa "#h", "#t" \n\t"\ + SBUTTERFLY(a,b,h,wd,dqa)\ + "movdqa "#h", 16"#t" \n\t"\ + "movdqa "#t", "#h" \n\t"\ + SBUTTERFLY(c,d,b,wd,dqa)\ + SBUTTERFLY(e,f,d,wd,dqa)\ + SBUTTERFLY(g,h,f,wd,dqa)\ + SBUTTERFLY(a,c,h,dq,dqa)\ + "movdqa "#h", "#t" \n\t"\ + "movdqa 16"#t", "#h" \n\t"\ + SBUTTERFLY(h,b,c,dq,dqa)\ + SBUTTERFLY(e,g,b,dq,dqa)\ + SBUTTERFLY(d,f,g,dq,dqa)\ + SBUTTERFLY(a,e,f,qdq,dqa)\ + SBUTTERFLY(h,d,e,qdq,dqa)\ + "movdqa "#h", 16"#t" \n\t"\ + "movdqa "#t", "#h" \n\t"\ + SBUTTERFLY(h,b,d,qdq,dqa)\ + SBUTTERFLY(c,g,b,qdq,dqa)\ + "movdqa 16"#t", "#g" \n\t" +#endif + #define LBUTTERFLY2(a1,b1,a2,b2)\ "paddw " #b1 ", " #a1 " \n\t"\ "paddw " #b2 ", " #a2 " \n\t"\ @@ -1511,13 +1581,15 @@ static void sub_hfyu_median_prediction_m "psubw " #a1 ", " #b1 " \n\t"\ "psubw " #a2 ", " #b2 " \n\t" -#define HADAMARD48\ - LBUTTERFLY2(%%mm0, %%mm1, %%mm2, %%mm3)\ - LBUTTERFLY2(%%mm4, %%mm5, %%mm6, %%mm7)\ - LBUTTERFLY2(%%mm0, %%mm2, %%mm1, %%mm3)\ - LBUTTERFLY2(%%mm4, %%mm6, %%mm5, %%mm7)\ - LBUTTERFLY2(%%mm0, %%mm4, %%mm1, %%mm5)\ - LBUTTERFLY2(%%mm2, %%mm6, %%mm3, %%mm7)\ +#define HADAMARD8(m0, m1, m2, m3, m4, m5, m6, m7)\ + LBUTTERFLY2(m0, m1, m2, m3)\ + LBUTTERFLY2(m4, m5, m6, m7)\ + LBUTTERFLY2(m0, m2, m1, m3)\ + LBUTTERFLY2(m4, m6, m5, m7)\ + LBUTTERFLY2(m0, m4, m1, m5)\ + LBUTTERFLY2(m2, m6, m3, m7)\ + +#define HADAMARD48 HADAMARD8(%%mm0, %%mm1, %%mm2, %%mm3, %%mm4, %%mm5, %%mm6, %%mm7) #define MMABS_MMX(a,z)\ "pxor " #z ", " #z " \n\t"\ @@ -1530,25 +1602,52 @@ static void sub_hfyu_median_prediction_m "psubw " #a ", " #z " \n\t"\ "pmaxsw " #z ", " #a " \n\t" -#define MMABS_SUM_MMX(a,z, sum)\ - MMABS_MMX(a,z)\ - "paddusw " #a ", " #sum " \n\t" +#define MMABS_SSSE3(a,z)\ + "pabsw " #a ", " #a " \n\t" -#define MMABS_SUM_MMX2(a,z, sum)\ - MMABS_MMX2(a,z)\ +#define MMABS_SUM(a,z, sum)\ + MMABS(a,z)\ "paddusw " #a ", " #sum " \n\t" +#define MMABS_SUM_8x8_NOSPILL\ + MMABS(%%xmm0, %%xmm8)\ + MMABS(%%xmm1, %%xmm9)\ + MMABS_SUM(%%xmm2, %%xmm8, %%xmm0)\ + MMABS_SUM(%%xmm3, %%xmm9, %%xmm1)\ + MMABS_SUM(%%xmm4, %%xmm8, %%xmm0)\ + MMABS_SUM(%%xmm5, %%xmm9, %%xmm1)\ + MMABS_SUM(%%xmm6, %%xmm8, %%xmm0)\ + MMABS_SUM(%%xmm7, %%xmm9, %%xmm1)\ + "paddusw %%xmm1, %%xmm0 \n\t" + +#ifdef ARCH_X86_64 +#define MMABS_SUM_8x8_SSE2 MMABS_SUM_8x8_NOSPILL +#else +#define MMABS_SUM_8x8_SSE2\ + "movdqa %%xmm7, (%1) \n\t"\ + MMABS(%%xmm0, %%xmm7)\ + MMABS(%%xmm1, %%xmm7)\ + MMABS_SUM(%%xmm2, %%xmm7, %%xmm0)\ + MMABS_SUM(%%xmm3, %%xmm7, %%xmm1)\ + MMABS_SUM(%%xmm4, %%xmm7, %%xmm0)\ + MMABS_SUM(%%xmm5, %%xmm7, %%xmm1)\ + MMABS_SUM(%%xmm6, %%xmm7, %%xmm0)\ + "movdqa (%1), %%xmm2 \n\t"\ + MMABS_SUM(%%xmm2, %%xmm7, %%xmm1)\ + "paddusw %%xmm1, %%xmm0 \n\t" +#endif + #define LOAD4(o, a, b, c, d)\ - "movq "#o"(%1), " #a " \n\t"\ - "movq "#o"+16(%1), " #b " \n\t"\ - "movq "#o"+32(%1), " #c " \n\t"\ - "movq "#o"+48(%1), " #d " \n\t" + "movq "#o"(%1), "#a" \n\t"\ + "movq "#o"+8(%1), "#b" \n\t"\ + "movq "#o"+16(%1), "#c" \n\t"\ + "movq "#o"+24(%1), "#d" \n\t"\ #define STORE4(o, a, b, c, d)\ - "movq "#a", "#o"(%1) \n\t"\ - "movq "#b", "#o"+16(%1) \n\t"\ - "movq "#c", "#o"+32(%1) \n\t"\ - "movq "#d", "#o"+48(%1) \n\t"\ + "movq "#a", "#o"(%1) \n\t"\ + "movq "#b", "#o"+8(%1) \n\t"\ + "movq "#c", "#o"+16(%1) \n\t"\ + "movq "#d", "#o"+24(%1) \n\t"\ #define HSUM_MMX(a, t, dst)\ "movq "#a", "#t" \n\t"\ @@ -1566,41 +1665,51 @@ static void sub_hfyu_median_prediction_m "paddusw "#t", "#a" \n\t"\ "movd "#a", "#dst" \n\t"\ +#define HSUM_SSE2(a, t, dst)\ + "movhlps "#a", "#t" \n\t"\ + "paddusw "#t", "#a" \n\t"\ + "pshuflw $0x0E, "#a", "#t" \n\t"\ + "paddusw "#t", "#a" \n\t"\ + "pshuflw $0x01, "#a", "#t" \n\t"\ + "paddusw "#t", "#a" \n\t"\ + "movd "#a", "#dst" \n\t"\ + #define HADAMARD8_DIFF_MMX(cpu) \ static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){\ - DECLARE_ALIGNED_8(uint64_t, temp[16]);\ - int sum=0;\ + DECLARE_ALIGNED_8(uint64_t, temp[13]);\ + int sum;\ \ assert(h==8);\ \ - diff_pixels_mmx((DCTELEM*)temp, src1, src2, stride);\ + DIFF_PIXELS_4x8(src1, src2, stride, temp[0]);\ \ asm volatile(\ - LOAD4(0 , %%mm0, %%mm1, %%mm2, %%mm3)\ - LOAD4(64, %%mm4, %%mm5, %%mm6, %%mm7)\ -\ HADAMARD48\ \ - "movq %%mm7, 112(%1) \n\t"\ + "movq %%mm7, 96(%1) \n\t"\ \ TRANSPOSE4(%%mm0, %%mm1, %%mm2, %%mm3, %%mm7)\ STORE4(0 , %%mm0, %%mm3, %%mm7, %%mm2)\ \ - "movq 112(%1), %%mm7 \n\t"\ + "movq 96(%1), %%mm7 \n\t"\ TRANSPOSE4(%%mm4, %%mm5, %%mm6, %%mm7, %%mm0)\ STORE4(64, %%mm4, %%mm7, %%mm0, %%mm6)\ \ - LOAD4(8 , %%mm0, %%mm1, %%mm2, %%mm3)\ - LOAD4(72, %%mm4, %%mm5, %%mm6, %%mm7)\ + : "=r" (sum)\ + : "r"(temp)\ + );\ \ + DIFF_PIXELS_4x8(src1+4, src2+4, stride, temp[4]);\ +\ + asm volatile(\ HADAMARD48\ \ - "movq %%mm7, 120(%1) \n\t"\ + "movq %%mm7, 96(%1) \n\t"\ \ TRANSPOSE4(%%mm0, %%mm1, %%mm2, %%mm3, %%mm7)\ - STORE4(8 , %%mm0, %%mm3, %%mm7, %%mm2)\ + STORE4(32, %%mm0, %%mm3, %%mm7, %%mm2)\ \ - "movq 120(%1), %%mm7 \n\t"\ + "movq 96(%1), %%mm7 \n\t"\ TRANSPOSE4(%%mm4, %%mm5, %%mm6, %%mm7, %%mm0)\ "movq %%mm7, %%mm5 \n\t"/*FIXME remove*/\ "movq %%mm6, %%mm7 \n\t"\ @@ -1611,32 +1720,33 @@ static int hadamard8_diff_##cpu(void *s, HADAMARD48\ "movq %%mm7, 64(%1) \n\t"\ MMABS(%%mm0, %%mm7)\ - MMABS_SUM(%%mm1, %%mm7, %%mm0)\ + MMABS(%%mm1, %%mm7)\ MMABS_SUM(%%mm2, %%mm7, %%mm0)\ - MMABS_SUM(%%mm3, %%mm7, %%mm0)\ + MMABS_SUM(%%mm3, %%mm7, %%mm1)\ MMABS_SUM(%%mm4, %%mm7, %%mm0)\ - MMABS_SUM(%%mm5, %%mm7, %%mm0)\ + MMABS_SUM(%%mm5, %%mm7, %%mm1)\ MMABS_SUM(%%mm6, %%mm7, %%mm0)\ - "movq 64(%1), %%mm1 \n\t"\ - MMABS_SUM(%%mm1, %%mm7, %%mm0)\ + "movq 64(%1), %%mm2 \n\t"\ + MMABS_SUM(%%mm2, %%mm7, %%mm1)\ + "paddusw %%mm1, %%mm0 \n\t"\ "movq %%mm0, 64(%1) \n\t"\ \ LOAD4(0 , %%mm0, %%mm1, %%mm2, %%mm3)\ - LOAD4(8 , %%mm4, %%mm5, %%mm6, %%mm7)\ + LOAD4(32, %%mm4, %%mm5, %%mm6, %%mm7)\ \ HADAMARD48\ "movq %%mm7, (%1) \n\t"\ MMABS(%%mm0, %%mm7)\ - MMABS_SUM(%%mm1, %%mm7, %%mm0)\ + MMABS(%%mm1, %%mm7)\ MMABS_SUM(%%mm2, %%mm7, %%mm0)\ - MMABS_SUM(%%mm3, %%mm7, %%mm0)\ + MMABS_SUM(%%mm3, %%mm7, %%mm1)\ MMABS_SUM(%%mm4, %%mm7, %%mm0)\ - MMABS_SUM(%%mm5, %%mm7, %%mm0)\ + MMABS_SUM(%%mm5, %%mm7, %%mm1)\ MMABS_SUM(%%mm6, %%mm7, %%mm0)\ - "movq (%1), %%mm1 \n\t"\ - MMABS_SUM(%%mm1, %%mm7, %%mm0)\ - "movq 64(%1), %%mm1 \n\t"\ - MMABS_SUM(%%mm1, %%mm7, %%mm0)\ + "movq (%1), %%mm2 \n\t"\ + MMABS_SUM(%%mm2, %%mm7, %%mm1)\ + "paddusw 64(%1), %%mm0 \n\t"\ + "paddusw %%mm1, %%mm0 \n\t"\ \ HSUM(%%mm0, %%mm1, %0)\ \ @@ -1644,26 +1754,53 @@ static int hadamard8_diff_##cpu(void *s, : "r"(temp)\ );\ return sum&0xFFFF;\ -} +}\ +WARPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu) + +#define HADAMARD8_DIFF_SSE2(cpu) \ +static int hadamard8_diff_##cpu(void *s, uint8_t *src1, uint8_t *src2, int stride, int h){\ + DECLARE_ALIGNED_16(uint64_t, temp[4]);\ + int sum;\ +\ + assert(h==8);\ +\ + DIFF_PIXELS_8x8(src1, src2, stride, temp[0]);\ +\ + asm volatile(\ + HADAMARD8(%%xmm0, %%xmm1, %%xmm2, %%xmm3, %%xmm4, %%xmm5, %%xmm6, %%xmm7)\ + TRANSPOSE8(%%xmm0, %%xmm1, %%xmm2, %%xmm3, %%xmm4, %%xmm5, %%xmm6, %%xmm7, (%1))\ + HADAMARD8(%%xmm0, %%xmm5, %%xmm7, %%xmm3, %%xmm6, %%xmm4, %%xmm2, %%xmm1)\ + MMABS_SUM_8x8\ + HSUM_SSE2(%%xmm0, %%xmm1, %0)\ + : "=r" (sum)\ + : "r"(temp)\ + );\ + return sum&0xFFFF;\ +}\ +WARPER8_16_SQ(hadamard8_diff_##cpu, hadamard8_diff16_##cpu) #define MMABS(a,z) MMABS_MMX(a,z) -#define MMABS_SUM(a,z,sum) MMABS_SUM_MMX(a,z,sum) #define HSUM(a,t,dst) HSUM_MMX(a,t,dst) HADAMARD8_DIFF_MMX(mmx) #undef MMABS -#undef MMABS_SUM #undef HSUM #define MMABS(a,z) MMABS_MMX2(a,z) -#define MMABS_SUM(a,z,sum) MMABS_SUM_MMX2(a,z,sum) +#define MMABS_SUM_8x8 MMABS_SUM_8x8_SSE2 #define HSUM(a,t,dst) HSUM_MMX2(a,t,dst) HADAMARD8_DIFF_MMX(mmx2) +HADAMARD8_DIFF_SSE2(sse2) #undef MMABS -#undef MMABS_SUM +#undef MMABS_SUM_8x8 #undef HSUM -WARPER8_16_SQ(hadamard8_diff_mmx, hadamard8_diff16_mmx) -WARPER8_16_SQ(hadamard8_diff_mmx2, hadamard8_diff16_mmx2) +#ifdef HAVE_SSSE3 +#define MMABS(a,z) MMABS_SSSE3(a,z) +#define MMABS_SUM_8x8 MMABS_SUM_8x8_NOSPILL +HADAMARD8_DIFF_SSE2(ssse3) +#undef MMABS +#undef MMABS_SUM_8x8 +#endif static int ssd_int8_vs_int16_mmx(int8_t *pix1, int16_t *pix2, int size){ int sum; @@ -3430,6 +3567,20 @@ void dsputil_init_mmx(DSPContext* c, AVC c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_3dnow; } +#ifdef CONFIG_ENCODERS + if(mm_flags & MM_SSE2){ + c->hadamard8_diff[0]= hadamard8_diff16_sse2; + c->hadamard8_diff[1]= hadamard8_diff_sse2; + } + +#ifdef HAVE_SSSE3 + if(mm_flags & MM_SSSE3){ + c->hadamard8_diff[0]= hadamard8_diff16_ssse3; + c->hadamard8_diff[1]= hadamard8_diff_ssse3; + } +#endif +#endif + #ifdef CONFIG_SNOW_DECODER if(mm_flags & MM_SSE2){ c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;

4 4

r9447 - trunk/libavcodec/wmv2.c
by subversion＠mplayerhq.hu 03 Jul '07

03 Jul '07

Author: iive Date: Wed Jun 27 16:27:47 2007 New Revision: 9447 Log: Identify the loop_filter flag as such and remove the unused variables in the context. Modified: trunk/libavcodec/wmv2.c Modified: trunk/libavcodec/wmv2.c ============================================================================== --- trunk/libavcodec/wmv2.c (original) +++ trunk/libavcodec/wmv2.c Wed Jun 27 16:27:47 2007 @@ -36,8 +36,6 @@ typedef struct Wmv2Context{ MpegEncContext s; int j_type_bit; int j_type; - int flag3; - int flag63; int abt_flag; int abt_type; int abt_type_table[6]; @@ -74,7 +72,7 @@ static int encode_ext_header(Wmv2Context put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047)); put_bits(&pb, 1, w->mspel_bit=1); - put_bits(&pb, 1, w->flag3=1); + put_bits(&pb, 1, s->loop_filter); put_bits(&pb, 1, w->abt_flag=1); put_bits(&pb, 1, w->j_type_bit=1); put_bits(&pb, 1, w->top_left_mv_flag=0); @@ -329,7 +327,7 @@ static int decode_ext_header(Wmv2Context fps = get_bits(&gb, 5); s->bit_rate = get_bits(&gb, 11)*1024; w->mspel_bit = get_bits1(&gb); - w->flag3 = get_bits1(&gb); + s->loop_filter = get_bits1(&gb); w->abt_flag = get_bits1(&gb); w->j_type_bit = get_bits1(&gb); w->top_left_mv_flag= get_bits1(&gb); @@ -341,8 +339,8 @@ static int decode_ext_header(Wmv2Context s->slice_height = s->mb_height / code; if(s->avctx->debug&FF_DEBUG_PICT_INFO){ - av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n", - fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3, + av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, loop_filter:%d, slices:%d\n", + fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, s->loop_filter, code); } return 0;

5 10

r9344 - in trunk: libavcodec/aac_ac3_parser.h libavcodec/atrac3data.h libavcodec/bitstream.h libavcodec/bmp.h libavcodec/bytestream.h libavcodec/cookdata.h libavcodec/dcadata.h libavcodec/dcahuff.h libavcodec/dnxhddata.h libavcodec/dvdata.h libavcodec/faandct.h libavcodec/golomb.h libavcodec/h261data.h libavcodec/h263_parser.h libavcodec/h263data.h libavcodec/h264data.h libavcodec/imcdata.h libavcodec/indeo2data.h libavcodec/indeo3data.h libavcodec/jpeglsdec.h libavcodec/mathops.h libavcodec
by subversion＠mplayerhq.hu 03 Jul '07

03 Jul '07

Author: mru Date: Sun Jun 17 00:59:13 2007 New Revision: 9344 Log: include all prerequisites in header files Modified: trunk/libavcodec/aac_ac3_parser.h trunk/libavcodec/atrac3data.h trunk/libavcodec/bitstream.h trunk/libavcodec/bmp.h trunk/libavcodec/bytestream.h trunk/libavcodec/cookdata.h trunk/libavcodec/dcadata.h trunk/libavcodec/dcahuff.h trunk/libavcodec/dnxhddata.h trunk/libavcodec/dvdata.h trunk/libavcodec/faandct.h trunk/libavcodec/golomb.h trunk/libavcodec/h261data.h trunk/libavcodec/h263_parser.h trunk/libavcodec/h263data.h trunk/libavcodec/h264data.h trunk/libavcodec/imcdata.h trunk/libavcodec/indeo2data.h trunk/libavcodec/indeo3data.h trunk/libavcodec/jpeglsdec.h trunk/libavcodec/mathops.h trunk/libavcodec/mpcdata.h trunk/libavcodec/mpeg12data.h trunk/libavcodec/mpeg4data.h trunk/libavcodec/mpegaudiodectab.h trunk/libavcodec/mpegaudiotab.h trunk/libavcodec/msmpeg4tab.h trunk/libavcodec/opt.h trunk/libavcodec/qdm2data.h trunk/libavcodec/rangecoder.h trunk/libavcodec/ratecontrol.h trunk/libavcodec/rl.h trunk/libavcodec/rle.h trunk/libavcodec/rtjpeg.h trunk/libavcodec/s3tc.h trunk/libavcodec/simple_idct.h trunk/libavcodec/sp5x.h trunk/libavcodec/svq1_cb.h trunk/libavcodec/svq1_vlc.h trunk/libavcodec/tiff.h trunk/libavcodec/truemotion1data.h trunk/libavcodec/truespeech_data.h trunk/libavcodec/vc1acdata.h trunk/libavcodec/vc1data.h trunk/libavcodec/vorbis_enc_data.h trunk/libavcodec/vp3data.h trunk/libavcodec/vp5data.h trunk/libavcodec/wmadata.h trunk/libavformat/allformats.h trunk/libavformat/asf.h trunk/libavformat/avio.h trunk/libavformat/dv.h trunk/libavformat/isom.h trunk/libavformat/mpegts.h trunk/libavformat/riff.h trunk/libavformat/rtp.h trunk/libavformat/rtp_h264.h trunk/libavformat/rtp_internal.h trunk/libavformat/rtsp.h trunk/libavutil/adler32.h trunk/libavutil/aes.h trunk/libavutil/base64.h trunk/libavutil/bswap.h trunk/libavutil/crc.h trunk/libavutil/fifo.h trunk/libavutil/integer.h trunk/libavutil/internal.h trunk/libavutil/intreadwrite.h trunk/libavutil/md5.h trunk/libavutil/rational.h trunk/libavutil/sha1.h trunk/libavutil/softfloat.h Modified: trunk/libavcodec/aac_ac3_parser.h ============================================================================== --- trunk/libavcodec/aac_ac3_parser.h (original) +++ trunk/libavcodec/aac_ac3_parser.h Sun Jun 17 00:59:13 2007 @@ -23,6 +23,9 @@ #ifndef AAC_AC3_PARSER_H #define AAC_AC3_PARSER_H +#include <stdint.h> +#include "avcodec.h" + typedef struct AACAC3ParseContext { uint8_t *inbuf_ptr; int frame_size; Modified: trunk/libavcodec/atrac3data.h ============================================================================== --- trunk/libavcodec/atrac3data.h (original) +++ trunk/libavcodec/atrac3data.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,8 @@ * Atrac 3 AKA RealAudio 8 compatible decoder data */ +#include <stdint.h> + /* VLC tables */ static const uint8_t huffcode1[9] = { Modified: trunk/libavcodec/bitstream.h ============================================================================== --- trunk/libavcodec/bitstream.h (original) +++ trunk/libavcodec/bitstream.h Sun Jun 17 00:59:13 2007 @@ -26,6 +26,11 @@ #ifndef BITSTREAM_H #define BITSTREAM_H +#include <stdint.h> +#include <stdlib.h> +#include <assert.h> +#include "common.h" +#include "bswap.h" #include "log.h" #if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) Modified: trunk/libavcodec/bmp.h ============================================================================== --- trunk/libavcodec/bmp.h (original) +++ trunk/libavcodec/bmp.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avcodec.h" + typedef struct BMPContext { AVFrame picture; } BMPContext; Modified: trunk/libavcodec/bytestream.h ============================================================================== --- trunk/libavcodec/bytestream.h (original) +++ trunk/libavcodec/bytestream.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef FFMPEG_BYTESTREAM_H #define FFMPEG_BYTESTREAM_H +#include "common.h" + #define DEF(name, bytes, read, write)\ static av_always_inline unsigned int bytestream_get_ ## name(uint8_t **b){\ (*b) += bytes;\ Modified: trunk/libavcodec/cookdata.h ============================================================================== --- trunk/libavcodec/cookdata.h (original) +++ trunk/libavcodec/cookdata.h Sun Jun 17 00:59:13 2007 @@ -26,6 +26,8 @@ * Cook AKA RealAudio G2 compatible decoderdata */ +#include <stdint.h> + /* various data tables */ static const int expbits_tab[8] = { Modified: trunk/libavcodec/dcadata.h ============================================================================== --- trunk/libavcodec/dcadata.h (original) +++ trunk/libavcodec/dcadata.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,8 @@ * @file dcadata.c */ +#include <stdint.h> + /* Generic tables */ static const uint32_t dca_sample_rates[16] = Modified: trunk/libavcodec/dcahuff.h ============================================================================== --- trunk/libavcodec/dcahuff.h (original) +++ trunk/libavcodec/dcahuff.h Sun Jun 17 00:59:13 2007 @@ -20,6 +20,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> +#include <stdlib.h> + #define TMODE_COUNT 4 static const uint8_t tmode_vlc_bits[TMODE_COUNT] = { 3, 3, 3, 2 }; static const uint16_t tmode_codes[TMODE_COUNT][4] = { Modified: trunk/libavcodec/dnxhddata.h ============================================================================== --- trunk/libavcodec/dnxhddata.h (original) +++ trunk/libavcodec/dnxhddata.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint8_t dnxhd_1238_luma_weigth[] = { 0, 32, 32, 33, 34, 33, 33, 33, 33, 33, 33, 33, 33, 35, 37, 37, Modified: trunk/libavcodec/dvdata.h ============================================================================== --- trunk/libavcodec/dvdata.h (original) +++ trunk/libavcodec/dvdata.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,9 @@ * Constants for DV codec. */ +#include "avcodec.h" +#include "rational.h" + /* * DVprofile is used to express the differences between various * DV flavors. For now it's primarily used for differentiating Modified: trunk/libavcodec/faandct.h ============================================================================== --- trunk/libavcodec/faandct.h (original) +++ trunk/libavcodec/faandct.h Sun Jun 17 00:59:13 2007 @@ -27,6 +27,8 @@ * @author Michael Niedermayer <michaelni at gmx.at> */ +#include "dsputil.h" + #define FAAN_POSTSCALE void ff_faandct(DCTELEM * data); Modified: trunk/libavcodec/golomb.h ============================================================================== --- trunk/libavcodec/golomb.h (original) +++ trunk/libavcodec/golomb.h Sun Jun 17 00:59:13 2007 @@ -28,6 +28,9 @@ * @author Michael Niedermayer <michaelni at gmx.at> and Alex Beregszaszi */ +#include <stdint.h> +#include "bitstream.h" + #define INVALID_VLC 0x80000000 extern const uint8_t ff_golomb_vlc_len[512]; Modified: trunk/libavcodec/h261data.h ============================================================================== --- trunk/libavcodec/h261data.h (original) +++ trunk/libavcodec/h261data.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,9 @@ * H.261 tables. */ +#include <stdint.h> +#include "h261.h" + // H.261 VLC table for macroblock addressing static const uint8_t h261_mba_code[35] = { 1, 3, 2, 3, Modified: trunk/libavcodec/h263_parser.h ============================================================================== --- trunk/libavcodec/h263_parser.h (original) +++ trunk/libavcodec/h263_parser.h Sun Jun 17 00:59:13 2007 @@ -19,4 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "parser.h" + int ff_h263_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); Modified: trunk/libavcodec/h263data.h ============================================================================== --- trunk/libavcodec/h263data.h (original) +++ trunk/libavcodec/h263data.h Sun Jun 17 00:59:13 2007 @@ -26,6 +26,8 @@ * H.263 tables. */ +#include <stdint.h> +#include "mpegvideo.h" /* intra MCBPC, mb_type = (intra), then (intraq) */ const uint8_t intra_MCBPC_code[9] = { 1, 1, 2, 3, 1, 1, 2, 3, 1 }; Modified: trunk/libavcodec/h264data.h ============================================================================== --- trunk/libavcodec/h264data.h (original) +++ trunk/libavcodec/h264data.h Sun Jun 17 00:59:13 2007 @@ -27,6 +27,10 @@ * @author Michael Niedermayer <michaelni at gmx.at> */ +#include <stdint.h> +#include "mpegvideo.h" +#include "rational.h" + #define VERT_PRED 0 #define HOR_PRED 1 #define DC_PRED 2 Modified: trunk/libavcodec/imcdata.h ============================================================================== --- trunk/libavcodec/imcdata.h (original) +++ trunk/libavcodec/imcdata.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ * */ +#include <stdint.h> + static const uint16_t band_tab[33] = { 0, 3, 6, 9, 12, 16, 20, 24, 29, 34, 40, 46, 53, 60, 68, 76, 84, 93, 102, 111, 121, 131, Modified: trunk/libavcodec/indeo2data.h ============================================================================== --- trunk/libavcodec/indeo2data.h (original) +++ trunk/libavcodec/indeo2data.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #define IR2_CODES 143 static const uint16_t ir2_codes[IR2_CODES][2] = { #ifdef ALT_BITSTREAM_READER_LE Modified: trunk/libavcodec/indeo3data.h ============================================================================== --- trunk/libavcodec/indeo3data.h (original) +++ trunk/libavcodec/indeo3data.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint32_t correction[] = { 0x00000000, 0x00000202, 0xfffffdfe, 0x000002ff, 0xfffffd01, 0xffffff03, 0x000000fd, 0x00000404, 0xfffffbfc, 0x00000501, 0xfffffaff, 0x00000105, 0xfffffefb, 0x000003fc, 0xfffffc04, 0x000005fe, Modified: trunk/libavcodec/jpeglsdec.h ============================================================================== --- trunk/libavcodec/jpeglsdec.h (original) +++ trunk/libavcodec/jpeglsdec.h Sun Jun 17 00:59:13 2007 @@ -29,6 +29,7 @@ #define JPEGLSDEC_H #include "mjpeg.h" +#include "mjpegdec.h" /** * Decode LSE block with initialization parameters Modified: trunk/libavcodec/mathops.h ============================================================================== --- trunk/libavcodec/mathops.h (original) +++ trunk/libavcodec/mathops.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef MATHOPS_H #define MATHOPS_H +#include "common.h" + #ifdef ARCH_X86_32 #include "i386/mathops.h" Modified: trunk/libavcodec/mpcdata.h ============================================================================== --- trunk/libavcodec/mpcdata.h (original) +++ trunk/libavcodec/mpcdata.h Sun Jun 17 00:59:13 2007 @@ -20,6 +20,8 @@ * */ +#include <stdint.h> + static const int8_t mpc_idx30[] = { -1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1,-1, 0, 1}; static const int8_t mpc_idx31[] = { -1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1,-1,-1,-1, 0, 0, 0, 1, 1, 1}; static const int8_t mpc_idx32[] = { -1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}; Modified: trunk/libavcodec/mpeg12data.h ============================================================================== --- trunk/libavcodec/mpeg12data.h (original) +++ trunk/libavcodec/mpeg12data.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,9 @@ * MPEG1/2 tables. */ +#include <stdint.h> +#include "mpegvideo.h" + const uint16_t ff_mpeg1_default_intra_matrix[64] = { 8, 16, 19, 22, 26, 27, 29, 34, 16, 16, 22, 24, 27, 29, 34, 37, Modified: trunk/libavcodec/mpeg4data.h ============================================================================== --- trunk/libavcodec/mpeg4data.h (original) +++ trunk/libavcodec/mpeg4data.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,9 @@ * mpeg4 tables. */ +#include <stdint.h> +#include "mpegvideo.h" + // shapes #define RECT_SHAPE 0 #define BIN_SHAPE 1 Modified: trunk/libavcodec/mpegaudiodectab.h ============================================================================== --- trunk/libavcodec/mpegaudiodectab.h (original) +++ trunk/libavcodec/mpegaudiodectab.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,9 @@ * mpeg audio layer decoder tables. */ +#include <stdint.h> +#include "mpegaudio.h" + /*******************************************************/ /* layer 3 tables */ Modified: trunk/libavcodec/mpegaudiotab.h ============================================================================== --- trunk/libavcodec/mpegaudiotab.h (original) +++ trunk/libavcodec/mpegaudiotab.h Sun Jun 17 00:59:13 2007 @@ -27,6 +27,9 @@ * Most of them come from the mpeg audio specification. */ +#include <stdint.h> +#include "mpegaudio.h" + #define SQRT2 1.41421356237309514547 static const int costab32[30] = { Modified: trunk/libavcodec/msmpeg4tab.h ============================================================================== --- trunk/libavcodec/msmpeg4tab.h (original) +++ trunk/libavcodec/msmpeg4tab.h Sun Jun 17 00:59:13 2007 @@ -27,6 +27,10 @@ * MSMPEG4 data tables. */ +#include <stdint.h> +#include "bitstream.h" +#include "rl.h" + /* non intra picture macro block coded block pattern + mb type */ static const uint32_t table_mb_non_intra[128][2] = { { 0x40, 7 },{ 0x13c9, 13 },{ 0x9fd, 12 },{ 0x1fc, 15 }, Modified: trunk/libavcodec/opt.h ============================================================================== --- trunk/libavcodec/opt.h (original) +++ trunk/libavcodec/opt.h Sun Jun 17 00:59:13 2007 @@ -27,6 +27,8 @@ * AVOptions */ +#include "rational.h" + enum AVOptionType{ FF_OPT_TYPE_FLAGS, FF_OPT_TYPE_INT, Modified: trunk/libavcodec/qdm2data.h ============================================================================== --- trunk/libavcodec/qdm2data.h (original) +++ trunk/libavcodec/qdm2data.h Sun Jun 17 00:59:13 2007 @@ -31,6 +31,8 @@ #ifndef QDM2DATA_H #define QDM2DATA_H +#include <stdint.h> + /** VLC TABLES **/ /* values in this table range from -1..23; adjust retrieved value by -1 */ Modified: trunk/libavcodec/rangecoder.h ============================================================================== --- trunk/libavcodec/rangecoder.h (original) +++ trunk/libavcodec/rangecoder.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,10 @@ * Range coder. */ +#include <stdint.h> +#include <assert.h> +#include "common.h" + typedef struct RangeCoder{ int low; int range; Modified: trunk/libavcodec/ratecontrol.h ============================================================================== --- trunk/libavcodec/ratecontrol.h (original) +++ trunk/libavcodec/ratecontrol.h Sun Jun 17 00:59:13 2007 @@ -28,6 +28,8 @@ * ratecontrol header. */ +#include <stdio.h> +#include <stdint.h> #include "eval.h" typedef struct Predictor{ Modified: trunk/libavcodec/rl.h ============================================================================== --- trunk/libavcodec/rl.h (original) +++ trunk/libavcodec/rl.h Sun Jun 17 00:59:13 2007 @@ -6,6 +6,10 @@ #ifndef AVCODEC_RL_H #define AVCODEC_RL_H +#include <stdint.h> +#include "bitstream.h" +#include "mpegvideo.h" + /** RLTable. */ typedef struct RLTable { int n; ///< number of entries of table_vlc minus 1 Modified: trunk/libavcodec/rle.h ============================================================================== --- trunk/libavcodec/rle.h (original) +++ trunk/libavcodec/rle.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef RLE_H #define RLE_H +#include <stdint.h> + /** * RLE compress the row, with maximum size of out_size. Value before repeated bytes is (count ^ xor_rep) + add_rep. * Value before raw bytes is (count ^ xor_raw) + add_raw. Modified: trunk/libavcodec/rtjpeg.h ============================================================================== --- trunk/libavcodec/rtjpeg.h (original) +++ trunk/libavcodec/rtjpeg.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,9 @@ #ifndef RTJPEG_H #define RTJPEG_H +#include <stdint.h> +#include <dsputil.h> + typedef struct { int w, h; DSPContext *dsp; Modified: trunk/libavcodec/s3tc.h ============================================================================== --- trunk/libavcodec/s3tc.h (original) +++ trunk/libavcodec/s3tc.h Sun Jun 17 00:59:13 2007 @@ -23,6 +23,8 @@ #ifndef FF_S3TC_H #define FF_S3TC_H +#include <stdint.h> + #define FF_S3TC_DXT1 0x31545844 #define FF_S3TC_DXT3 0x33545844 Modified: trunk/libavcodec/simple_idct.h ============================================================================== --- trunk/libavcodec/simple_idct.h (original) +++ trunk/libavcodec/simple_idct.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,9 @@ * simple idct header. */ +#include <stdint.h> +#include "dsputil.h" + void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block); void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block); void ff_simple_idct_mmx(int16_t *block); Modified: trunk/libavcodec/sp5x.h ============================================================================== --- trunk/libavcodec/sp5x.h (original) +++ trunk/libavcodec/sp5x.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef SP5X_H #define SP5X_H +#include <stdint.h> + static const uint8_t sp5x_data_sof[] = { 0xFF, 0xC0, /* SOF */ Modified: trunk/libavcodec/svq1_cb.h ============================================================================== --- trunk/libavcodec/svq1_cb.h (original) +++ trunk/libavcodec/svq1_cb.h Sun Jun 17 00:59:13 2007 @@ -29,6 +29,9 @@ * svq1 code books. */ +#include <stdint.h> +#include <stdlib.h> + /* 6x16-entry codebook for inter-coded 4x2 vectors */ static const int8_t svq1_inter_codebook_4x2[768] = { 7, 2, -6, -7, 7, 3, -3, -4, -7, -2, 7, 8, -8, -4, 3, 4, Modified: trunk/libavcodec/svq1_vlc.h ============================================================================== --- trunk/libavcodec/svq1_vlc.h (original) +++ trunk/libavcodec/svq1_vlc.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef SVQ1_VLC_H #define SVQ1_VLC_H +#include <stdint.h> + /* values in this table range from 0..3; adjust retrieved value by +0 */ static const uint8_t svq1_block_type_vlc[4][2] = { /* { code, length } */ Modified: trunk/libavcodec/tiff.h ============================================================================== --- trunk/libavcodec/tiff.h (original) +++ trunk/libavcodec/tiff.h Sun Jun 17 00:59:13 2007 @@ -28,6 +28,8 @@ #ifndef TIFF_H #define TIFF_H +#include <stdint.h> + /** abridged list of TIFF tags */ enum TiffTags{ TIFF_SUBFILE = 0xfe, Modified: trunk/libavcodec/truemotion1data.h ============================================================================== --- trunk/libavcodec/truemotion1data.h (original) +++ trunk/libavcodec/truemotion1data.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,9 @@ #ifndef TRUEMOTION1DATA_H #define TRUEMOTION1DATA_H +#include <stdint.h> +#include <stdlib.h> + /* Y delta tables, skinny and fat */ static const int16_t ydt1[8] = { 0, -2, 2, -6, 6, -12, 12, -12 }; static const int16_t ydt2[8] = { 0, -2, 4, -6, 8, -12, 12, -12 }; Modified: trunk/libavcodec/truespeech_data.h ============================================================================== --- trunk/libavcodec/truespeech_data.h (original) +++ trunk/libavcodec/truespeech_data.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef __TRUESPEECH_DATA__ #define __TRUESPEECH_DATA__ +#include <stdint.h> + /* codebooks fo expanding input filter */ static const int16_t ts_cb_0[32] = { 0x8240, 0x8364, 0x84CE, 0x865D, 0x8805, 0x89DE, 0x8BD7, 0x8DF4, Modified: trunk/libavcodec/vc1acdata.h ============================================================================== --- trunk/libavcodec/vc1acdata.h (original) +++ trunk/libavcodec/vc1acdata.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + #define AC_MODES 8 static const int vc1_ac_sizes[AC_MODES] = { Modified: trunk/libavcodec/vc1data.h ============================================================================== --- trunk/libavcodec/vc1data.h (original) +++ trunk/libavcodec/vc1data.h Sun Jun 17 00:59:13 2007 @@ -28,6 +28,10 @@ #ifndef VC1DATA_H #define VC1DATA_H +#include <stdint.h> +#include "bitstream.h" +#include "rational.h" + /** Table for conversion between TTBLK and TTMB */ extern const int ff_vc1_ttblk_to_tt[3][8]; Modified: trunk/libavcodec/vorbis_enc_data.h ============================================================================== --- trunk/libavcodec/vorbis_enc_data.h (original) +++ trunk/libavcodec/vorbis_enc_data.h Sun Jun 17 00:59:13 2007 @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + static const uint8_t codebook0[] = { 2, 10, 8, 14, 7, 12, 11, 14, 1, 5, 3, 7, 4, 9, 7, 13, Modified: trunk/libavcodec/vp3data.h ============================================================================== --- trunk/libavcodec/vp3data.h (original) +++ trunk/libavcodec/vp3data.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,9 @@ #ifndef VP3DATA_H #define VP3DATA_H +#include <stdint.h> +#include <stdlib.h> + /* these coefficients dequantize intraframe Y plane coefficients * (note: same as JPEG) */ static const int16_t vp31_intra_y_dequant[64] = Modified: trunk/libavcodec/vp5data.h ============================================================================== --- trunk/libavcodec/vp5data.h (original) +++ trunk/libavcodec/vp5data.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,8 @@ #ifndef VP5DATA_H #define VP5DATA_H +#include <stdint.h> + static const uint8_t vp5_coeff_groups[] = { -1, 0, 1, 1, 2, 1, 1, 2, 2, 1, 1, 2, 2, 2, 1, 2, Modified: trunk/libavcodec/wmadata.h ============================================================================== --- trunk/libavcodec/wmadata.h (original) +++ trunk/libavcodec/wmadata.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,9 @@ * Various WMA tables. */ +#include <stdint.h> +#include "wma.h" + static const uint16_t wma_critical_freqs[25] = { 100, 200, 300, 400, 510, 630, 770, 920, 1080, 1270, 1480, 1720, 2000, 2320, 2700, 3150, Modified: trunk/libavformat/allformats.h ============================================================================== --- trunk/libavformat/allformats.h (original) +++ trunk/libavformat/allformats.h Sun Jun 17 00:59:13 2007 @@ -22,6 +22,8 @@ #ifndef ALLFORMATS_H #define ALLFORMATS_H +#include "avformat.h" + extern AVInputFormat aac_demuxer; extern AVInputFormat ac3_demuxer; extern AVInputFormat aiff_demuxer; Modified: trunk/libavformat/asf.h ============================================================================== --- trunk/libavformat/asf.h (original) +++ trunk/libavformat/asf.h Sun Jun 17 00:59:13 2007 @@ -17,6 +17,10 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include <stdint.h> +#include "avformat.h" + #define PACKET_SIZE 3200 typedef struct { Modified: trunk/libavformat/avio.h ============================================================================== --- trunk/libavformat/avio.h (original) +++ trunk/libavformat/avio.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef AVIO_H #define AVIO_H +#include <stdint.h> + /* output byte stream handling */ typedef int64_t offset_t; Modified: trunk/libavformat/dv.h ============================================================================== --- trunk/libavformat/dv.h (original) +++ trunk/libavformat/dv.h Sun Jun 17 00:59:13 2007 @@ -25,6 +25,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avformat.h" + typedef struct DVDemuxContext DVDemuxContext; DVDemuxContext* dv_init_demux(AVFormatContext* s); int dv_get_packet(DVDemuxContext*, AVPacket *); Modified: trunk/libavformat/isom.h ============================================================================== --- trunk/libavformat/isom.h (original) +++ trunk/libavformat/isom.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,8 @@ #ifndef FFMPEG_ISOM_H #define FFMPEG_ISOM_H +#include "riff.h" + /* isom.c */ extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag codec_movvideo_tags[]; Modified: trunk/libavformat/mpegts.h ============================================================================== --- trunk/libavformat/mpegts.h (original) +++ trunk/libavformat/mpegts.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avformat.h" + #define TS_FEC_PACKET_SIZE 204 #define TS_DVHS_PACKET_SIZE 192 #define TS_PACKET_SIZE 188 Modified: trunk/libavformat/riff.h ============================================================================== --- trunk/libavformat/riff.h (original) +++ trunk/libavformat/riff.h Sun Jun 17 00:59:13 2007 @@ -28,6 +28,9 @@ #ifndef FF_RIFF_H #define FF_RIFF_H +#include "avcodec.h" +#include "avio.h" + offset_t start_tag(ByteIOContext *pb, const char *tag); void end_tag(ByteIOContext *pb, offset_t start); Modified: trunk/libavformat/rtp.h ============================================================================== --- trunk/libavformat/rtp.h (original) +++ trunk/libavformat/rtp.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,9 @@ #ifndef RTP_H #define RTP_H +#include "avcodec.h" +#include "avformat.h" + #define RTP_MIN_PACKET_LENGTH 12 #define RTP_MAX_PACKET_LENGTH 1500 /* XXX: suppress this define */ Modified: trunk/libavformat/rtp_h264.h ============================================================================== --- trunk/libavformat/rtp_h264.h (original) +++ trunk/libavformat/rtp_h264.h Sun Jun 17 00:59:13 2007 @@ -22,5 +22,7 @@ #ifndef RTP_H264_H #define RTP_H264_H +#include "rtp_internal.h" + extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; #endif /* RTP_H264_H */ Modified: trunk/libavformat/rtp_internal.h ============================================================================== --- trunk/libavformat/rtp_internal.h (original) +++ trunk/libavformat/rtp_internal.h Sun Jun 17 00:59:13 2007 @@ -23,6 +23,10 @@ #ifndef RTP_INTERNAL_H #define RTP_INTERNAL_H +#include <stdint.h> +#include "avcodec.h" +#include "rtp.h" + // these statistics are used for rtcp receiver reports... typedef struct { uint16_t max_seq; ///< highest sequence number seen Modified: trunk/libavformat/rtsp.h ============================================================================== --- trunk/libavformat/rtsp.h (original) +++ trunk/libavformat/rtsp.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef RTSP_H #define RTSP_H +#include <stdint.h> +#include "avformat.h" #include "rtspcodes.h" enum RTSPProtocol { Modified: trunk/libavutil/adler32.h ============================================================================== --- trunk/libavutil/adler32.h (original) +++ trunk/libavutil/adler32.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef ADLER32_H #define ADLER32_H +#include <stdint.h> + unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf, unsigned int len); Modified: trunk/libavutil/aes.h ============================================================================== --- trunk/libavutil/aes.h (original) +++ trunk/libavutil/aes.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef AES_H #define AES_H +#include <stdint.h> + extern const int av_aes_size; struct AVAES; Modified: trunk/libavutil/base64.h ============================================================================== --- trunk/libavutil/base64.h (original) +++ trunk/libavutil/base64.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdint.h> + /** * decodes base64 * param order as strncpy() Modified: trunk/libavutil/bswap.h ============================================================================== --- trunk/libavutil/bswap.h (original) +++ trunk/libavutil/bswap.h Sun Jun 17 00:59:13 2007 @@ -26,6 +26,9 @@ #ifndef __BSWAP_H__ #define __BSWAP_H__ +#include <stdint.h> +#include "common.h" + #ifdef HAVE_BYTESWAP_H #include <byteswap.h> #else Modified: trunk/libavutil/crc.h ============================================================================== --- trunk/libavutil/crc.h (original) +++ trunk/libavutil/crc.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,9 @@ #ifndef CRC_H #define CRC_H +#include <stdint.h> +#include <sys/types.h> + typedef uint32_t AVCRC; #if LIBAVUTIL_VERSION_INT < (50<<16) Modified: trunk/libavutil/fifo.h ============================================================================== --- trunk/libavutil/fifo.h (original) +++ trunk/libavutil/fifo.h Sun Jun 17 00:59:13 2007 @@ -24,6 +24,8 @@ #ifndef FIFO_H #define FIFO_H +#include <stdint.h> + typedef struct AVFifoBuffer { uint8_t *buffer; uint8_t *rptr, *wptr, *end; Modified: trunk/libavutil/integer.h ============================================================================== --- trunk/libavutil/integer.h (original) +++ trunk/libavutil/integer.h Sun Jun 17 00:59:13 2007 @@ -29,6 +29,8 @@ #ifndef INTEGER_H #define INTEGER_H +#include <stdint.h> + #define AV_INTEGER_SIZE 8 typedef struct AVInteger{ Modified: trunk/libavutil/internal.h ============================================================================== --- trunk/libavutil/internal.h (original) +++ trunk/libavutil/internal.h Sun Jun 17 00:59:13 2007 @@ -26,6 +26,9 @@ #ifndef INTERNAL_H #define INTERNAL_H +#include <stdint.h> +#include <assert.h> + #ifndef attribute_used #if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0) # define attribute_used __attribute__((used)) Modified: trunk/libavutil/intreadwrite.h ============================================================================== --- trunk/libavutil/intreadwrite.h (original) +++ trunk/libavutil/intreadwrite.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ #ifndef INTREADWRITE_H #define INTREADWRITE_H +#include <stdint.h> + #ifdef __GNUC__ struct unaligned_64 { uint64_t l; } __attribute__((packed)); Modified: trunk/libavutil/md5.h ============================================================================== --- trunk/libavutil/md5.h (original) +++ trunk/libavutil/md5.h Sun Jun 17 00:59:13 2007 @@ -21,6 +21,8 @@ #ifndef MD5_H #define MD5_H +#include <stdint.h> + extern const int av_md5_size; struct AVMD5; Modified: trunk/libavutil/rational.h ============================================================================== --- trunk/libavutil/rational.h (original) +++ trunk/libavutil/rational.h Sun Jun 17 00:59:13 2007 @@ -29,6 +29,8 @@ #ifndef RATIONAL_H #define RATIONAL_H +#include <stdint.h> + /** * Rational number num/den. */ Modified: trunk/libavutil/sha1.h ============================================================================== --- trunk/libavutil/sha1.h (original) +++ trunk/libavutil/sha1.h Sun Jun 17 00:59:13 2007 @@ -1,6 +1,8 @@ #ifndef AV_SHA1_H #define AV_SHA1_H +#include <stdint.h> + extern const int av_sha1_size; struct AVSHA1; Modified: trunk/libavutil/softfloat.h ============================================================================== --- trunk/libavutil/softfloat.h (original) +++ trunk/libavutil/softfloat.h Sun Jun 17 00:59:13 2007 @@ -19,6 +19,8 @@ * */ +#include <stdint.h> + #define MIN_EXP -126 #define MAX_EXP 126 #define ONE_BITS 29

4 4

r9451 - trunk/MAINTAINERS
by subversion＠mplayerhq.hu 29 Jun '07

29 Jun '07

Author: victor Date: Fri Jun 29 18:39:18 2007 New Revision: 9451 Log: Add myself as Cygwin maintainer. Modified: trunk/MAINTAINERS Modified: trunk/MAINTAINERS ============================================================================== --- trunk/MAINTAINERS (original) +++ trunk/MAINTAINERS Fri Jun 29 18:39:18 2007 @@ -257,4 +257,5 @@ Mac OS X / PowerPC Amiga / PowerPC Colin Ward Linux / PowerPC Luca Barbato Windows MinGW Alex Beregszaszi +Windows Cygwin Victor Paesa ADI/Blackfin DSP Marc Hoffman

1 0

[ffmpeg.org]: r87 - trunk/src/documentation
by subversion＠mplayerhq.hu 29 Jun '07

29 Jun '07

Author: victor Date: Fri Jun 29 18:28:31 2007 New Revision: 87 Log: Add Dranger's tutorial. Modified: trunk/src/documentation Modified: trunk/src/documentation ============================================================================== --- trunk/src/documentation (original) +++ trunk/src/documentation Fri Jun 29 18:28:31 2007 @@ -37,6 +37,8 @@ and help forums. <li><a href="http://stephenjungels.com/jungels.net/articles/ffmpeg-howto.html">FFmpeg on Mac OS X HOWTO</a> explains installing and using FFmpeg on Mac OS X. +<li><a href="http://www.dranger.com/ffmpeg/">An FFmpeg and SDL Tutorial</a> +by Stephen Dranger, explains how to write a video player based on FFmpeg. </ul>

1 0

r9450 - trunk/libavcodec/vc1.c
by subversion＠mplayerhq.hu 28 Jun '07

28 Jun '07

Author: kostya Date: Thu Jun 28 17:53:36 2007 New Revision: 9450 Log: this prediction direction adjustment is wrong Modified: trunk/libavcodec/vc1.c Modified: trunk/libavcodec/vc1.c ============================================================================== --- trunk/libavcodec/vc1.c (original) +++ trunk/libavcodec/vc1.c Thu Jun 28 17:53:36 2007 @@ -2603,9 +2603,7 @@ static int vc1_decode_i_block_adv(VC1Con //AC Decoding i = 1; - /* check if AC is needed at all and adjust direction if needed */ - if(!a_avail) dc_pred_dir = 1; - if(!c_avail) dc_pred_dir = 0; + /* check if AC is needed at all */ if(!a_avail && !c_avail) use_pred = 0; ac_val = s->ac_val[0][0] + s->block_index[n] * 16; ac_val2 = ac_val;

1 0

r9449 - trunk/configure
by subversion＠mplayerhq.hu 28 Jun '07

28 Jun '07

Author: diego Date: Thu Jun 28 14:09:02 2007 New Revision: 9449 Log: Clarify --enable-libfaadbin option description. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu Jun 28 14:09:02 2007 @@ -87,7 +87,7 @@ show_help(){ echo " --enable-libamr-wb enable libamr-wb floating point audio codec" echo " --enable-libfaac enable FAAC support via libfaac [default=no]" echo " --enable-libfaad enable FAAD support via libfaad [default=no]" - echo " --enable-libfaadbin build FAAD support with runtime linking [default=no]" + echo " --enable-libfaadbin open libfaad.so.0 at runtime [default=no]" echo " --enable-libgsm enable GSM support via libgsm [default=no]" echo " --enable-libmp3lame enable MP3 encoding via libmp3lame [default=no]" echo " --enable-libnut enable NUT (de)muxing via libnut,"

1 0