Re: [libav-devel] [PATCH] configure: Add missing dxva2 dependency for dxva2_lib

2016-12-11 Thread Luca Barbato
On 11/12/2016 17:14, Diego Biurrun wrote:
> ---
> 
> .. grmbl ..
> 
>  configure | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configure b/configure
> index f14165b..37d04ab 100755
> --- a/configure
> +++ b/configure
> @@ -2164,6 +2164,7 @@ zmbv_encoder_extralibs="zlib_extralibs"
>  # hardware accelerators
>  d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
>  dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
> +dxva2_lib_deps="dxva2"
>  vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
>  vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration 
> -framework QuartzCore"
>  
> 

... ok...
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


[libav-devel] [PATCH] configure: Add missing dxva2 dependency for dxva2_lib

2016-12-11 Thread Diego Biurrun
---

.. grmbl ..

 configure | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure b/configure
index f14165b..37d04ab 100755
--- a/configure
+++ b/configure
@@ -2164,6 +2164,7 @@ zmbv_encoder_extralibs="zlib_extralibs"
 # hardware accelerators
 d3d11va_deps="d3d11_h dxva_h ID3D11VideoDecoder"
 dxva2_deps="dxva2api_h DXVA2_ConfigPictureDecode"
+dxva2_lib_deps="dxva2"
 vda_deps="VideoDecodeAcceleration_VDADecoder_h pthreads"
 vda_extralibs="-framework CoreFoundation -framework VideoDecodeAcceleration 
-framework QuartzCore"
 
-- 
2.1.4

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel


Re: [libav-devel] [PATCH] hevc: Add HEVC IDCT 4x4 for PPC

2016-12-11 Thread Diego Biurrun
On Sun, Dec 11, 2016 at 12:10:19PM +0100, Alexandra Hájková wrote:
> From: Alexandra Hajkova 
> 
> ---
>  libavcodec/hevcdsp.c  |   2 +
>  libavcodec/hevcdsp.h  |   1 +
>  libavcodec/ppc/Makefile   |   1 +
>  libavcodec/ppc/hevcdsp.c  | 108 
> ++
>  libavcodec/ppc/hevcdsp_template.c |  48 +
>  5 files changed, 160 insertions(+)
>  create mode 100644 libavcodec/ppc/hevcdsp.c
>  create mode 100644 libavcodec/ppc/hevcdsp_template.c

LGTM

Diego
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH] hevc: Add HEVC IDCT 4x4 for PPC

2016-12-11 Thread Alexandra Hájková
From: Alexandra Hajkova 

---
 libavcodec/hevcdsp.c  |   2 +
 libavcodec/hevcdsp.h  |   1 +
 libavcodec/ppc/Makefile   |   1 +
 libavcodec/ppc/hevcdsp.c  | 108 ++
 libavcodec/ppc/hevcdsp_template.c |  48 +
 5 files changed, 160 insertions(+)
 create mode 100644 libavcodec/ppc/hevcdsp.c
 create mode 100644 libavcodec/ppc/hevcdsp_template.c

diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c
index 7c19198..8ae023b 100644
--- a/libavcodec/hevcdsp.c
+++ b/libavcodec/hevcdsp.c
@@ -245,6 +245,8 @@ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int 
bit_depth)
 break;
 }
 
+if (ARCH_PPC)
+ff_hevc_dsp_init_ppc(hevcdsp, bit_depth);
 if (ARCH_X86)
 ff_hevc_dsp_init_x86(hevcdsp, bit_depth);
 }
diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h
index 49cb711..2f4ff01 100644
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevcdsp.h
@@ -115,6 +115,7 @@ typedef struct HEVCDSPContext {
 
 void ff_hevc_dsp_init(HEVCDSPContext *hpc, int bit_depth);
 
+void ff_hevc_dsp_init_ppc(HEVCDSPContext *c, const int bit_depth);
 void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth);
 
 extern const int16_t ff_hevc_epel_coeffs[7][16];
