ref: 4e4bfcc1bc17837277ae74ef4daab22a7c574fe7
parent: 45e059ec5ff7e11fa42a545c22cddc0aba06be6c
author: Martin Storsjö <[email protected]>
date: Wed Mar 5 06:16:36 EST 2014
Regenerate makefiles to include the encoder arm assembly
--- a/codec/common/targets.mk
+++ b/codec/common/targets.mk
@@ -25,6 +25,7 @@
ifeq ($(ASM_ARCH), arm)
COMMON_ASM_S_SRCS=\
$(COMMON_SRCDIR)/deblocking_neon.S\
+ $(COMMON_SRCDIR)/expand_picture_neon.S\
COMMON_OBJS += $(COMMON_ASM_S_SRCS:.S=.o)
endif
--- a/codec/encoder/targets.mk
+++ b/codec/encoder/targets.mk
@@ -47,6 +47,18 @@
ENCODER_OBJS += $(ENCODER_ASM_SRCS:.asm=.o)
endif
+ifeq ($(ASM_ARCH), arm)
+ENCODER_ASM_S_SRCS=\
+ $(ENCODER_SRCDIR)/core/arm/intra_pred_neon.S\
+ $(ENCODER_SRCDIR)/core/arm/intra_pred_sad_3_opt_neon.S\
+ $(ENCODER_SRCDIR)/core/arm/mc_neon.S\
+ $(ENCODER_SRCDIR)/core/arm/memory_neon.S\
+ $(ENCODER_SRCDIR)/core/arm/pixel_neon.S\
+ $(ENCODER_SRCDIR)/core/arm/reconstruct_neon.S\
+
+ENCODER_OBJS += $(ENCODER_ASM_S_SRCS:.S=.o)
+endif
+
OBJS += $(ENCODER_OBJS)
$(ENCODER_SRCDIR)/%.o: $(ENCODER_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c $(CXX_O) $<
@@ -53,6 +65,9 @@
$(ENCODER_SRCDIR)/%.o: $(ENCODER_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(ENCODER_ASMFLAGS) $(ENCODER_ASM_INCLUDES) -o $@ $<
+
+$(ENCODER_SRCDIR)/%.o: $(ENCODER_SRCDIR)/%.S
+ $(QUIET_CCAS)$(CCAS) $(CFLAGS) $(ASMFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c -o $@ $<
$(LIBPREFIX)encoder.$(LIBSUFFIX): $(ENCODER_OBJS)
$(QUIET)rm -f $@
--- a/codec/processing/targets.mk
+++ b/codec/processing/targets.mk
@@ -29,6 +29,16 @@
PROCESSING_OBJS += $(PROCESSING_ASM_SRCS:.asm=.o)
endif
+ifeq ($(ASM_ARCH), arm)
+PROCESSING_ASM_S_SRCS=\
+ $(PROCESSING_SRCDIR)/src/arm/adaptive_quantization.S\
+ $(PROCESSING_SRCDIR)/src/arm/down_sample_neon.S\
+ $(PROCESSING_SRCDIR)/src/arm/pixel_sad_neon.S\
+ $(PROCESSING_SRCDIR)/src/arm/vaa_calc_neon.S\
+
+PROCESSING_OBJS += $(PROCESSING_ASM_S_SRCS:.S=.o)
+endif
+
OBJS += $(PROCESSING_OBJS)
$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.cpp
$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<
@@ -35,6 +45,9 @@
$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.asm
$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<
+
+$(PROCESSING_SRCDIR)/%.o: $(PROCESSING_SRCDIR)/%.S
+ $(QUIET_CCAS)$(CCAS) $(CFLAGS) $(ASMFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c -o $@ $<
$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)
$(QUIET)rm -f $@