hevcdsp: fix compilation for arm and aarch64

Also add av_cold to ff_hevcdsp_init_arm.

James Almer committed 11 years ago

Commit d5addf11 parent a251aa15 files · +62 −12Browse files

Unified · Split

5 files

@@ -37,6 +37,7 @@ OBJS-$(CONFIG_DCA_DECODER) += arm/dcadsp_init_arm.o · 36 unmodified lines
37	OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \	37	OBJS-$(CONFIG_FLAC_DECODER) += arm/flacdsp_init_arm.o \
38	arm/flacdsp_arm.o	38	arm/flacdsp_arm.o
39	OBJS-$(CONFIG_FLAC_ENCODER) += arm/flacdsp_init_arm.o	39	OBJS-$(CONFIG_FLAC_ENCODER) += arm/flacdsp_init_arm.o
		40	OBJS-$(CONFIG_HEVC_DECODER) += arm/hevcdsp_init_arm.o
40	OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o	41	OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_init_arm.o
41	OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o	42	OBJS-$(CONFIG_VC1_DECODER) += arm/vc1dsp_init_arm.o
42	OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o	43	OBJS-$(CONFIG_VORBIS_DECODER) += arm/vorbisdsp_init_arm.o

@@ -0,0 +1,26 @@
	1	/*
	2	* This file is part of FFmpeg.
	3	*
	4	* FFmpeg is free software; you can redistribute it and/or
	5	* modify it under the terms of the GNU Lesser General Public
	6	* License as published by the Free Software Foundation; either
	7	* version 2.1 of the License, or (at your option) any later version.
	8	*
	9	* FFmpeg is distributed in the hope that it will be useful,
	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	12	* Lesser General Public License for more details.
	13	*
	14	* You should have received a copy of the GNU Lesser General Public
	15	* License along with FFmpeg; if not, write to the Free Software
	16	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	17	*/
	18
	19	#ifndef AVCODEC_ARM_HEVCDSP_ARM_H
	20	#define AVCODEC_ARM_HEVCDSP_ARM_H
	21
	22	#include "libavcodec/hevcdsp.h"
	23
	24	void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth);
	25
	26	#endif /* AVCODEC_ARM_HEVCDSP_ARM_H */

@@ -0,0 +1,32 @@
	1	/*
	2	* Copyright (c) 2014 Seppo Tomperi <seppo.tomperi@vtt.fi>
	3	*
	4	* This file is part of FFmpeg.
	5	*
	6	* FFmpeg is free software; you can redistribute it and/or
	7	* modify it under the terms of the GNU Lesser General Public
	8	* License as published by the Free Software Foundation; either
	9	* version 2.1 of the License, or (at your option) any later version.
	10	*
	11	* FFmpeg is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	14	* Lesser General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU Lesser General Public
	17	* License along with FFmpeg; if not, write to the Free Software
	18	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	19	*/
	20
	21	#include "libavutil/attributes.h"
	22	#include "libavutil/arm/cpu.h"
	23	#include "libavcodec/hevcdsp.h"
	24	#include "hevcdsp_arm.h"
	25
	26	av_cold void ff_hevcdsp_init_arm(HEVCDSPContext *c, const int bit_depth)
	27	{
	28	int cpu_flags = av_get_cpu_flags();
	29
	30	if (have_neon(cpu_flags))
	31	ff_hevcdsp_init_neon(c, bit_depth);
	32	}

 #include "libavutil/attributes.h"
 #include "libavutil/arm/cpu.h"
 #include "libavcodec/hevcdsp.h"
+#include "hevcdsp_arm.h"
 void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
 void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q);
     put_hevc_qpel_uw_neon[my][mx](dst, dststride, src, srcstride, width, height, src2, MAX_PB_SIZE);
 }
-static av_cold void hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth)
+av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth)
 {
-#if HAVE_NEON
     if (bit_depth == 8) {
         int x;
         c->hevc_v_loop_filter_luma     = ff_hevc_v_loop_filter_luma_neon;
         c->put_hevc_qpel_uni[8][0][0]  = ff_hevc_put_qpel_uw_pixels_w48_neon_8;
         c->put_hevc_qpel_uni[9][0][0]  = ff_hevc_put_qpel_uw_pixels_w64_neon_8;
     }
-#endif // HAVE_NEON
-}
-void ff_hevcdsp_init_arm(HEVCDSPContext *c, const int bit_depth)
-{
-    int cpu_flags = av_get_cpu_flags();
-    if (have_neon(cpu_flags))
-        hevcdsp_init_neon(c, bit_depth);
 }

@@ -259,6 +259,6 @@ int i = 0; · 258 unmodified lines
259		259
260	if (ARCH_X86)	260	if (ARCH_X86)
261	ff_hevc_dsp_init_x86(hevcdsp, bit_depth);	261	ff_hevc_dsp_init_x86(hevcdsp, bit_depth);
262	if (HAVE_NEON)	262	if (ARCH_ARM)
263	ff_hevcdsp_init_arm(hevcdsp, bit_depth);	263	ff_hevcdsp_init_arm(hevcdsp, bit_depth);
264	}	264	}

Keyboard shortcuts