History

idct: Change type of array stride parameters to ptrdiff_t

ptrdiff_t is the correct type for array strides and similar.

Diego Biurrun committed 10 years ago

Commit 2ec9fa51 parent b2939a736 files · +184 −166Browse files

Showing the changes to libavcodec/arm (8 of 36 files). Show all

Unified · Split

8 files
  1. libavcodec/arm/idct.h +7 −6
  2. libavcodec/arm/idctdsp_arm.S +1 −1
  3. libavcodec/arm/idctdsp_init_arm.c +10 −5
  4. libavcodec/arm/idctdsp_init_armv6.c +1 −1
  5. libavcodec/arm/simple_idct_armv6.S +2 −2
  6. libavcodec/arm/simple_idct_neon.S +2 −2
  7. libavcodec/arm/vc1dsp_init_neon.c +7 −7
  8. libavcodec/arm/vc1dsp_neon.S +3 −3
libavcodec/arm/idct.h+7−6
@@ -19,6 +19,7 @@ · 18 unmodified lines
19#ifndef AVCODEC_ARM_IDCT_H19#ifndef AVCODEC_ARM_IDCT_H
20#define AVCODEC_ARM_IDCT_H20#define AVCODEC_ARM_IDCT_H
21 21
22#include <stddef.h>
22#include <stdint.h>23#include <stdint.h>
23 24
24void ff_j_rev_dct_arm(int16_t *data);25void ff_j_rev_dct_arm(int16_t *data);
@@ -26,15 +27,15 @@ void ff_j_rev_dct_arm(int16_t *data); · 1 unmodified line
26void ff_simple_idct_arm(int16_t *data);27void ff_simple_idct_arm(int16_t *data);
27 28
28void ff_simple_idct_armv5te(int16_t *data);29void ff_simple_idct_armv5te(int16_t *data);
29void ff_simple_idct_put_armv5te(uint8_t *dest, int line_size, int16_t *data);30void ff_simple_idct_put_armv5te(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
30void ff_simple_idct_add_armv5te(uint8_t *dest, int line_size, int16_t *data);31void ff_simple_idct_add_armv5te(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
31 32
32void ff_simple_idct_armv6(int16_t *data);33void ff_simple_idct_armv6(int16_t *data);
33void ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data);34void ff_simple_idct_put_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
34void ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data);35void ff_simple_idct_add_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
35 36
36void ff_simple_idct_neon(int16_t *data);37void ff_simple_idct_neon(int16_t *data);
37void ff_simple_idct_put_neon(uint8_t *dest, int line_size, int16_t *data);38void ff_simple_idct_put_neon(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
38void ff_simple_idct_add_neon(uint8_t *dest, int line_size, int16_t *data);39void ff_simple_idct_add_neon(uint8_t *dest, ptrdiff_t line_size, int16_t *data);
39 40
40#endif /* AVCODEC_ARM_IDCT_H */41#endif /* AVCODEC_ARM_IDCT_H */
libavcodec/arm/idctdsp_arm.S+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
22#include "config.h"22#include "config.h"
23#include "libavutil/arm/asm.S"23#include "libavutil/arm/asm.S"
24 24
25@ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, int stride)25@ void ff_add_pixels_clamped_arm(int16_t *block, uint8_t *dest, ptrdiff_t stride)
26function ff_add_pixels_clamped_arm, export=1, align=526function ff_add_pixels_clamped_arm, export=1, align=5
27 push {r4-r10}27 push {r4-r10}
28 mov r10, #828 mov r10, #8
libavcodec/arm/idctdsp_init_arm.c+10−5
@@ -19,6 +19,7 @@ · 18 unmodified lines
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 */20 */
21 21
22#include <stddef.h>
22#include <stdint.h>23#include <stdint.h>
23 24
24#include "libavutil/attributes.h"25#include "libavutil/attributes.h"
@@ -30,29 +31,33 @@ · 5 unmodified lines
30#include "idctdsp_arm.h"31#include "idctdsp_arm.h"
31 32
32void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest,33void ff_add_pixels_clamped_arm(const int16_t *block, uint8_t *dest,
33 int line_size);34 ptrdiff_t line_size);
34 35
35/* XXX: those functions should be suppressed ASAP when all IDCTs are36/* XXX: those functions should be suppressed ASAP when all IDCTs are
36 * converted */37 * converted */
37static void j_rev_dct_arm_put(uint8_t *dest, int line_size, int16_t *block)38static void j_rev_dct_arm_put(uint8_t *dest, ptrdiff_t line_size,
39 int16_t *block)
38{40{
39 ff_j_rev_dct_arm(block);41 ff_j_rev_dct_arm(block);
40 ff_put_pixels_clamped(block, dest, line_size);42 ff_put_pixels_clamped(block, dest, line_size);
41}43}
42 44
43static void j_rev_dct_arm_add(uint8_t *dest, int line_size, int16_t *block)45static void j_rev_dct_arm_add(uint8_t *dest, ptrdiff_t line_size,
46 int16_t *block)
44{47{
45 ff_j_rev_dct_arm(block);48 ff_j_rev_dct_arm(block);
46 ff_add_pixels_clamped(block, dest, line_size);49 ff_add_pixels_clamped(block, dest, line_size);
47}50}
48 51
49static void simple_idct_arm_put(uint8_t *dest, int line_size, int16_t *block)52static void simple_idct_arm_put(uint8_t *dest, ptrdiff_t line_size,
53 int16_t *block)
50{54{
51 ff_simple_idct_arm(block);55 ff_simple_idct_arm(block);
52 ff_put_pixels_clamped(block, dest, line_size);56 ff_put_pixels_clamped(block, dest, line_size);
53}57}
54 58
55static void simple_idct_arm_add(uint8_t *dest, int line_size, int16_t *block)59static void simple_idct_arm_add(uint8_t *dest, ptrdiff_t line_size,
60 int16_t *block)
56{61{
57 ff_simple_idct_arm(block);62 ff_simple_idct_arm(block);
58 ff_add_pixels_clamped(block, dest, line_size);63 ff_add_pixels_clamped(block, dest, line_size);
libavcodec/arm/idctdsp_init_armv6.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27#include "idctdsp_arm.h"27#include "idctdsp_arm.h"
28 28
29void ff_add_pixels_clamped_armv6(const int16_t *block, uint8_t *pixels,29void ff_add_pixels_clamped_armv6(const int16_t *block, uint8_t *pixels,
30 int line_size);30 ptrdiff_t line_size);
31 31
32av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,32av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,
33 unsigned high_bit_depth)33 unsigned high_bit_depth)
libavcodec/arm/simple_idct_armv6.S+2−2
@@ -390,7 +390,7 @@ function ff_simple_idct_armv6, export=1 · 389 unmodified lines
390 pop {r4-r11, pc}390 pop {r4-r11, pc}
391endfunc391endfunc
392 392
393/* ff_simple_idct_add_armv6(uint8_t *dest, int line_size, int16_t *data); */393/* ff_simple_idct_add_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data); */
394function ff_simple_idct_add_armv6, export=1394function ff_simple_idct_add_armv6, export=1
395 push {r0, r1, r4-r11, lr}395 push {r0, r1, r4-r11, lr}
396 sub sp, sp, #128396 sub sp, sp, #128
@@ -407,7 +407,7 @@ function ff_simple_idct_add_armv6, export=1 · 10 unmodified lines
407 pop {r4-r11, pc}407 pop {r4-r11, pc}
408endfunc408endfunc
409 409
410/* ff_simple_idct_put_armv6(uint8_t *dest, int line_size, int16_t *data); */410/* ff_simple_idct_put_armv6(uint8_t *dest, ptrdiff_t line_size, int16_t *data); */
411function ff_simple_idct_put_armv6, export=1411function ff_simple_idct_put_armv6, export=1
412 push {r0, r1, r4-r11, lr}412 push {r0, r1, r4-r11, lr}
413 sub sp, sp, #128413 sub sp, sp, #128
libavcodec/arm/simple_idct_neon.S+2−2
@@ -261,7 +261,7 @@ endconst · 260 unmodified lines
261 pop {r4-r7, pc}261 pop {r4-r7, pc}
262 .endm262 .endm
263 263
264/* void ff_simple_idct_put_neon(uint8_t *dst, int line_size, int16_t *data); */264/* void ff_simple_idct_put_neon(uint8_t *dst, ptrdiff_t line_size, int16_t *data); */
265function ff_simple_idct_put_neon, export=1265function ff_simple_idct_put_neon, export=1
266 idct_start r2266 idct_start r2
267 267
@@ -316,7 +316,7 @@ function idct_col4_add8_neon · 48 unmodified lines
316 bx lr316 bx lr
317endfunc317endfunc
318 318
319/* void ff_simple_idct_add_neon(uint8_t *dst, int line_size, int16_t *data); */319/* void ff_simple_idct_add_neon(uint8_t *dst, ptrdiff_t line_size, int16_t *data); */
320function ff_simple_idct_add_neon, export=1320function ff_simple_idct_add_neon, export=1
321 idct_start r2321 idct_start r2
322 322
libavcodec/arm/vc1dsp_init_neon.c+7−7
@@ -25,14 +25,14 @@ · 24 unmodified lines
25#include "config.h"25#include "config.h"
26 26
27void ff_vc1_inv_trans_8x8_neon(int16_t *block);27void ff_vc1_inv_trans_8x8_neon(int16_t *block);
28void ff_vc1_inv_trans_4x8_neon(uint8_t *dest, int linesize, int16_t *block);28void ff_vc1_inv_trans_4x8_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
29void ff_vc1_inv_trans_8x4_neon(uint8_t *dest, int linesize, int16_t *block);29void ff_vc1_inv_trans_8x4_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
30void ff_vc1_inv_trans_4x4_neon(uint8_t *dest, int linesize, int16_t *block);30void ff_vc1_inv_trans_4x4_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
31 31
32void ff_vc1_inv_trans_8x8_dc_neon(uint8_t *dest, int linesize, int16_t *block);32void ff_vc1_inv_trans_8x8_dc_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
33void ff_vc1_inv_trans_4x8_dc_neon(uint8_t *dest, int linesize, int16_t *block);33void ff_vc1_inv_trans_4x8_dc_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
34void ff_vc1_inv_trans_8x4_dc_neon(uint8_t *dest, int linesize, int16_t *block);34void ff_vc1_inv_trans_8x4_dc_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
35void ff_vc1_inv_trans_4x4_dc_neon(uint8_t *dest, int linesize, int16_t *block);35void ff_vc1_inv_trans_4x4_dc_neon(uint8_t *dest, ptrdiff_t stride, int16_t *block);
36 36
37void ff_put_pixels8x8_neon(uint8_t *block, const uint8_t *pixels,37void ff_put_pixels8x8_neon(uint8_t *block, const uint8_t *pixels,
38 ptrdiff_t line_size, int rnd);38 ptrdiff_t line_size, int rnd);
libavcodec/arm/vc1dsp_neon.S+3−3
@@ -426,7 +426,7 @@ function ff_vc1_inv_trans_8x8_neon, export=1 · 425 unmodified lines
426 bx lr426 bx lr
427endfunc427endfunc
428 428
429@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])429@ (uint8_t *dest [r0], ptrdiff_t stride [r1], int16_t *block [r2])
430function ff_vc1_inv_trans_8x4_neon, export=1430function ff_vc1_inv_trans_8x4_neon, export=1
431 vld1.64 {q0-q1}, [r2,:128]! @ load 8 * 4 * 2 = 64 bytes / 16 bytes per quad = 4 quad registers431 vld1.64 {q0-q1}, [r2,:128]! @ load 8 * 4 * 2 = 64 bytes / 16 bytes per quad = 4 quad registers
432 vld1.64 {q2-q3}, [r2,:128]432 vld1.64 {q2-q3}, [r2,:128]
@@ -511,7 +511,7 @@ function ff_vc1_inv_trans_8x4_neon, export=1 · 78 unmodified lines
511 bx lr511 bx lr
512endfunc512endfunc
513 513
514@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])514@ (uint8_t *dest [r0], ptrdiff_t stride [r1], int16_t *block [r2])
515function ff_vc1_inv_trans_4x8_neon, export=1515function ff_vc1_inv_trans_4x8_neon, export=1
516 mov r12, #(8 * 2) @ 8 elements per line, each element 2 bytes516 mov r12, #(8 * 2) @ 8 elements per line, each element 2 bytes
517 vld4.16 {d0[], d2[], d4[], d6[]}, [r2,:64], r12 @ read each column into a q register517 vld4.16 {d0[], d2[], d4[], d6[]}, [r2,:64], r12 @ read each column into a q register
@@ -593,7 +593,7 @@ endfunc · 75 unmodified lines
593 vshr.s16 q1, q1, #\rshift @ dst[3,1] >>= rshift593 vshr.s16 q1, q1, #\rshift @ dst[3,1] >>= rshift
594.endm594.endm
595 595
596@ (uint8_t *dest [r0], int linesize [r1], int16_t *block [r2])596@ (uint8_t *dest [r0], ptrdiff_t stride [r1], int16_t *block [r2])
597function ff_vc1_inv_trans_4x4_neon, export=1597function ff_vc1_inv_trans_4x4_neon, export=1
598 mov r12, #(8 * 2) @ 8 elements per line, each element 2 bytes598 mov r12, #(8 * 2) @ 8 elements per line, each element 2 bytes
599 vld4.16 {d0[], d1[], d2[], d3[]}, [r2,:64], r12 @ read each column into a register599 vld4.16 {d0[], d1[], d2[], d3[]}, [r2,:64], r12 @ read each column into a register

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