[1/5] Make naming of Independent JPEG Group IDCT components consistent

Message ID 1410269130-28173-1-git-send-email-diego@biurrun.de
State New
Headers show

Commit Message

Diego Biurrun Sept. 9, 2014, 1:25 p.m.
---
 libavcodec/Makefile                              |  2 +-
 libavcodec/arm/Makefile                          |  2 +-
 libavcodec/arm/dct-test.c                        |  2 +-
 libavcodec/arm/idct.h                            |  2 +-
 libavcodec/arm/idctdsp_init_arm.c                | 14 +++++++-------
 libavcodec/arm/{jrevdct_arm.S => jrevidct_arm.S} |  2 +-
 libavcodec/dct-test.c                            |  2 +-
 libavcodec/dct.h                                 |  6 +++---
 libavcodec/idctdsp.c                             |  6 +++---
 libavcodec/{jrevdct.c => jrevidct.c}             | 10 +++++-----
 10 files changed, 24 insertions(+), 24 deletions(-)
 rename libavcodec/arm/{jrevdct_arm.S => jrevidct_arm.S} (99%)
 rename libavcodec/{jrevdct.c => jrevidct.c} (99%)

Comments

Luca Barbato Sept. 11, 2014, 8:58 p.m. | #1
On 09/09/14 15:25, Diego Biurrun wrote:
> ---
>  libavcodec/Makefile                              |  2 +-
>  libavcodec/arm/Makefile                          |  2 +-
>  libavcodec/arm/dct-test.c                        |  2 +-
>  libavcodec/arm/idct.h                            |  2 +-
>  libavcodec/arm/idctdsp_init_arm.c                | 14 +++++++-------
>  libavcodec/arm/{jrevdct_arm.S => jrevidct_arm.S} |  2 +-
>  libavcodec/dct-test.c                            |  2 +-
>  libavcodec/dct.h                                 |  6 +++---
>  libavcodec/idctdsp.c                             |  6 +++---
>  libavcodec/{jrevdct.c => jrevidct.c}             | 10 +++++-----
>  10 files changed, 24 insertions(+), 24 deletions(-)
>  rename libavcodec/arm/{jrevdct_arm.S => jrevidct_arm.S} (99%)
>  rename libavcodec/{jrevdct.c => jrevidct.c} (99%)
> 

Seems safe, does oracle feel happy about it?

lu

Patch

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 178b61e..5e86f19 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -52,7 +52,7 @@  OBJS-$(CONFIG_HPELDSP)                 += hpeldsp.o
 OBJS-$(CONFIG_HUFFMAN)                 += huffman.o
 OBJS-$(CONFIG_HUFFYUVDSP)              += huffyuvdsp.o
 OBJS-$(CONFIG_HUFFYUVENCDSP)           += huffyuvencdsp.o
-OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o simple_idct.o jrevdct.o
+OBJS-$(CONFIG_IDCTDSP)                 += idctdsp.o simple_idct.o jrevidct.o
 OBJS-$(CONFIG_IIRFILTER)               += iirfilter.o
 OBJS-$(CONFIG_INTRAX8)                 += intrax8.o intrax8dsp.o
 OBJS-$(CONFIG_LIBXVID)                 += libxvid_rc.o
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile
index 6cbb0b9..3b0c982 100644
--- a/libavcodec/arm/Makefile
+++ b/libavcodec/arm/Makefile
@@ -17,7 +17,7 @@  OBJS-$(CONFIG_HPELDSP)                 += arm/hpeldsp_init_arm.o        \
                                           arm/hpeldsp_arm.o
 OBJS-$(CONFIG_IDCTDSP)                 += arm/idctdsp_init_arm.o        \
                                           arm/idctdsp_arm.o             \
-                                          arm/jrevdct_arm.o             \
+                                          arm/jrevidct_arm.o            \
                                           arm/simple_idct_arm.o
 OBJS-$(CONFIG_ME_CMP)                  += arm/me_cmp_init_arm.o
 OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
diff --git a/libavcodec/arm/dct-test.c b/libavcodec/arm/dct-test.c
index 70e5c1c..c33c1f9 100644
--- a/libavcodec/arm/dct-test.c
+++ b/libavcodec/arm/dct-test.c
@@ -26,7 +26,7 @@  static const struct algo fdct_tab_arch[] = {
 
 static const struct algo idct_tab_arch[] = {
     { "SIMPLE-ARM",     ff_simple_idct_arm,     FF_IDCT_PERM_NONE },
-    { "INT-ARM",        ff_j_rev_dct_arm,       FF_IDCT_PERM_LIBMPEG2 },
+    { "INT-ARM",        ff_j_rev_idct_arm,      FF_IDCT_PERM_LIBMPEG2 },
 #if HAVE_ARMV5TE
     { "SIMPLE-ARMV5TE", ff_simple_idct_armv5te, FF_IDCT_PERM_NONE,      AV_CPU_FLAG_ARMV5TE },
 #endif
diff --git a/libavcodec/arm/idct.h b/libavcodec/arm/idct.h
index 168d64b..dbb4a23 100644
--- a/libavcodec/arm/idct.h
+++ b/libavcodec/arm/idct.h
@@ -21,7 +21,7 @@ 
 
 #include <stdint.h>
 
-void ff_j_rev_dct_arm(int16_t *data);
+void ff_j_rev_idct_arm(int16_t *data);
 
 void ff_simple_idct_arm(int16_t *data);
 
diff --git a/libavcodec/arm/idctdsp_init_arm.c b/libavcodec/arm/idctdsp_init_arm.c
index 8207c31..5d492e4 100644
--- a/libavcodec/arm/idctdsp_init_arm.c
+++ b/libavcodec/arm/idctdsp_init_arm.c
@@ -34,15 +34,15 @@  void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest,
 
 /* XXX: those functions should be suppressed ASAP when all IDCTs are
  * converted */
-static void j_rev_dct_arm_put(uint8_t *dest, int line_size, int16_t *block)
+static void j_rev_idct_arm_put(uint8_t *dest, int line_size, int16_t *block)
 {
-    ff_j_rev_dct_arm(block);
+    ff_j_rev_idct_arm(block);
     ff_put_pixels_clamped(block, dest, line_size);
 }
 
-static void j_rev_dct_arm_add(uint8_t *dest, int line_size, int16_t *block)
+static void j_rev_idct_arm_add(uint8_t *dest, int line_size, int16_t *block)
 {
-    ff_j_rev_dct_arm(block);
+    ff_j_rev_idct_arm(block);
     ff_add_pixels_clamped(block, dest, line_size);
 }
 
@@ -66,9 +66,9 @@  av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
     if (!high_bit_depth) {
         if (avctx->idct_algo == FF_IDCT_AUTO ||
             avctx->idct_algo == FF_IDCT_ARM) {
-            c->idct_put  = j_rev_dct_arm_put;
-            c->idct_add  = j_rev_dct_arm_add;
-            c->idct      = ff_j_rev_dct_arm;
+            c->idct_put  = j_rev_idct_arm_put;
+            c->idct_add  = j_rev_idct_arm_add;
+            c->idct      = ff_j_rev_idct_arm;
             c->perm_type = FF_IDCT_PERM_LIBMPEG2;
         } else if (avctx->idct_algo == FF_IDCT_SIMPLEARM) {
             c->idct_put  = simple_idct_arm_put;
diff --git a/libavcodec/arm/jrevdct_arm.S b/libavcodec/arm/jrevidct_arm.S
similarity index 99%
rename from libavcodec/arm/jrevdct_arm.S
rename to libavcodec/arm/jrevidct_arm.S
index f951e2a..cf8772f 100644
--- a/libavcodec/arm/jrevdct_arm.S
+++ b/libavcodec/arm/jrevidct_arm.S
@@ -55,7 +55,7 @@ 
 #define FIX_M_2_562915447_ID   44
 #define FIX_0xFFFF_ID          48
 
-function ff_j_rev_dct_arm, export=1
+function ff_j_rev_idct_arm, export=1
         push {r0, r4 - r11, lr}
 
         mov lr, r0                      @ lr = pointer to the current row
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c
index 32cbe8c..6f7c6f3 100644
--- a/libavcodec/dct-test.c
+++ b/libavcodec/dct-test.c
@@ -67,7 +67,7 @@  static const struct algo fdct_tab[] = {
 
 static const struct algo idct_tab[] = {
     { "REF-DBL",     ff_ref_idct,          FF_IDCT_PERM_NONE },
-    { "INT",         ff_j_rev_dct,         FF_IDCT_PERM_LIBMPEG2 },
+    { "INT",         ff_j_rev_idct,        FF_IDCT_PERM_LIBMPEG2 },
     { "SIMPLE-C",    ff_simple_idct_8,     FF_IDCT_PERM_NONE },
 #if CONFIG_FAANIDCT
     { "FAANI",       ff_faanidct,          FF_IDCT_PERM_NONE },
diff --git a/libavcodec/dct.h b/libavcodec/dct.h
index 4a31f54..5a2c945 100644
--- a/libavcodec/dct.h
+++ b/libavcodec/dct.h
@@ -58,8 +58,8 @@  void ff_jpeg_fdct_islow_10(int16_t *data);
 void ff_fdct248_islow_8(int16_t *data);
 void ff_fdct248_islow_10(int16_t *data);
 
-void ff_j_rev_dct(int16_t *data);
-void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block);
-void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block);
+void ff_j_rev_idct(int16_t *data);
+void ff_j_rev_idct_put(uint8_t *dest, int line_size, int16_t *block);
+void ff_j_rev_idct_add(uint8_t *dest, int line_size, int16_t *block);
 
 #endif /* AVCODEC_DCT_H */
diff --git a/libavcodec/idctdsp.c b/libavcodec/idctdsp.c
index a9b8727..a798a6c 100644
--- a/libavcodec/idctdsp.c
+++ b/libavcodec/idctdsp.c
@@ -154,9 +154,9 @@  av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
         c->idct      = ff_simple_idct_10;
         c->perm_type = FF_IDCT_PERM_NONE;
     } else if (avctx->idct_algo == FF_IDCT_INT) {
-        c->idct_put  = ff_jref_idct_put;
-        c->idct_add  = ff_jref_idct_add;
-        c->idct      = ff_j_rev_dct;
+        c->idct_put  = ff_j_rev_idct_put;
+        c->idct_add  = ff_j_rev_idct_add;
+        c->idct      = ff_j_rev_idct;
         c->perm_type = FF_IDCT_PERM_LIBMPEG2;
 #if CONFIG_FAANIDCT
     } else if (avctx->idct_algo == FF_IDCT_FAAN) {
diff --git a/libavcodec/jrevdct.c b/libavcodec/jrevidct.c
similarity index 99%
rename from libavcodec/jrevdct.c
rename to libavcodec/jrevidct.c
index 8261269..31fb1f4 100644
--- a/libavcodec/jrevdct.c
+++ b/libavcodec/jrevidct.c
@@ -209,7 +209,7 @@  ones here or successive P-frames will drift too much with Reference frame coding
  * Perform the inverse DCT on one block of coefficients.
  */
 
-void ff_j_rev_dct(DCTBLOCK data)
+void ff_j_rev_idct(DCTBLOCK data)
 {
   int32_t tmp0, tmp1, tmp2, tmp3;
   int32_t tmp10, tmp11, tmp12, tmp13;
@@ -943,14 +943,14 @@  void ff_j_rev_dct(DCTBLOCK data)
   }
 }
 
-void ff_jref_idct_put(uint8_t *dest, int line_size, int16_t *block)
+void ff_j_rev_idct_put(uint8_t *dest, int line_size, int16_t *block)
 {
-    ff_j_rev_dct(block);
+    ff_j_rev_idct(block);
     ff_put_pixels_clamped(block, dest, line_size);
 }
 
-void ff_jref_idct_add(uint8_t *dest, int line_size, int16_t *block)
+void ff_j_rev_idct_add(uint8_t *dest, int line_size, int16_t *block)
 {
-    ff_j_rev_dct(block);
+    ff_j_rev_idct(block);
     ff_add_pixels_clamped(block, dest, line_size);
 }