avcodec/ttadsp: cosmetics

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

Signed-off-by: James Almer <jamrial@gmail.com>
pull/230/head
James Almer 9 years ago
parent 803c058a6f
commit d950279cbf
  1. 2
      libavcodec/tta.c
  2. 6
      libavcodec/ttadsp.c
  3. 3
      libavcodec/ttadsp.h
  4. 2
      libavcodec/x86/ttadsp.asm
  5. 8
      libavcodec/x86/ttadsp_init.c

@ -314,7 +314,7 @@ 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,
s->dsp.filter_process(filter->qm, filter->dx, filter->dl, &filter->error, p,
filter->shift, filter->round);
// fixed order prediction

@ -16,9 +16,11 @@
* 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,
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) {
@ -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);

@ -20,10 +20,9 @@
#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,
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;

@ -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 ]

@ -22,10 +22,10 @@
#include "libavutil/x86/cpu.h"
#include "config.h"
void ff_ttafilter_process_dec_ssse3(int32_t *qm, int32_t *dx, int32_t *dl,
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_ttafilter_process_dec_sse4(int32_t *qm, int32_t *dx, int32_t *dl,
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);
@ -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
}

Loading…
Cancel
Save