Commit fd601e34 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Rename av1_convolve.[hc] to convolve.[hc]" into nextgenv2

parents ec040fe2 6557ea9f
...@@ -78,8 +78,8 @@ ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes) ...@@ -78,8 +78,8 @@ ifeq ($(CONFIG_AOM_HIGHBITDEPTH),yes)
AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_sse4.c AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_sse4.c
AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_filters_sse4.h AV1_COMMON_SRCS-$(HAVE_SSE4_1) += common/x86/av1_highbd_convolve_filters_sse4.h
endif endif
AV1_COMMON_SRCS-yes += common/av1_convolve.c AV1_COMMON_SRCS-yes += common/convolve.c
AV1_COMMON_SRCS-yes += common/av1_convolve.h AV1_COMMON_SRCS-yes += common/convolve.h
AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.h AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.h
AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.c AV1_COMMON_SRCS-$(CONFIG_LOOP_RESTORATION) += common/restoration.c
ifeq (yes,$(filter $(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION),yes)) ifeq (yes,$(filter $(CONFIG_GLOBAL_MOTION) $(CONFIG_WARPED_MOTION),yes))
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <string.h> #include <string.h>
#include "./av1_rtcd.h" #include "./av1_rtcd.h"
#include "av1/common/av1_convolve.h" #include "av1/common/convolve.h"
#include "av1/common/filter.h" #include "av1/common/filter.h"
#include "aom_dsp/aom_dsp_common.h" #include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "av1/common/filter.h" #include "av1/common/filter.h"
#include "av1/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "av1/common/av1_convolve.h" #include "av1/common/convolve.h"
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "./aom_dsp_rtcd.h" #include "./aom_dsp_rtcd.h"
#include "test/acm_random.h" #include "test/acm_random.h"
#include "av1/common/filter.h" #include "av1/common/filter.h"
#include "av1/common/av1_convolve.h" #include "av1/common/convolve.h"
#include "aom_dsp/aom_dsp_common.h" #include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/mem.h" #include "aom_ports/mem.h"
......
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