October 2011 - ffmpeg-cvslog - lists.ffmpeg.org

Add missing 'tab'.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Oct 31 01:11:19 2011 +0100| [f6498e2677f6f757ea76d6e591afd8e36e26a00f] | committer: Carl Eugen Hoyos Add missing 'tab'. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6498e2677f6f757e… --- doc/general.texi | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index 86ce505..1b102c8 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -468,7 +468,7 @@ following image formats are supported: @item MPEG-1/2 video (VDPAU acceleration) @tab @tab X @item MPEG-2 video @tab X @tab X @item MPEG-4 part 2 @tab X @tab X - @ libxvidcore can be used alternatively for encoding. + @tab libxvidcore can be used alternatively for encoding. @item MPEG-4 part 2 Microsoft variant version 1 @tab @tab X @item MPEG-4 part 2 Microsoft variant version 2 @tab X @tab X @item MPEG-4 part 2 Microsoft variant version 3 @tab X @tab X

1 0

Bump libavcodec minor version for the Dirac decoder.
by git＠videolan.org 31 Oct '11

31 Oct '11

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos(a)ag.or.at> | Mon Oct 31 01:10:07 2011 +0100| [171727d5308abb212b3f686143b3d781d41f7b76] | committer: Carl Eugen Hoyos Bump libavcodec minor version for the Dirac decoder. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=171727d5308abb212… --- libavcodec/version.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/version.h b/libavcodec/version.h index 2001dcf..db9b8dd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 25 +#define LIBAVCODEC_VERSION_MINOR 26 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1 0

dirac: enable diracdsp_mmx
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:28:48 2011 +0100| [e8b891b7f0165585f8eb54bdfb087efa420e657d] | committer: Michael Niedermayer dirac: enable diracdsp_mmx Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e8b891b7f0165585f… --- libavcodec/diracdsp.c | 4 ++-- libavcodec/x86/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c index 5c1c706..872faae 100644 --- a/libavcodec/diracdsp.c +++ b/libavcodec/diracdsp.c @@ -20,7 +20,7 @@ #include "dsputil.h" #include "diracdsp.h" -/* MMX_DISABLE #include "libavcodec/x86/diracdsp_mmx.h" */ +#include "libavcodec/x86/diracdsp_mmx.h" #define FILTER(src, stride) \ ((21*((src)[ 0*stride] + (src)[1*stride]) \ @@ -197,5 +197,5 @@ void ff_diracdsp_init(DiracDSPContext *c) PIXFUNC(avg, 16); PIXFUNC(avg, 32); - /* MMX_DISABLE if (HAVE_MMX) ff_diracdsp_init_mmx(c); */ + if (HAVE_MMX) ff_diracdsp_init_mmx(c); } diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 082d5e0..308f071 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -27,7 +27,7 @@ MMX-OBJS-$(CONFIG_RV40_DECODER) += x86/rv40dsp.o \ YASM-OBJS-$(CONFIG_VC1_DECODER) += x86/vc1dsp_yasm.o -#DISABLE_MMX YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o +YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o MMX-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_mmx.o YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o

1 0

dirac: enable ff_spatial_idwt_init_mmx()
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:29:08 2011 +0100| [0bc5677e98cf7cc490276ce6008bd9b3fceb2928] | committer: Michael Niedermayer dirac: enable ff_spatial_idwt_init_mmx() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bc5677e98cf7cc49… --- libavcodec/dwt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/dwt.c b/libavcodec/dwt.c index fa56906..55ef8e3 100644 --- a/libavcodec/dwt.c +++ b/libavcodec/dwt.c @@ -1348,7 +1348,7 @@ int ff_spatial_idwt_init2(DWTContext *d, IDWTELEM *buffer, int width, int height return -1; } - /////MMX_DISABLE if (HAVE_MMX) ff_spatial_idwt_init_mmx(d, type); + if (HAVE_MMX) ff_spatial_idwt_init_mmx(d, type); return 0; }

1 0

