Commit 9d1bb3e8 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

arm_neon: remove recursion

parent ecbe7bc1
...@@ -4210,7 +4210,6 @@ AC_CONFIG_FILES([ ...@@ -4210,7 +4210,6 @@ AC_CONFIG_FILES([
modules/video_output/Makefile modules/video_output/Makefile
modules/video_splitter/Makefile modules/video_splitter/Makefile
modules/visualization/Makefile modules/visualization/Makefile
modules/arm_neon/Makefile
modules/hw/vdpau/Makefile modules/hw/vdpau/Makefile
]) ])
......
...@@ -21,7 +21,6 @@ EXTRA_SUBDIRS = \ ...@@ -21,7 +21,6 @@ EXTRA_SUBDIRS = \
access_output \ access_output \
mux \ mux \
stream_out \ stream_out \
arm_neon \
hw/vdpau \ hw/vdpau \
lua lua
...@@ -30,9 +29,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) ...@@ -30,9 +29,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
if ENABLE_SOUT if ENABLE_SOUT
SUBDIRS += access_output mux stream_out SUBDIRS += access_output mux stream_out
endif endif
if HAVE_NEON
SUBDIRS += arm_neon
endif
if HAVE_VDPAU if HAVE_VDPAU
SUBDIRS += hw/vdpau SUBDIRS += hw/vdpau
endif endif
...@@ -45,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST ...@@ -45,6 +41,7 @@ dist_noinst_DATA = MODULES_LIST
include common.am include common.am
include access/Makefile.am include access/Makefile.am
include arm_neon/Makefile.am
include audio_output/Makefile.am include audio_output/Makefile.am
include codec/Makefile.am include codec/Makefile.am
include demux/Makefile.am include demux/Makefile.am
......
AM_LIBTOOLFLAGS=--tag=CC
include $(top_srcdir)/modules/common.am
neondir = $(pluginsdir)/arm_neon neondir = $(pluginsdir)/arm_neon
libsimple_channel_mixer_neon_plugin_la_SOURCES = \ libsimple_channel_mixer_neon_plugin_la_SOURCES = \
simple_channel_mixer.S \ arm_neon/simple_channel_mixer.S \
simple_channel_mixer.c arm_neon/simple_channel_mixer.c
libsimple_channel_mixer_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libsimple_channel_mixer_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libsimple_channel_mixer_neon_plugin_la_DEPENDENCIES = libsimple_channel_mixer_neon_plugin_LIBTOOLFLAGS = --tag=CC
libchroma_yuv_neon_plugin_la_SOURCES = \ libchroma_yuv_neon_plugin_la_SOURCES = \
i420_yuyv.S \ arm_neon/i420_yuyv.S \
i422_yuyv.S \ arm_neon/i422_yuyv.S \
yuyv_i422.S \ arm_neon/yuyv_i422.S \
chroma_yuv.c chroma_neon.h arm_neon/chroma_yuv.c arm_neon/chroma_neon.h
libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libchroma_yuv_neon_plugin_LIBTOOLFLAGS = --tag=CC
libvolume_neon_plugin_la_SOURCES = volume.c amplify.S libvolume_neon_plugin_la_SOURCES = arm_neon/volume.c arm_neon/amplify.S
libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libvolume_neon_plugin_LIBTOOLFLAGS = --tag=CC
libyuv_rgb_neon_plugin_la_SOURCES = \ libyuv_rgb_neon_plugin_la_SOURCES = \
i420_rgb.S \ arm_neon/i420_rgb.S \
i420_rv16.S \ arm_neon/i420_rv16.S \
nv21_rgb.S \ arm_neon/nv21_rgb.S \
nv12_rgb.S \ arm_neon/nv12_rgb.S \
yuv_rgb.c arm_neon/yuv_rgb.c
libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
if HAVE_NEON
neon_LTLIBRARIES = \ neon_LTLIBRARIES = \
libsimple_channel_mixer_neon_plugin.la \ libsimple_channel_mixer_neon_plugin.la \
libchroma_yuv_neon_plugin.la \ libchroma_yuv_neon_plugin.la \
libvolume_neon_plugin.la \ libvolume_neon_plugin.la \
libyuv_rgb_neon_plugin.la libyuv_rgb_neon_plugin.la
endif
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_filter.h> #include <vlc_filter.h>
#include <vlc_cpu.h> #include <vlc_cpu.h>
#include "chroma_neon.h" #include "arm_neon/chroma_neon.h"
static int Open (vlc_object_t *); static int Open (vlc_object_t *);
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_filter.h> #include <vlc_filter.h>
#include <vlc_cpu.h> #include <vlc_cpu.h>
#include "chroma_neon.h" #include "arm_neon/chroma_neon.h"
static int Open (vlc_object_t *); static int Open (vlc_object_t *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment