[FFmpeg-cvslog] avcodec/ttadsp: cosmetics

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Aug  6 18:27:01 2016 -0300| [d950279cbfede7270c6d55d0dd6eed35a962fd86] | committer: James Almer

avcodec/ttadsp: cosmetics

Clean some header includes and use the same naming scheme as
in ttaencdsp

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d950279cbfede7270c6d55d0dd6eed35a962fd86
---

 libavcodec/tta.c             |  4 ++--
 libavcodec/ttadsp.c          | 14 ++++++++------
 libavcodec/ttadsp.h          |  7 +++----
 libavcodec/x86/ttadsp.asm    |  2 +-
 libavcodec/x86/ttadsp_init.c | 16 ++++++++--------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 9cb044e..c0162c5 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -314,8 +314,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
         *p = 1 + ((value >> 1) ^ ((value & 1) - 1));
 
         // run hybrid filter
-        s->dsp.ttafilter_process_dec(filter->qm, filter->dx, filter->dl, &filter->error, p,
-                                     filter->shift, filter->round);
+        s->dsp.filter_process(filter->qm, filter->dx, filter->dl, &filter->error, p,
+                              filter->shift, filter->round);
 
         // fixed order prediction
 #define PRED(x, k) (int32_t)((((uint64_t)(x) << (k)) - (x)) >> (k))
diff --git a/libavcodec/ttadsp.c b/libavcodec/ttadsp.c
index 30b7ab9..056a2c7 100644
--- a/libavcodec/ttadsp.c
+++ b/libavcodec/ttadsp.c
@@ -16,11 +16,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/attributes.h"
 #include "ttadsp.h"
+#include "config.h"
 
-static void ttafilter_process_dec_c(int32_t *qm, int32_t *dx, int32_t *dl,
-                                    int32_t *error, int32_t *in, int32_t shift,
-                                    int32_t round) {
+static void tta_filter_process_c(int32_t *qm, int32_t *dx, int32_t *dl,
+                                 int32_t *error, int32_t *in, int32_t shift,
+                                 int32_t round) {
     if (*error < 0) {
         qm[0] -= dx[0]; qm[1] -= dx[1]; qm[2] -= dx[2]; qm[3] -= dx[3];
         qm[4] -= dx[4]; qm[5] -= dx[5]; qm[6] -= dx[6]; qm[7] -= dx[7];
@@ -29,8 +31,8 @@ static void ttafilter_process_dec_c(int32_t *qm, int32_t *dx, int32_t *dl,
         qm[4] += dx[4]; qm[5] += dx[5]; qm[6] += dx[6]; qm[7] += dx[7];
     }
 
-    round +=    dl[0] * qm[0] + dl[1] * qm[1] + dl[2] * qm[2] + dl[3] * qm[3] +
-                dl[4] * qm[4] + dl[5] * qm[5] + dl[6] * qm[6] + dl[7] * qm[7];
+    round += dl[0] * qm[0] + dl[1] * qm[1] + dl[2] * qm[2] + dl[3] * qm[3] +
+             dl[4] * qm[4] + dl[5] * qm[5] + dl[6] * qm[6] + dl[7] * qm[7];
 
     dx[0] = dx[1]; dx[1] = dx[2]; dx[2] = dx[3]; dx[3] = dx[4];
     dl[0] = dl[1]; dl[1] = dl[2]; dl[2] = dl[3]; dl[3] = dl[4];
@@ -50,7 +52,7 @@ static void ttafilter_process_dec_c(int32_t *qm, int32_t *dx, int32_t *dl,
 
 av_cold void ff_ttadsp_init(TTADSPContext *c)
 {
-    c->ttafilter_process_dec = ttafilter_process_dec_c;
+    c->filter_process = tta_filter_process_c;
 
     if (ARCH_X86)
         ff_ttadsp_init_x86(c);
diff --git a/libavcodec/ttadsp.h b/libavcodec/ttadsp.h
index 56930f1..737d9bd 100644
--- a/libavcodec/ttadsp.h
+++ b/libavcodec/ttadsp.h
@@ -20,12 +20,11 @@
 #define AVCODEC_TTADSP_H
 
 #include <stdint.h>
-#include "ttadata.h"
 
 typedef struct TTADSPContext {
-    void (*ttafilter_process_dec)(int32_t *qm, int32_t *dx, int32_t *dl,
-                                  int32_t *error, int32_t *in, int32_t shift,
-                                  int32_t round);
+    void (*filter_process)(int32_t *qm, int32_t *dx, int32_t *dl,
+                           int32_t *error, int32_t *in, int32_t shift,
+                           int32_t round);
 } TTADSPContext;
 
 void ff_ttadsp_init(TTADSPContext *c);
diff --git a/libavcodec/x86/ttadsp.asm b/libavcodec/x86/ttadsp.asm
index 8f48949..db12a32 100644
--- a/libavcodec/x86/ttadsp.asm
+++ b/libavcodec/x86/ttadsp.asm
@@ -31,7 +31,7 @@ SECTION .text
 
 %macro TTA_FILTER 2
 INIT_XMM %1
-cglobal ttafilter_process_dec, 5,5,%2, qm, dx, dl, error, in, shift, round
+cglobal tta_filter_process, 5,5,%2, qm, dx, dl, error, in, shift, round
     mova       m2, [qmq       ]
     mova       m3, [qmq + 0x10]
     mova       m4, [dxq       ]
diff --git a/libavcodec/x86/ttadsp_init.c b/libavcodec/x86/ttadsp_init.c
index 47dc87f..aa998c1 100644
--- a/libavcodec/x86/ttadsp_init.c
+++ b/libavcodec/x86/ttadsp_init.c
@@ -22,12 +22,12 @@
 #include "libavutil/x86/cpu.h"
 #include "config.h"
 
-void ff_ttafilter_process_dec_ssse3(int32_t *qm, int32_t *dx, int32_t *dl,
-                                    int32_t *error, int32_t *in, int32_t shift,
-                                    int32_t round);
-void ff_ttafilter_process_dec_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
-                                   int32_t *error, int32_t *in, int32_t shift,
-                                   int32_t round);
+void ff_tta_filter_process_ssse3(int32_t *qm, int32_t *dx, int32_t *dl,
+                                 int32_t *error, int32_t *in, int32_t shift,
+                                 int32_t round);
+void ff_tta_filter_process_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
+                                int32_t *error, int32_t *in, int32_t shift,
+                                int32_t round);
 
 av_cold void ff_ttadsp_init_x86(TTADSPContext *c)
 {
@@ -35,8 +35,8 @@ av_cold void ff_ttadsp_init_x86(TTADSPContext *c)
     int cpu_flags = av_get_cpu_flags();
 
     if (EXTERNAL_SSSE3(cpu_flags))
-        c->ttafilter_process_dec = ff_ttafilter_process_dec_ssse3;
+        c->filter_process = ff_tta_filter_process_ssse3;
     if (EXTERNAL_SSE4(cpu_flags))
-        c->ttafilter_process_dec = ff_ttafilter_process_dec_sse4;
+        c->filter_process = ff_tta_filter_process_sse4;
 #endif
 }