dirac: ff_horizontal_compose_dd97i_ssse3 does not work yet, thus disable it
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:28:07 2011 +0100| [3cb0686eeaa3937e480136fd760d47cde13101a7] | committer: Michael Niedermayer dirac: ff_horizontal_compose_dd97i_ssse3 does not work yet, thus disable it Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cb0686eeaa3937e4… --- libavcodec/x86/dwt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/dwt.c b/libavcodec/x86/dwt.c index 5cfc2be..f3cc04c 100644 --- a/libavcodec/x86/dwt.c +++ b/libavcodec/x86/dwt.c @@ -188,7 +188,7 @@ void ff_spatial_idwt_init_mmx(DWTContext *d, enum dwt_type type) switch (type) { case DWT_DIRAC_DD9_7: - d->horizontal_compose = ff_horizontal_compose_dd97i_ssse3; +//MMXDISABLED d->horizontal_compose = ff_horizontal_compose_dd97i_ssse3; break; } #endif // HAVE_YASM

1 0

dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it.
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:27:38 2011 +0100| [a1f3b18bf55f106c974eacb1dc831be4d2bd5277] | committer: Michael Niedermayer dirac: put_dirac_pixels8_mmx() does not work yet, thus disable it. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1f3b18bf55f106c9… --- libavcodec/x86/diracdsp_mmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_mmx.c index 0756f9f..a1f1489 100644 --- a/libavcodec/x86/diracdsp_mmx.c +++ b/libavcodec/x86/diracdsp_mmx.c @@ -52,7 +52,7 @@ HPEL_FILTER(8, mmx) HPEL_FILTER(16, sse2) #define PIXFUNC(PFX, IDX, EXT) \ - c->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT; \ + /*MMXDISABLEDc->PFX ## _dirac_pixels_tab[0][IDX] = ff_ ## PFX ## _dirac_pixels8_ ## EXT;*/ \ c->PFX ## _dirac_pixels_tab[1][IDX] = ff_ ## PFX ## _dirac_pixels16_ ## EXT; \ c->PFX ## _dirac_pixels_tab[2][IDX] = ff_ ## PFX ## _dirac_pixels32_ ## EXT

1 0

dirac: put_signed_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:25:49 2011 +0100| [d532e9223e772fee38d3e4f0955599496886c385] | committer: Michael Niedermayer dirac: put_signed_rect_clamped does currently not receive aligned data, thus use unaligned accesses. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d532e9223e772fee3… --- libavcodec/x86/diracdsp_yasm.asm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index bbe8512..fde7742 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -157,8 +157,8 @@ cglobal put_signed_rect_clamped_%1, 5,7,3, dst, dst_stride, src, src_stride, w, packsswb m2, [src2q+2*wq+mmsize] paddb m1, m0 paddb m2, m0 - mova [dstq +wq], m1 - mova [dst2q+wq], m2 + movu [dstq +wq], m1 + movu [dst2q+wq], m2 jg .loopx lea srcq, [srcq+src_strideq*4]

1 0

dirac: add_rect_clamped does currently not receive aligned data, thus use unaligned accesses.
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:26:29 2011 +0100| [22fe93ea39f72e1c77fcb74898bf78041cdd9f97] | committer: Michael Niedermayer dirac: add_rect_clamped does currently not receive aligned data, thus use unaligned accesses. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22fe93ea39f72e1c7… --- libavcodec/x86/diracdsp_yasm.asm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index fde7742..bda791c 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -195,7 +195,7 @@ cglobal add_rect_clamped_%1, 7,7,3, dst, src, stride, idwt, idwt_stride, w, h paddw m1, [idwtq+2*wq] paddw m2, [idwtq+2*wq+mmsize] packuswb m1, m2 - mova [dstq +wq], m1 + movu [dstq +wq], m1 jg .loop lea srcq, [srcq + 2*strideq]

1 0

dirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned accesses .
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:25:08 2011 +0100| [5f34092b132649f595e5e45bbf99d290ba33074c] | committer: Michael Niedermayer dirac; dirac_hpel_filter_h does currently not receive aligned data thus use unaligned accesses. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f34092b132649f59… --- libavcodec/x86/diracdsp_yasm.asm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index e71da80..bbe8512 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -94,7 +94,7 @@ cglobal dirac_hpel_filter_h_%1, 3,3,8, dst, src, width and widthd, ~(mmsize-1) .loop: ; 7*(src[0] + src[1]) - UNPACK_ADD m0, m1, [srcq + widthq], [srcq + widthq + 1], a,u + UNPACK_ADD m0, m1, [srcq + widthq], [srcq + widthq + 1], u,u pmullw m0, [pw_7] pmullw m1, [pw_7] @@ -122,7 +122,7 @@ cglobal dirac_hpel_filter_h_%1, 3,3,8, dst, src, width psraw m0, 5 psraw m1, 5 packuswb m0, m1 - mova [dstq + widthq], m0 + movu [dstq + widthq], m0 sub widthd, mmsize jge .loop RET

1 0

dirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligned accesses.
by git＠videolan.org 30 Oct '11

30 Oct '11

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Oct 30 23:24:19 2011 +0100| [f0d616e76ff6ebfafe8e3708dabe5dd6b0b71038] | committer: Michael Niedermayer dirac: dirac_hpel_filter_v does currently not receive aligned data, thus use unaligned accesses. Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f0d616e76ff6ebfaf… --- libavcodec/x86/diracdsp_yasm.asm | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp_yasm.asm index 666e657..e71da80 100644 --- a/libavcodec/x86/diracdsp_yasm.asm +++ b/libavcodec/x86/diracdsp_yasm.asm @@ -51,26 +51,26 @@ cglobal dirac_hpel_filter_v_%1, 4,6,8, dst, src, stride, width, src0, stridex3 pxor m7, m7 .loop: ; 7*(src[0] + src[1]) - UNPACK_ADD m0, m1, [srcq], [srcq + strideq], a,a + UNPACK_ADD m0, m1, [srcq], [srcq + strideq], u,u pmullw m0, [pw_7] pmullw m1, [pw_7] ; 3*( ... + src[-2] + src[3]) - UNPACK_ADD m2, m3, [src0q + strideq], [srcq + stridex3q], a,a + UNPACK_ADD m2, m3, [src0q + strideq], [srcq + stridex3q], u,u paddw m0, m2 paddw m1, m3 pmullw m0, [pw_3] pmullw m1, [pw_3] ; ... - 7*(src[-1] + src[2]) - UNPACK_ADD m2, m3, [src0q + strideq*2], [srcq + strideq*2], a,a + UNPACK_ADD m2, m3, [src0q + strideq*2], [srcq + strideq*2], u,u pmullw m2, [pw_7] pmullw m3, [pw_7] psubw m0, m2 psubw m1, m3 ; ... - (src[-3] + src[4]) - UNPACK_ADD m2, m3, [src0q], [srcq + strideq*4], a,a + UNPACK_ADD m2, m3, [src0q], [srcq + strideq*4], u,u psubw m0, m2 psubw m1, m3 @@ -79,7 +79,7 @@ cglobal dirac_hpel_filter_v_%1, 4,6,8, dst, src, stride, width, src0, stridex3 psraw m0, 5 psraw m1, 5 packuswb m0, m1 - mova [dstq], m0 + movu [dstq], m0 add dstq, mmsize add srcq, mmsize add src0q, mmsize

1 0