diff --git a/libavcodec/ppc/Makefile b/libavcodec/ppc/Makefile
index 09eabcb..4b92add 100644
--- a/libavcodec/ppc/Makefile
+++ b/libavcodec/ppc/Makefile
@@ -25,6 +25,7 @@ OBJS-$(CONFIG_VP8DSP)  += ppc/vp8dsp_altivec.o
 
 # decoders/encoders
 OBJS-$(CONFIG_APE_DECODER) += ppc/apedsp_altivec.o
+OBJS-$(CONFIG_HEVC_DECODER)+= ppc/hevcdsp.o
 OBJS-$(CONFIG_SVQ1_ENCODER)+= ppc/svq1enc_altivec.o
 OBJS-$(CONFIG_VORBIS_DECODER)  += ppc/vorbisdsp_altivec.o
 OBJS-$(CONFIG_VP7_DECODER) += ppc/vp8dsp_altivec.o
diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c
new file mode 100644
index 000..9200e27
--- /dev/null
+++ b/libavcodec/ppc/hevcdsp.c
@@ -0,0 +1,108 @@
+/* SIMD-optimized IDCT functions for HEVC decoding
+ * Copyright (c) Alexandra Hajkova
+ *
+ * This file is part of Libav.
+ *
+ * Libav 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.
+ *
+ * Libav 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 Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#if HAVE_ALTIVEC_H
+#include 
+#endif
+
+#include "libavutil/cpu.h"
+#include "libavutil/ppc/cpu.h"
+#include "libavutil/ppc/types_altivec.h"
+#include "libavutil/ppc/util_altivec.h"
+
+#include "libavcodec/hevcdsp.h"
+
+#if HAVE_ALTIVEC
+static const vector int16_t trans4[4] = {
+{ 64,  64, 64,  64, 64,  64, 64,  64 },
+{ 83,  36, 83,  36, 83,  36, 83,  36 },
+{ 64, -64, 64, -64, 64, -64, 64, -64 },
+{ 36, -83, 36, -83, 36, -83, 36, -83 },
+};
+
+static const vec_u8 mask[2] = {
+{ 0x00, 0x01, 0x08, 0x09, 0x10, 0x11, 0x18, 0x19, 0x02, 0x03, 0x0A, 0x0B, 
0x12, 0x13, 0x1A, 0x1B },
+{ 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, 0x06, 0x07, 0x0E, 0x0F, 
0x16, 0x17, 0x1E, 0x1F },
+};
+
+static void transform4x4(vector int16_t src_01, vector int16_t src_23,
+ vector int32_t res[4], const int shift, int16_t 
*coeffs)
+{
+vector int16_t src_02, src_13;
+vector int32_t zero = vec_splat_s32(0);
+vector int32_t e0, o0, e1, o1;
+vector int32_t add;
+
+src_13 = vec_mergel(src_01, src_23);
+src_02 = vec_mergeh(src_01, src_23);
+
+e0 = vec_msums(src_02, trans4[0], zero);
+o0 = vec_msums(src_13, trans4[1], zero);
+e1 = vec_msums(src_02, trans4[2], zero);
+o1 = vec_msums(src_13, trans4[3], zero);
+
+add = vec_sl(vec_splat_s32(1), vec_splat_u32(shift - 1));
+e0 = vec_add(e0, add);
+e1 = vec_add(e1, add);
+
+res[0] = vec_add(e0, o0);
+res[1] = vec_add(e1, o1);
+res[2] = vec_sub(e1, o1);
+res[3] = vec_sub(e0, o0);
+}
+
+static void scale(vector int32_t res[4], vector int16_t res_packed[2], int 
shift)
+{
+int i;
+vector unsigned int v_shift = vec_splat_u32(shift);
+
+for (i = 0; i < 4; i++)
+res[i] = vec_sra(res[i], v_shift);
+
+// clip16
+res_packed[0] = vec_packs(res[0], res[1]);
+res_packed[1] = vec_packs(res[2], res[3]);
+}
+
+#define FUNCDECL(a, depth) a ## _ ## depth ## _altivec
+#define FUNC(a, b) FUNCDECL(a, b)
+
+#define BIT_DEPTH 8
+#include "hevcdsp_template.c"
+#undef BIT_DEPTH
+
+#define BIT_DEPTH 10
+#include "hevc