History

Drop DCTELEM typedef

It does not help as an abstraction and adds dsputil dependencies.

Diego Biurrun committed 13 years ago

Commit 88bd7fd1 parent 2e4bb99163 files · +835 −812Browse files

Showing the changes to libavcodec/alpha (6 of 163 files). Show all

Unified · Split

6 files
  1. libavcodec/alpha/dsputil_alpha.c +6 −6
  2. libavcodec/alpha/dsputil_alpha.h +10 −10
  3. libavcodec/alpha/dsputil_alpha_asm.S +2 −2
  4. libavcodec/alpha/motion_est_alpha.c +2 −2
  5. libavcodec/alpha/mpegvideo_alpha.c +4 −4
  6. libavcodec/alpha/simple_idct_alpha.c +6 −6
libavcodec/alpha/dsputil_alpha.c+6−6
@@ -23,15 +23,15 @@ · 22 unmodified lines
23#include "dsputil_alpha.h"23#include "dsputil_alpha.h"
24#include "asm.h"24#include "asm.h"
25 25
26void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,26void (*put_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels,
27 int line_size);27 int line_size);
28void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,28void (*add_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels,
29 int line_size);29 int line_size);
30 30
31#if 031#if 0
32/* These functions were the base for the optimized assembler routines,32/* These functions were the base for the optimized assembler routines,
33 and remain here for documentation purposes. */33 and remain here for documentation purposes. */
34static void put_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels,34static void put_pixels_clamped_mvi(const int16_t *block, uint8_t *pixels,
35 int line_size)35 int line_size)
36{36{
37 int i = 8;37 int i = 8;
@@ -55,7 +55,7 @@ static void put_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels, · 17 unmodified lines
55 } while (--i);55 } while (--i);
56}56}
57 57
58void add_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels,58void add_pixels_clamped_mvi(const int16_t *block, uint8_t *pixels,
59 int line_size)59 int line_size)
60{60{
61 int h = 8;61 int h = 8;
@@ -100,9 +100,9 @@ void add_pixels_clamped_mvi(const DCTELEM *block, uint8_t *pixels, · 38 unmodified lines
100}100}
101#endif101#endif
102 102
103static void clear_blocks_axp(DCTELEM *blocks) {103static void clear_blocks_axp(int16_t *blocks) {
104 uint64_t *p = (uint64_t *) blocks;104 uint64_t *p = (uint64_t *) blocks;
105 int n = sizeof(DCTELEM) * 6 * 64;105 int n = sizeof(int16_t) * 6 * 64;
106 106
107 do {107 do {
108 p[0] = 0;108 p[0] = 0;
libavcodec/alpha/dsputil_alpha.h+10−10
@@ -19,26 +19,26 @@ · 18 unmodified lines
19#ifndef AVCODEC_ALPHA_DSPUTIL_ALPHA_H19#ifndef AVCODEC_ALPHA_DSPUTIL_ALPHA_H
20#define AVCODEC_ALPHA_DSPUTIL_ALPHA_H20#define AVCODEC_ALPHA_DSPUTIL_ALPHA_H
21 21
22#include "libavcodec/dsputil.h"22#include <stdint.h>
23 23
24void ff_simple_idct_axp(DCTELEM *block);24void ff_simple_idct_axp(int16_t *block);
25void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);25void ff_simple_idct_put_axp(uint8_t *dest, int line_size, int16_t *block);
26void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);26void ff_simple_idct_add_axp(uint8_t *dest, int line_size, int16_t *block);
27 27
28void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,28void put_pixels_axp_asm(uint8_t *block, const uint8_t *pixels,
29 int line_size, int h);29 int line_size, int h);
30void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,30void put_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels,
31 int line_size);31 int line_size);
32void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,32void add_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels,
33 int line_size);33 int line_size);
34extern void (*put_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,34extern void (*put_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels,
35 int line_size);35 int line_size);
36extern void (*add_pixels_clamped_axp_p)(const DCTELEM *block, uint8_t *pixels,36extern void (*add_pixels_clamped_axp_p)(const int16_t *block, uint8_t *pixels,
37 int line_size);37 int line_size);
38 38
39void get_pixels_mvi(DCTELEM *restrict block,39void get_pixels_mvi(int16_t *restrict block,
40 const uint8_t *restrict pixels, int line_size);40 const uint8_t *restrict pixels, int line_size);
41void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,41void diff_pixels_mvi(int16_t *block, const uint8_t *s1, const uint8_t *s2,
42 int stride);42 int stride);
43int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);43int pix_abs8x8_mvi(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
44int pix_abs16x16_mvi_asm(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);44int pix_abs16x16_mvi_asm(void *v, uint8_t *pix1, uint8_t *pix2, int line_size, int h);
libavcodec/alpha/dsputil_alpha_asm.S+2−2
@@ -135,7 +135,7 @@ $aligned: · 134 unmodified lines
135 .end put_pixels_axp_asm135 .end put_pixels_axp_asm
136 136
137/************************************************************************137/************************************************************************
138 * void put_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,138 * void put_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels,
139 * int line_size)139 * int line_size)
140 */140 */
141 .align 6141 .align 6
@@ -185,7 +185,7 @@ put_pixels_clamped_mvi_asm: · 43 unmodified lines
185 .end put_pixels_clamped_mvi_asm185 .end put_pixels_clamped_mvi_asm
186 186
187/************************************************************************187/************************************************************************
188 * void add_pixels_clamped_mvi_asm(const DCTELEM *block, uint8_t *pixels,188 * void add_pixels_clamped_mvi_asm(const int16_t *block, uint8_t *pixels,
189 * int line_size)189 * int line_size)
190 */190 */
191 .align 6191 .align 6
libavcodec/alpha/motion_est_alpha.c+2−2
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#include "dsputil_alpha.h"23#include "dsputil_alpha.h"
24#include "asm.h"24#include "asm.h"
25 25
26void get_pixels_mvi(DCTELEM *restrict block,26void get_pixels_mvi(int16_t *restrict block,
27 const uint8_t *restrict pixels, int line_size)27 const uint8_t *restrict pixels, int line_size)
28{28{
29 int h = 8;29 int h = 8;
@@ -40,7 +40,7 @@ void get_pixels_mvi(DCTELEM *restrict block, · 10 unmodified lines
40 } while (--h);40 } while (--h);
41}41}
42 42
43void diff_pixels_mvi(DCTELEM *block, const uint8_t *s1, const uint8_t *s2,43void diff_pixels_mvi(int16_t *block, const uint8_t *s1, const uint8_t *s2,
44 int stride) {44 int stride) {
45 int h = 8;45 int h = 8;
46 uint64_t mask = 0x4040;46 uint64_t mask = 0x4040;
libavcodec/alpha/mpegvideo_alpha.c+4−4
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#include "libavcodec/mpegvideo.h"23#include "libavcodec/mpegvideo.h"
24#include "asm.h"24#include "asm.h"
25 25
26static void dct_unquantize_h263_axp(DCTELEM *block, int n_coeffs,26static void dct_unquantize_h263_axp(int16_t *block, int n_coeffs,
27 uint64_t qscale, uint64_t qadd)27 uint64_t qscale, uint64_t qadd)
28{28{
29 uint64_t qmul = qscale << 1;29 uint64_t qmul = qscale << 1;
@@ -69,12 +69,12 @@ static void dct_unquantize_h263_axp(DCTELEM *block, int n_coeffs, · 39 unmodified lines
69 }69 }
70}70}
71 71
72static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block,72static void dct_unquantize_h263_intra_axp(MpegEncContext *s, int16_t *block,
73 int n, int qscale)73 int n, int qscale)
74{74{
75 int n_coeffs;75 int n_coeffs;
76 uint64_t qadd;76 uint64_t qadd;
77 DCTELEM block0 = block[0];77 int16_t block0 = block[0];
78 78
79 if (!s->h263_aic) {79 if (!s->h263_aic) {
80 if (n < 4)80 if (n < 4)
@@ -96,7 +96,7 @@ static void dct_unquantize_h263_intra_axp(MpegEncContext *s, DCTELEM *block, · 15 unmodified lines
96 block[0] = block0;96 block[0] = block0;
97}97}
98 98
99static void dct_unquantize_h263_inter_axp(MpegEncContext *s, DCTELEM *block,99static void dct_unquantize_h263_inter_axp(MpegEncContext *s, int16_t *block,
100 int n, int qscale)100 int n, int qscale)
101{101{
102 int n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];102 int n_coeffs = s->inter_scantable.raster_end[s->block_last_index[n]];
libavcodec/alpha/simple_idct_alpha.c+6−6
@@ -44,7 +44,7 @@ · 43 unmodified lines
44#define COL_SHIFT 2044#define COL_SHIFT 20
45 45
46/* 0: all entries 0, 1: only first entry nonzero, 2: otherwise */46/* 0: all entries 0, 1: only first entry nonzero, 2: otherwise */
47static inline int idct_row(DCTELEM *row)47static inline int idct_row(int16_t *row)
48{48{
49 int a0, a1, a2, a3, b0, b1, b2, b3, t;49 int a0, a1, a2, a3, b0, b1, b2, b3, t;
50 uint64_t l, r, t2;50 uint64_t l, r, t2;
@@ -152,7 +152,7 @@ static inline int idct_row(DCTELEM *row) · 101 unmodified lines
152 return 2;152 return 2;
153}153}
154 154
155static inline void idct_col(DCTELEM *col)155static inline void idct_col(int16_t *col)
156{156{
157 int a0, a1, a2, a3, b0, b1, b2, b3;157 int a0, a1, a2, a3, b0, b1, b2, b3;
158 158
@@ -229,7 +229,7 @@ static inline void idct_col(DCTELEM *col) · 70 unmodified lines
229 229
230/* If all rows but the first one are zero after row transformation,230/* If all rows but the first one are zero after row transformation,
231 all rows will be identical after column transformation. */231 all rows will be identical after column transformation. */
232static inline void idct_col2(DCTELEM *col)232static inline void idct_col2(int16_t *col)
233{233{
234 int i;234 int i;
235 uint64_t l, r;235 uint64_t l, r;
@@ -251,7 +251,7 @@ static inline void idct_col2(DCTELEM *col) · 15 unmodified lines
251 stq(l, col + 14 * 4); stq(r, col + 15 * 4);251 stq(l, col + 14 * 4); stq(r, col + 15 * 4);
252}252}
253 253
254void ff_simple_idct_axp(DCTELEM *block)254void ff_simple_idct_axp(int16_t *block)
255{255{
256 256
257 int i;257 int i;
@@ -291,13 +291,13 @@ void ff_simple_idct_axp(DCTELEM *block) · 33 unmodified lines
291 }291 }
292}292}
293 293
294void ff_simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block)294void ff_simple_idct_put_axp(uint8_t *dest, int line_size, int16_t *block)
295{295{
296 ff_simple_idct_axp(block);296 ff_simple_idct_axp(block);
297 put_pixels_clamped_axp_p(block, dest, line_size);297 put_pixels_clamped_axp_p(block, dest, line_size);
298}298}
299 299
300void ff_simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block)300void ff_simple_idct_add_axp(uint8_t *dest, int line_size, int16_t *block)
301{301{
302 ff_simple_idct_axp(block);302 ff_simple_idct_axp(block);
303 add_pixels_clamped_axp_p(block, dest, line_size);303 add_pixels_clamped_axp_p(block, dest, line_size);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t