Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec: Change get_pixels() to ptrdiff_t linesize

Browse Source 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/80/head
Michael Niedermayer 11 years ago
parent 6b1df5544e
commit 305f72aee7
10 changed files with 11 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/alpha/pixblockdsp_alpha.c
  2. 2
      libavcodec/arm/pixblockdsp_init_arm.c
  3. 2
      libavcodec/avdct.h
  4. 2
      libavcodec/dv.h
  5. 2
      libavcodec/pixblockdsp.h
  6. 2
      libavcodec/pixblockdsp_template.c
  7. 2
      libavcodec/ppc/pixblockdsp.c
  8. 2
      libavcodec/version.h
  9. 4
      libavcodec/x86/pixblockdsp.asm
  10. 4
      libavcodec/x86/pixblockdsp_init.c

2
libavcodec/alpha/pixblockdsp_alpha.c
Unescape View File

@ -23,7 +23,7 @@
#include "asm.h" #include "asm.h"
static void get_pixels_mvi(int16_t *restrict block, static void get_pixels_mvi(int16_t *restrict block,
const uint8_t *restrict pixels, int line_size) const uint8_t *restrict pixels, ptrdiff_t line_size)
{ {
int h = 8; int h = 8;

2
libavcodec/arm/pixblockdsp_init_arm.c
Unescape View File

@ -24,7 +24,7 @@
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/pixblockdsp.h" #include "libavcodec/pixblockdsp.h"
void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, int stride); void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, ptrdiff_t stride);
void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1, void ff_diff_pixels_armv6(int16_t *block, const uint8_t *s1,
const uint8_t *s2, int stride); const uint8_t *s2, int stride);

2
libavcodec/avdct.h
Unescape View File

@ -64,7 +64,7 @@ typedef struct AVDCT {
void (*get_pixels)(int16_t *block /* align 16 */, void (*get_pixels)(int16_t *block /* align 16 */,
const uint8_t *pixels /* align 8 */, const uint8_t *pixels /* align 8 */,
int line_size); ptrdiff_t line_size);
} AVDCT; } AVDCT;
/** /**

2
libavcodec/dv.h
Unescape View File

@ -45,7 +45,7 @@ typedef struct DVVideoContext {
uint8_t dv_zigzag[2][64]; uint8_t dv_zigzag[2][64];
void (*get_pixels)(int16_t *block, const uint8_t *pixels, int line_size); void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void (*fdct[2])(int16_t *block); void (*fdct[2])(int16_t *block);
void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block); void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
me_cmp_func ildct_cmp; me_cmp_func ildct_cmp;

2
libavcodec/pixblockdsp.h
Unescape View File

@ -26,7 +26,7 @@
typedef struct PixblockDSPContext { typedef struct PixblockDSPContext {
void (*get_pixels)(int16_t *block /* align 16 */, void (*get_pixels)(int16_t *block /* align 16 */,
const uint8_t *pixels /* align 8 */, const uint8_t *pixels /* align 8 */,
int line_size); ptrdiff_t line_size);
void (*diff_pixels)(int16_t *block /* align 16 */, void (*diff_pixels)(int16_t *block /* align 16 */,
const uint8_t *s1 /* align 8 */, const uint8_t *s1 /* align 8 */,
const uint8_t *s2 /* align 8 */, const uint8_t *s2 /* align 8 */,

2
libavcodec/pixblockdsp_template.c
Unescape View File

@ -19,7 +19,7 @@
#include "bit_depth_template.c" #include "bit_depth_template.c"
static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels, static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels,
int line_size) ptrdiff_t line_size)
{ {
const pixel *pixels = (const pixel *) _pixels; const pixel *pixels = (const pixel *) _pixels;
int i; int i;

2
libavcodec/ppc/pixblockdsp.c
Unescape View File

@ -36,7 +36,7 @@
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels, static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
int line_size) ptrdiff_t line_size)
{ {
int i; int i;
vector unsigned char perm = vec_lvsl(0, pixels); vector unsigned char perm = vec_lvsl(0, pixels);

2
libavcodec/version.h
Unescape View File

@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 72 #define LIBAVCODEC_VERSION_MINOR 72
#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \

4
libavcodec/x86/pixblockdsp.asm
Unescape View File

@ -26,9 +26,8 @@
SECTION .text SECTION .text
INIT_MMX mmx INIT_MMX mmx
; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size) ; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size)
cglobal get_pixels, 3,4 cglobal get_pixels, 3,4
movsxdifnidn r2, r2d
add r0, 128 add r0, 128
mov r3, -128 mov r3, -128
pxor m7, m7 pxor m7, m7
@ -52,7 +51,6 @@ cglobal get_pixels, 3,4
INIT_XMM sse2 INIT_XMM sse2
cglobal get_pixels, 3, 4, 5 cglobal get_pixels, 3, 4, 5
movsxdifnidn r2, r2d
lea r3, [r2*3] lea r3, [r2*3]
pxor m4, m4 pxor m4, m4
movh m0, [r1] movh m0, [r1]

4
libavcodec/x86/pixblockdsp_init.c
Unescape View File

@ -23,8 +23,8 @@
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/pixblockdsp.h" #include "libavcodec/pixblockdsp.h"
void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, int line_size); void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, int line_size); void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2, void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2,
int stride); int stride);
void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2, void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2,

Write Preview
Loading…
Cancel
Save