libavcodec/*/vp8dsp_init: indent
authorPeter Ross <pross@xvid.org>
Fri, 14 Feb 2014 11:58:36 +0000 (22:58 +1100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 12:29:29 +0000 (13:29 +0100)
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/vp8dsp_init_armv6.c
libavcodec/arm/vp8dsp_init_neon.c
libavcodec/x86/vp8dsp_init.c

index d8197e7..3cd7793 100644 (file)
@@ -43,26 +43,26 @@ VP8_BILIN(4,  armv6);
 av_cold void ff_vp8dsp_init_armv6(VP8DSPContext *dsp, int vp7)
 {
     if (!vp7) {
-    dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_armv6;
-    dsp->vp8_luma_dc_wht_dc = ff_vp8_luma_dc_wht_dc_armv6;
-
-    dsp->vp8_idct_add       = ff_vp8_idct_add_armv6;
-    dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_armv6;
-    dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_armv6;
-    dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_armv6;
-
-    dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_armv6;
-    dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_armv6;
-    dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_armv6;
-    dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_armv6;
-
-    dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_armv6;
-    dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_armv6;
-    dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_armv6;
-    dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_armv6;
-
-    dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_armv6;
-    dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_armv6;
+        dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_armv6;
+        dsp->vp8_luma_dc_wht_dc = ff_vp8_luma_dc_wht_dc_armv6;
+
+        dsp->vp8_idct_add       = ff_vp8_idct_add_armv6;
+        dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_armv6;
+        dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_armv6;
+        dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_armv6;
+
+        dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_armv6;
+        dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_armv6;
+        dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_armv6;
+        dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_armv6;
+
+        dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_armv6;
+        dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_armv6;
+        dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_armv6;
+        dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_armv6;
+
+        dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_armv6;
+        dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_armv6;
     }
 
     dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_armv6;
index 400ef2d..b51ca25 100644 (file)
@@ -42,25 +42,25 @@ VP8_BILIN(4,  neon);
 av_cold void ff_vp8dsp_init_neon(VP8DSPContext *dsp, int vp7)
 {
     if (!vp7) {
-    dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_neon;
+        dsp->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_neon;
 
-    dsp->vp8_idct_add       = ff_vp8_idct_add_neon;
-    dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_neon;
-    dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_neon;
-    dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_neon;
+        dsp->vp8_idct_add       = ff_vp8_idct_add_neon;
+        dsp->vp8_idct_dc_add    = ff_vp8_idct_dc_add_neon;
+        dsp->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_neon;
+        dsp->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_neon;
 
-    dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon;
-    dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon;
-    dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon;
-    dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon;
+        dsp->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_neon;
+        dsp->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_neon;
+        dsp->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_neon;
+        dsp->vp8_h_loop_filter8uv = ff_vp8_h_loop_filter8uv_neon;
 
-    dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_neon;
-    dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_neon;
-    dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_neon;
-    dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_neon;
+        dsp->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_neon;
+        dsp->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_neon;
+        dsp->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_neon;
+        dsp->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_neon;
 
-    dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_neon;
-    dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_neon;
+        dsp->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_neon;
+        dsp->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_neon;
     }
 
     dsp->put_vp8_epel_pixels_tab[0][0][0] = ff_put_vp8_pixels16_neon;
index d9ce977..e7ac9d2 100644 (file)
@@ -322,14 +322,14 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
 
     if (EXTERNAL_MMX(cpu_flags)) {
         if (!vp7) {
-        c->vp8_idct_dc_add    = ff_vp8_idct_dc_add_mmx;
-        c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_mmx;
+            c->vp8_idct_dc_add    = ff_vp8_idct_dc_add_mmx;
+            c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_mmx;
         }
 #if ARCH_X86_32
         if (!vp7) {
-        c->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_mmx;
-        c->vp8_idct_add       = ff_vp8_idct_add_mmx;
-        c->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_mmx;
+            c->vp8_idct_dc_add4y  = ff_vp8_idct_dc_add4y_mmx;
+            c->vp8_idct_add       = ff_vp8_idct_add_mmx;
+            c->vp8_luma_dc_wht    = ff_vp8_luma_dc_wht_mmx;
         }
         c->put_vp8_epel_pixels_tab[0][0][0]     =
         c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_mmx;
@@ -339,18 +339,18 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
 
 #if ARCH_X86_32
         if (!vp7) {
-        c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_mmx;
-        c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_mmx;
-
-        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmx;
-        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmx;
-        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmx;
-        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmx;
-
-        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmx;
-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmx;
-        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmx;
-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmx;
+            c->vp8_v_loop_filter_simple   = ff_vp8_v_loop_filter_simple_mmx;
+            c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_mmx;
+
+            c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmx;
+            c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmx;
+            c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmx;
+            c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmx;
+
+            c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmx;
+            c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmx;
+            c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmx;
+            c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmx;
         }
 #endif
     }
@@ -367,26 +367,26 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
         VP8_BILINEAR_MC_FUNC(1,  8, mmxext);
 
         if (!vp7) {
-        c->vp8_v_loop_filter_simple   = ff_vp8_v_loop_filter_simple_mmxext;
-        c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_mmxext;
-
-        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmxext;
-        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmxext;
-        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmxext;
-        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmxext;
-
-        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmxext;
-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmxext;
-        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmxext;
-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmxext;
+            c->vp8_v_loop_filter_simple   = ff_vp8_v_loop_filter_simple_mmxext;
+            c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_mmxext;
+
+            c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_mmxext;
+            c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_mmxext;
+            c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_mmxext;
+            c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_mmxext;
+
+            c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_mmxext;
+            c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_mmxext;
+            c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_mmxext;
+            c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_mmxext;
         }
 #endif
     }
 
     if (EXTERNAL_SSE(cpu_flags)) {
         if (!vp7) {
-        c->vp8_idct_add                         = ff_vp8_idct_add_sse;
-        c->vp8_luma_dc_wht                      = ff_vp8_luma_dc_wht_sse;
+            c->vp8_idct_add                         = ff_vp8_idct_add_sse;
+            c->vp8_luma_dc_wht                      = ff_vp8_luma_dc_wht_sse;
         }
         c->put_vp8_epel_pixels_tab[0][0][0]     =
         c->put_vp8_bilinear_pixels_tab[0][0][0] = ff_put_vp8_pixels16_sse;
@@ -399,27 +399,27 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
         VP8_BILINEAR_MC_FUNC(1, 8, sse2);
 
         if (!vp7) {
-        c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_sse2;
+            c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_sse2;
 
-        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_sse2;
-        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_sse2;
+            c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_sse2;
+            c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_sse2;
 
-        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_sse2;
-        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_sse2;
+            c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_sse2;
+            c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_sse2;
         }
     }
 
     if (EXTERNAL_SSE2(cpu_flags)) {
         if (!vp7) {
-        c->vp8_idct_dc_add4y          = ff_vp8_idct_dc_add4y_sse2;
+            c->vp8_idct_dc_add4y          = ff_vp8_idct_dc_add4y_sse2;
 
-        c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_sse2;
+            c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_sse2;
 
-        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_sse2;
-        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_sse2;
+            c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_sse2;
+            c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_sse2;
 
-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse2;
-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse2;
+            c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse2;
+            c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse2;
         }
     }
 
@@ -432,28 +432,28 @@ av_cold void ff_vp8dsp_init_x86(VP8DSPContext* c, int vp7)
         VP8_BILINEAR_MC_FUNC(2, 4, ssse3);
 
         if (!vp7) {
-        c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_ssse3;
-        c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_ssse3;
-
-        c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_ssse3;
-        c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_ssse3;
-        c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_ssse3;
-        c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_ssse3;
-
-        c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_ssse3;
-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_ssse3;
-        c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_ssse3;
-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_ssse3;
+            c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter_simple_ssse3;
+            c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter_simple_ssse3;
+
+            c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16y_inner_ssse3;
+            c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16y_inner_ssse3;
+            c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_ssse3;
+            c->vp8_h_loop_filter8uv_inner = ff_vp8_h_loop_filter8uv_inner_ssse3;
+
+            c->vp8_v_loop_filter16y       = ff_vp8_v_loop_filter16y_mbedge_ssse3;
+            c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_ssse3;
+            c->vp8_v_loop_filter8uv       = ff_vp8_v_loop_filter8uv_mbedge_ssse3;
+            c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_ssse3;
         }
     }
 
     if (EXTERNAL_SSE4(cpu_flags)) {
         if (!vp7) {
-        c->vp8_idct_dc_add                  = ff_vp8_idct_dc_add_sse4;
+            c->vp8_idct_dc_add            = ff_vp8_idct_dc_add_sse4;
 
-        c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_sse4;
-        c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse4;
-        c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse4;
+            c->vp8_h_loop_filter_simple   = ff_vp8_h_loop_filter_simple_sse4;
+            c->vp8_h_loop_filter16y       = ff_vp8_h_loop_filter16y_mbedge_sse4;
+            c->vp8_h_loop_filter8uv       = ff_vp8_h_loop_filter8uv_mbedge_sse4;
         }
     }
 #endif /* HAVE_YASM */