build: Make "film_grain" vs "filmgrain" DSP file names consistent

17 files changed, 19 insertions, 19 deletions

diff --git a/src/arm/32/film_grain.S b/src/arm/32/filmgrain.S
index d1f83ef..d1f83ef 100644
--- a/src/arm/32/film_grain.S
+++ b/src/arm/32/filmgrain.S
diff --git a/src/arm/32/film_grain16.S b/src/arm/32/filmgrain16.S
index 6c36cac..6c36cac 100644
--- a/src/arm/32/film_grain16.S
+++ b/src/arm/32/filmgrain16.S
diff --git a/src/arm/64/film_grain.S b/src/arm/64/filmgrain.S
index 6cdd7ec..6cdd7ec 100644
--- a/src/arm/64/film_grain.S
+++ b/src/arm/64/filmgrain.S
diff --git a/src/arm/64/film_grain16.S b/src/arm/64/filmgrain16.S
index 7c4ff6d..7c4ff6d 100644
--- a/src/arm/64/film_grain16.S
+++ b/src/arm/64/filmgrain16.S
diff --git a/src/arm/film_grain_init_tmpl.c b/src/arm/filmgrain_init_tmpl.c
index 3a41602..2156047 100644
--- a/src/arm/film_grain_init_tmpl.c
+++ b/src/arm/filmgrain_init_tmpl.c
@@ -28,7 +28,7 @@
  */
 
 #include "src/cpu.h"
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 #include "asm-offsets.h"
 
 CHECK_OFFSET(Dav1dFilmGrainData, seed, FGD_SEED);
diff --git a/src/decode.c b/src/decode.c
index cbef36b..dff59c2 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -42,7 +42,7 @@
 #include "src/decode.h"
 #include "src/dequant_tables.h"
 #include "src/env.h"
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 #include "src/log.h"
 #include "src/qm.h"
 #include "src/recon.h"
diff --git a/src/fg_apply.h b/src/fg_apply.h
index 3e32841..be6685d 100644
--- a/src/fg_apply.h
+++ b/src/fg_apply.h
@@ -32,7 +32,7 @@
 
 #include "common/bitdepth.h"
 
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 
 #ifdef BITDEPTH
 # define array_decl(type, name, sz) type name sz
diff --git a/src/film_grain.h b/src/filmgrain.h
index d953542..d953542 100644
--- a/src/film_grain.h
+++ b/src/filmgrain.h
diff --git a/src/film_grain_tmpl.c b/src/filmgrain_tmpl.c
index 0c6a17c..883c5cb 100644
--- a/src/film_grain_tmpl.c
+++ b/src/filmgrain_tmpl.c
@@ -29,8 +29,8 @@
 #include "common/attributes.h"
 #include "common/intops.h"
 
-#include "film_grain.h"
-#include "tables.h"
+#include "src/filmgrain.h"
+#include "src/tables.h"
 
 #define SUB_GRAIN_WIDTH 44
 #define SUB_GRAIN_HEIGHT 38
diff --git a/src/internal.h b/src/internal.h
index 8231e2f..b42b316 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -43,7 +43,7 @@ typedef struct Dav1dTask Dav1dTask;
 #include "src/cdf.h"
 #include "src/data.h"
 #include "src/env.h"
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 #include "src/intra_edge.h"
 #include "src/ipred.h"
 #include "src/itx.h"
diff --git a/src/meson.build b/src/meson.build
index fe1cc12..ce5c7f5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -58,7 +58,7 @@ libdav1d_tmpl_sources = files(
     'cdef_apply_tmpl.c',
     'cdef_tmpl.c',
     'fg_apply_tmpl.c',
-    'film_grain_tmpl.c',
+    'filmgrain_tmpl.c',
     'ipred_prepare_tmpl.c',
     'ipred_tmpl.c',
     'itx_tmpl.c',
@@ -96,7 +96,7 @@ if is_asm_enabled
         )
         libdav1d_tmpl_sources += files(
             'arm/cdef_init_tmpl.c',
-            'arm/film_grain_init_tmpl.c',
+            'arm/filmgrain_init_tmpl.c',
             'arm/ipred_init_tmpl.c',
             'arm/itx_init_tmpl.c',
             'arm/loopfilter_init_tmpl.c',
@@ -116,7 +116,7 @@ if is_asm_enabled
             if dav1d_bitdepths.contains('8')
                 libdav1d_sources_asm += files(
                     'arm/64/cdef.S',
-                    'arm/64/film_grain.S',
+                    'arm/64/filmgrain.S',
                     'arm/64/ipred.S',
                     'arm/64/loopfilter.S',
                     'arm/64/looprestoration.S',
@@ -127,7 +127,7 @@ if is_asm_enabled
             if dav1d_bitdepths.contains('16')
                 libdav1d_sources_asm += files(
                     'arm/64/cdef16.S',
-                    'arm/64/film_grain16.S',
+                    'arm/64/filmgrain16.S',
                     'arm/64/ipred16.S',
                     'arm/64/itx16.S',
                     'arm/64/loopfilter16.S',
@@ -147,7 +147,7 @@ if is_asm_enabled
             if dav1d_bitdepths.contains('8')
                 libdav1d_sources_asm += files(
                     'arm/32/cdef.S',
-                    'arm/32/film_grain.S',
+                    'arm/32/filmgrain.S',
                     'arm/32/ipred.S',
                     'arm/32/loopfilter.S',
                     'arm/32/looprestoration.S',
@@ -158,7 +158,7 @@ if is_asm_enabled
             if dav1d_bitdepths.contains('16')
                 libdav1d_sources_asm += files(
                     'arm/32/cdef16.S',
-                    'arm/32/film_grain16.S',
+                    'arm/32/filmgrain16.S',
                     'arm/32/ipred16.S',
                     'arm/32/itx16.S',
                     'arm/32/loopfilter16.S',
@@ -183,7 +183,7 @@ if is_asm_enabled
 
         libdav1d_tmpl_sources += files(
             'x86/cdef_init_tmpl.c',
-            'x86/film_grain_init_tmpl.c',
+            'x86/filmgrain_init_tmpl.c',
             'x86/ipred_init_tmpl.c',
             'x86/itx_init_tmpl.c',
             'x86/loopfilter_init_tmpl.c',
@@ -212,10 +212,10 @@ if is_asm_enabled
                 'x86/looprestoration_avx512.asm',
                 'x86/mc_avx512.asm',
                 'x86/mc_avx2.asm',
-                'x86/film_grain_avx2.asm',
+                'x86/filmgrain_avx2.asm',
                 'x86/ipred_avx2.asm',
                 'x86/loopfilter_avx2.asm',
-                'x86/film_grain_sse.asm',
+                'x86/filmgrain_sse.asm',
                 'x86/ipred_sse.asm',
                 'x86/loopfilter_sse.asm',
                 'x86/looprestoration_sse.asm',
@@ -229,14 +229,14 @@ if is_asm_enabled
                 'x86/looprestoration16_avx512.asm',
                 'x86/mc16_avx512.asm',
                 'x86/cdef16_avx2.asm',
-                'x86/film_grain16_avx2.asm',
+                'x86/filmgrain16_avx2.asm',
                 'x86/ipred16_avx2.asm',
                 'x86/itx16_avx2.asm',
                 'x86/loopfilter16_avx2.asm',
                 'x86/looprestoration16_avx2.asm',
                 'x86/mc16_avx2.asm',
                 'x86/cdef16_sse.asm',
-                'x86/film_grain16_sse.asm',
+                'x86/filmgrain16_sse.asm',
                 'x86/ipred16_sse.asm',
                 'x86/itx16_sse.asm',
                 'x86/loopfilter16_sse.asm',
diff --git a/src/x86/film_grain16_avx2.asm b/src/x86/filmgrain16_avx2.asm
index e98a731..e98a731 100644
--- a/src/x86/film_grain16_avx2.asm
+++ b/src/x86/filmgrain16_avx2.asm
diff --git a/src/x86/film_grain16_sse.asm b/src/x86/filmgrain16_sse.asm
index 401c72d..401c72d 100644
--- a/src/x86/film_grain16_sse.asm
+++ b/src/x86/filmgrain16_sse.asm
diff --git a/src/x86/film_grain_avx2.asm b/src/x86/filmgrain_avx2.asm
index 1141b2c..1141b2c 100644
--- a/src/x86/film_grain_avx2.asm
+++ b/src/x86/filmgrain_avx2.asm
diff --git a/src/x86/film_grain_init_tmpl.c b/src/x86/filmgrain_init_tmpl.c
index 606ea3c..95a5e97 100644
--- a/src/x86/film_grain_init_tmpl.c
+++ b/src/x86/filmgrain_init_tmpl.c
@@ -26,7 +26,7 @@
  */
 
 #include "src/cpu.h"
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 
 decl_generate_grain_y_fn(BF(dav1d_generate_grain_y, ssse3));
 decl_generate_grain_uv_fn(BF(dav1d_generate_grain_uv_420, ssse3));
diff --git a/src/x86/film_grain_sse.asm b/src/x86/filmgrain_sse.asm
index 2a16722..2a16722 100644
--- a/src/x86/film_grain_sse.asm
+++ b/src/x86/filmgrain_sse.asm
diff --git a/tests/checkasm/filmgrain.c b/tests/checkasm/filmgrain.c
index a44a3ac..305a4f7 100644
--- a/tests/checkasm/filmgrain.c
+++ b/tests/checkasm/filmgrain.c
@@ -30,7 +30,7 @@
 #include <string.h>
 
 #include "src/levels.h"
-#include "src/film_grain.h"
+#include "src/filmgrain.h"
 #define UNIT_TEST 1
 #include "src/fg_apply_tmpl.c"