[FFmpeg-cvslog] r16072 - in trunk/libavcodec: Makefile dnxhdenc.c dnxhdenc.h i386/dnxhd_mmx.c

[bcoudurier]

Author: bcoudurier
Date: Fri Dec 12 01:19:14 2008
New Revision: 16072

Log:
dnxhd get_pixels_8x4_sym sse2

Added:
   trunk/libavcodec/i386/dnxhd_mmx.c
Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/dnxhdenc.c
   trunk/libavcodec/dnxhdenc.h

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Fri Dec 12 01:19:14 2008
@@ -408,6 +408,7 @@ MMX-OBJS-$(CONFIG_WMV3_DECODER)        +
 MMX-OBJS-$(HAVE_YASM)                  += i386/dsputil_yasm.o
 
 OBJS-$(HAVE_MMX)                       += i386/cpuid.o                  \
+                                          i386/dnxhd_mmx.o              \
                                           i386/dsputil_mmx.o            \
                                           i386/fdct_mmx.o               \
                                           i386/idct_mmx_xvid.o          \

Modified: trunk/libavcodec/dnxhdenc.c
==============================================================================
--- trunk/libavcodec/dnxhdenc.c	(original)
+++ trunk/libavcodec/dnxhdenc.c	Fri Dec 12 01:19:14 2008
@@ -173,8 +173,13 @@ static int dnxhd_encode_init(AVCodecCont
     ctx->m.mb_intra = 1;
     ctx->m.h263_aic = 1;
 
+    ctx->get_pixels_8x4_sym = dnxhd_get_pixels_8x4;
+
     dsputil_init(&ctx->m.dsp, avctx);
     ff_dct_common_init(&ctx->m);
+#ifdef HAVE_MMX
+    ff_dnxhd_init_mmx(ctx);
+#endif
     if (!ctx->m.dct_quantize)
         ctx->m.dct_quantize = dct_quantize_c;
 
@@ -361,10 +366,10 @@ static av_always_inline void dnxhd_get_b
 
     if (mb_y+1 == ctx->m.mb_height && ctx->m.avctx->height == 1080) {
         if (ctx->interlaced) {
-            dnxhd_get_pixels_8x4(ctx->blocks[4], ptr_y + ctx->dct_y_offset    , ctx->m.linesize);
-            dnxhd_get_pixels_8x4(ctx->blocks[5], ptr_y + ctx->dct_y_offset + 8, ctx->m.linesize);
-            dnxhd_get_pixels_8x4(ctx->blocks[6], ptr_u + ctx->dct_uv_offset   , ctx->m.uvlinesize);
-            dnxhd_get_pixels_8x4(ctx->blocks[7], ptr_v + ctx->dct_uv_offset   , ctx->m.uvlinesize);
+            ctx->get_pixels_8x4_sym(ctx->blocks[4], ptr_y + ctx->dct_y_offset    , ctx->m.linesize);
+            ctx->get_pixels_8x4_sym(ctx->blocks[5], ptr_y + ctx->dct_y_offset + 8, ctx->m.linesize);
+            ctx->get_pixels_8x4_sym(ctx->blocks[6], ptr_u + ctx->dct_uv_offset   , ctx->m.uvlinesize);
+            ctx->get_pixels_8x4_sym(ctx->blocks[7], ptr_v + ctx->dct_uv_offset   , ctx->m.uvlinesize);
         } else {
             dsp->clear_block(ctx->blocks[4]); dsp->clear_block(ctx->blocks[5]);
             dsp->clear_block(ctx->blocks[6]); dsp->clear_block(ctx->blocks[7]);

Modified: trunk/libavcodec/dnxhdenc.h
==============================================================================
--- trunk/libavcodec/dnxhdenc.h	(original)
+++ trunk/libavcodec/dnxhdenc.h	Fri Dec 12 01:19:14 2008
@@ -81,6 +81,8 @@ typedef struct DNXHDEncContext {
 
     RCCMPEntry *mb_cmp;
     RCEntry   (*mb_rc)[8160];
+
+    void (*get_pixels_8x4_sym)(DCTELEM */*align 16*/, const uint8_t *, int);
 } DNXHDEncContext;
 
 void ff_dnxhd_init_mmx(DNXHDEncContext *ctx);

Added: trunk/libavcodec/i386/dnxhd_mmx.c
==============================================================================
--- (empty file)
+++ trunk/libavcodec/i386/dnxhd_mmx.c	Fri Dec 12 01:19:14 2008
@@ -0,0 +1,58 @@
+/*
+ * VC3/DNxHD SIMD functions
+ * Copyright (c) 2007 Baptiste Coudurier <baptiste dot coudurier at smartjog dot com>
+ *
+ * VC-3 encoder funded by the British Broadcasting Corporation
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/x86_cpu.h"
+#include "libavcodec/dnxhdenc.h"
+
+static void get_pixels_8x4_sym_sse2(DCTELEM *block, const uint8_t *pixels, int line_size)
+{
+    __asm__ volatile(
+        "pxor %%xmm7,      %%xmm7       \n\t"
+        "movq (%0),        %%xmm0       \n\t"
+        "add  %2,          %0           \n\t"
+        "movq (%0),        %%xmm1       \n\t"
+        "movq (%0, %2),    %%xmm2       \n\t"
+        "movq (%0, %2,2),  %%xmm3       \n\t"
+        "punpcklbw %%xmm7, %%xmm0       \n\t"
+        "punpcklbw %%xmm7, %%xmm1       \n\t"
+        "punpcklbw %%xmm7, %%xmm2       \n\t"
+        "punpcklbw %%xmm7, %%xmm3       \n\t"
+        "movdqa %%xmm0,      (%1)       \n\t"
+        "movdqa %%xmm1,    16(%1)       \n\t"
+        "movdqa %%xmm2,    32(%1)       \n\t"
+        "movdqa %%xmm3,    48(%1)       \n\t"
+        "movdqa %%xmm3 ,   64(%1)       \n\t"
+        "movdqa %%xmm2 ,   80(%1)       \n\t"
+        "movdqa %%xmm1 ,   96(%1)       \n\t"
+        "movdqa %%xmm0,   112(%1)       \n\t"
+        : "+r" (pixels)
+        : "r" (block), "r" ((x86_reg)line_size)
+    );
+}
+
+void ff_dnxhd_init_mmx(DNXHDEncContext *ctx)
+{
+    if (mm_flags & FF_MM_SSE2) {
+        ctx->get_pixels_8x4_sym = get_pixels_8x4_sym_sse2;
+    }
+}