falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3' 

* commit 'de452e503734ebb0fdbce86e9d16693b3530fad3':
  pixblockdsp: Change type of stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
tags/n3.3
Clément Bœsch 8 years ago
parent
ce818d90bd de452e5037
commit
e07fa3008b
13 changed files with 58 additions and 56 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -3
      libavcodec/alpha/pixblockdsp_alpha.c
  2. +3
    -2
      libavcodec/arm/pixblockdsp_init_arm.c
  3. +1
    -1
      libavcodec/dv.h
  4. +5
    -4
      libavcodec/dvenc.c
  5. +3
    -3
      libavcodec/mips/pixblockdsp_mips.h
  6. +11
    -11
      libavcodec/mips/pixblockdsp_mmi.c
  7. +1
    -1
      libavcodec/mips/pixblockdsp_msa.c
  8. +12
    -12
      libavcodec/pixblockdsp.c
  9. +2
    -2
      libavcodec/pixblockdsp.h
  10. +9
    -9
      libavcodec/ppc/pixblockdsp.c
  11. +2
    -3
      libavcodec/x86/pixblockdsp.asm
  12. +4
    -4
      libavcodec/x86/pixblockdsp_init.c
  13. +1
    -1
      tests/checkasm/pixblockdsp.c

+ 4
- 3
libavcodec/alpha/pixblockdsp_alpha.c View File

@@ -23,7 +23,7 @@
#include "asm.h"

static void get_pixels_mvi(int16_t *restrict block,
const uint8_t *restrict pixels, ptrdiff_t line_size)
const uint8_t *restrict pixels, ptrdiff_t stride)
{
int h = 8;

@@ -34,13 +34,14 @@ static void get_pixels_mvi(int16_t *restrict block,
stq(unpkbw(p), block);
stq(unpkbw(p >> 32), block + 4);

pixels += line_size;
pixels += stride;
block += 8;
} while (--h);
}

static void diff_pixels_mvi(int16_t *block, const uint8_t *s1, const uint8_t *s2,
int stride) {
ptrdiff_t stride)
{
int h = 8;
uint64_t mask = 0x4040;



+ 3
- 2
libavcodec/arm/pixblockdsp_init_arm.c View File

@@ -24,9 +24,10 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/pixblockdsp.h"

void ff_get_pixels_armv6(int16_t *block, const uint8_t *pixels, ptrdiff_t 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,
const uint8_t *s2, int stride);
const uint8_t *s2, ptrdiff_t stride);

av_cold void ff_pixblockdsp_init_arm(PixblockDSPContext *c,
AVCodecContext *avctx,


+ 1
- 1
libavcodec/dv.h View File

@@ -45,7 +45,7 @@ typedef struct DVVideoContext {

uint8_t dv_zigzag[2][64];

void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size);
void (*get_pixels)(int16_t *block, const uint8_t *pixels, ptrdiff_t linesize);
void (*fdct[2])(int16_t *block);
void (*idct_put[2])(uint8_t *dest, int line_size, int16_t *block);
me_cmp_func ildct_cmp;


+ 5
- 4
libavcodec/dvenc.c View File

@@ -204,7 +204,7 @@ static av_always_inline PutBitContext *dv_encode_ac(EncBlockInfo *bi,
}

static av_always_inline int dv_guess_dct_mode(DVVideoContext *s, uint8_t *data,
int linesize)
ptrdiff_t linesize)
{
if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
int ps = s->ildct_cmp(NULL, data, NULL, linesize, 8) - 400;
@@ -241,8 +241,8 @@ static const int dv_weight_248[64] = {
};

static av_always_inline int dv_init_enc_block(EncBlockInfo *bi, uint8_t *data,
int linesize, DVVideoContext *s,
int bias)
ptrdiff_t linesize,
DVVideoContext *s, int bias)
{
const int *weight;
const uint8_t *zigzag_scan;
@@ -420,7 +420,8 @@ static int dv_encode_video_segment(AVCodecContext *avctx, void *arg)
DVVideoContext *s = avctx->priv_data;
DVwork_chunk *work_chunk = arg;
int mb_index, i, j;
int mb_x, mb_y, c_offset, linesize, y_stride;
int mb_x, mb_y, c_offset;
ptrdiff_t linesize, y_stride;
uint8_t *y_ptr;
uint8_t *dif;
LOCAL_ALIGNED_8(uint8_t, scratch, [128]);


+ 3
- 3
libavcodec/mips/pixblockdsp_mips.h View File

@@ -25,15 +25,15 @@
#include "../mpegvideo.h"

void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1,
const uint8_t *src2, int stride);
const uint8_t *src2, ptrdiff_t stride);
void ff_get_pixels_16_msa(int16_t *restrict dst, const uint8_t *src,
ptrdiff_t stride);
void ff_get_pixels_8_msa(int16_t *restrict dst, const uint8_t *src,
ptrdiff_t stride);

void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
ptrdiff_t line_size);
ptrdiff_t stride);
void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1,
const uint8_t *src2, int stride);
const uint8_t *src2, ptrdiff_t stride);

#endif // #ifndef AVCODEC_MIPS_PIXBLOCKDSP_MIPS_H

+ 11
- 11
libavcodec/mips/pixblockdsp_mmi.c View File

@@ -26,7 +26,7 @@
#include "libavutil/mips/mmiutils.h"

void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
double ftmp[7];
DECLARE_VAR_ALL64;
@@ -36,7 +36,7 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
"xor %[ftmp0], %[ftmp0], %[ftmp0] \n\t"

MMI_LDC1(%[ftmp1], %[pixels], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[line_size], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[stride], 0x00)
"punpcklbh %[ftmp3], %[ftmp1], %[ftmp0] \n\t"
"punpckhbh %[ftmp4], %[ftmp1], %[ftmp0] \n\t"
"punpcklbh %[ftmp5], %[ftmp2], %[ftmp0] \n\t"
@@ -45,10 +45,10 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
MMI_SDC1(%[ftmp4], %[block], 0x08)
MMI_SDC1(%[ftmp5], %[block], 0x10)
MMI_SDC1(%[ftmp6], %[block], 0x18)
PTR_ADDU "%[pixels], %[pixels], %[line_size_x2] \n\t"
PTR_ADDU "%[pixels], %[pixels], %[stride_x2] \n\t"

MMI_LDC1(%[ftmp1], %[pixels], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[line_size], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[stride], 0x00)
"punpcklbh %[ftmp3], %[ftmp1], %[ftmp0] \n\t"
"punpckhbh %[ftmp4], %[ftmp1], %[ftmp0] \n\t"
"punpcklbh %[ftmp5], %[ftmp2], %[ftmp0] \n\t"
@@ -57,10 +57,10 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
MMI_SDC1(%[ftmp4], %[block], 0x28)
MMI_SDC1(%[ftmp5], %[block], 0x30)
MMI_SDC1(%[ftmp6], %[block], 0x38)
PTR_ADDU "%[pixels], %[pixels], %[line_size_x2] \n\t"
PTR_ADDU "%[pixels], %[pixels], %[stride_x2] \n\t"

MMI_LDC1(%[ftmp1], %[pixels], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[line_size], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[stride], 0x00)
"punpcklbh %[ftmp3], %[ftmp1], %[ftmp0] \n\t"
"punpckhbh %[ftmp4], %[ftmp1], %[ftmp0] \n\t"
"punpcklbh %[ftmp5], %[ftmp2], %[ftmp0] \n\t"
@@ -69,10 +69,10 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
MMI_SDC1(%[ftmp4], %[block], 0x48)
MMI_SDC1(%[ftmp5], %[block], 0x50)
MMI_SDC1(%[ftmp6], %[block], 0x58)
PTR_ADDU "%[pixels], %[pixels], %[line_size_x2] \n\t"
PTR_ADDU "%[pixels], %[pixels], %[stride_x2] \n\t"

MMI_LDC1(%[ftmp1], %[pixels], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[line_size], 0x00)
MMI_LDXC1(%[ftmp2], %[pixels], %[stride], 0x00)
"punpcklbh %[ftmp3], %[ftmp1], %[ftmp0] \n\t"
"punpckhbh %[ftmp4], %[ftmp1], %[ftmp0] \n\t"
"punpcklbh %[ftmp5], %[ftmp2], %[ftmp0] \n\t"
@@ -88,14 +88,14 @@ void ff_get_pixels_8_mmi(int16_t *av_restrict block, const uint8_t *pixels,
RESTRICT_ASM_ALL64
RESTRICT_ASM_ADDRT
[pixels]"+&r"(pixels)
: [block]"r"((mips_reg)block), [line_size]"r"((mips_reg)line_size),
[line_size_x2]"r"((mips_reg)(line_size<<1))
: [block]"r"((mips_reg)block), [stride]"r"((mips_reg)stride),
[stride_x2]"r"((mips_reg)(stride<<1))
: "memory"
);
}

void ff_diff_pixels_mmi(int16_t *av_restrict block, const uint8_t *src1,
const uint8_t *src2, int stride)
const uint8_t *src2, ptrdiff_t stride)
{
double ftmp[5];
mips_reg tmp[1];


+ 1
- 1
libavcodec/mips/pixblockdsp_msa.c View File

@@ -137,7 +137,7 @@ void ff_get_pixels_8_msa(int16_t *av_restrict dest, const uint8_t *src,
}

void ff_diff_pixels_msa(int16_t *av_restrict block, const uint8_t *src1,
const uint8_t *src2, int stride)
const uint8_t *src2, ptrdiff_t stride)
{
diff_pixels_msa(block, src1, src2, stride);
}

+ 12
- 12
libavcodec/pixblockdsp.c View File

@@ -25,20 +25,20 @@
#include "pixblockdsp.h"

static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
AV_COPY128U(block + 0 * 8, pixels + 0 * line_size);
AV_COPY128U(block + 1 * 8, pixels + 1 * line_size);
AV_COPY128U(block + 2 * 8, pixels + 2 * line_size);
AV_COPY128U(block + 3 * 8, pixels + 3 * line_size);
AV_COPY128U(block + 4 * 8, pixels + 4 * line_size);
AV_COPY128U(block + 5 * 8, pixels + 5 * line_size);
AV_COPY128U(block + 6 * 8, pixels + 6 * line_size);
AV_COPY128U(block + 7 * 8, pixels + 7 * line_size);
AV_COPY128U(block + 0 * 8, pixels + 0 * stride);
AV_COPY128U(block + 1 * 8, pixels + 1 * stride);
AV_COPY128U(block + 2 * 8, pixels + 2 * stride);
AV_COPY128U(block + 3 * 8, pixels + 3 * stride);
AV_COPY128U(block + 4 * 8, pixels + 4 * stride);
AV_COPY128U(block + 5 * 8, pixels + 5 * stride);
AV_COPY128U(block + 6 * 8, pixels + 6 * stride);
AV_COPY128U(block + 7 * 8, pixels + 7 * stride);
}

static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
int i;

@@ -52,13 +52,13 @@ static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels,
block[5] = pixels[5];
block[6] = pixels[6];
block[7] = pixels[7];
pixels += line_size;
pixels += stride;
block += 8;
}
}

static void diff_pixels_c(int16_t *av_restrict block, const uint8_t *s1,
const uint8_t *s2, int stride)
const uint8_t *s2, ptrdiff_t stride)
{
int i;



+ 2
- 2
libavcodec/pixblockdsp.h View File

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

void ff_pixblockdsp_init(PixblockDSPContext *c, AVCodecContext *avctx);


+ 9
- 9
libavcodec/ppc/pixblockdsp.c View File

@@ -37,7 +37,7 @@

#if HAVE_VSX
static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
int i;
vector unsigned char perm =
@@ -59,12 +59,12 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
// Save the data to the block, we assume the block is 16-byte aligned.
vec_vsx_st(shorts, i * 16, (vector signed short *) block);

pixels += line_size;
pixels += stride;
}
}
#else
static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
int i;
const vec_u8 zero = (const vec_u8)vec_splat_u8(0);
@@ -84,7 +84,7 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,
// Save the data to the block, we assume the block is 16-byte aligned.
vec_st(shorts, i * 16, (vec_s16 *)block);

pixels += line_size;
pixels += stride;
}
}

@@ -92,7 +92,7 @@ static void get_pixels_altivec(int16_t *restrict block, const uint8_t *pixels,

#if HAVE_VSX
static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
const uint8_t *s2, int stride)
const uint8_t *s2, ptrdiff_t stride)
{
int i;
const vector unsigned char zero =
@@ -154,7 +154,7 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
}
#else
static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,
const uint8_t *s2, int stride)
const uint8_t *s2, ptrdiff_t stride)
{
int i;
vec_u8 perm;
@@ -233,7 +233,7 @@ static void diff_pixels_altivec(int16_t *restrict block, const uint8_t *s1,

#if HAVE_VSX
static void get_pixels_vsx(int16_t *restrict block, const uint8_t *pixels,
ptrdiff_t line_size)
ptrdiff_t stride)
{
int i;
for (i = 0; i < 8; i++) {
@@ -241,12 +241,12 @@ static void get_pixels_vsx(int16_t *restrict block, const uint8_t *pixels,

vec_vsx_st(shorts, i * 16, block);

pixels += line_size;
pixels += stride;
}
}

static void diff_pixels_vsx(int16_t *restrict block, const uint8_t *s1,
const uint8_t *s2, int stride)
const uint8_t *s2, ptrdiff_t stride)
{
int i;
vec_s16 shorts1, shorts2;


+ 2
- 3
libavcodec/x86/pixblockdsp.asm View File

@@ -26,7 +26,7 @@
SECTION .text

INIT_MMX mmx
; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size)
; void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t stride)
cglobal get_pixels, 3,4
add r0, 128
mov r3, -128
@@ -81,10 +81,9 @@ cglobal get_pixels, 3, 4, 5
RET

; void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2,
; int stride);
; ptrdiff_t stride);
%macro DIFF_PIXELS 0
cglobal diff_pixels, 4,5,5
movsxdifnidn r3, r3d
pxor m4, m4
add r0, 128
mov r4, -128


+ 4
- 4
libavcodec/x86/pixblockdsp_init.c View File

@@ -23,12 +23,12 @@
#include "libavutil/x86/cpu.h"
#include "libavcodec/pixblockdsp.h"

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, ptrdiff_t line_size);
void ff_get_pixels_mmx(int16_t *block, const uint8_t *pixels, ptrdiff_t stride);
void ff_get_pixels_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t stride);
void ff_diff_pixels_mmx(int16_t *block, const uint8_t *s1, const uint8_t *s2,
int stride);
ptrdiff_t stride);
void ff_diff_pixels_sse2(int16_t *block, const uint8_t *s1, const uint8_t *s2,
int stride);
ptrdiff_t stride);

av_cold void ff_pixblockdsp_init_x86(PixblockDSPContext *c,
AVCodecContext *avctx,


+ 1
- 1
tests/checkasm/pixblockdsp.c View File

@@ -64,7 +64,7 @@
#define check_diff_pixels(type) \
do { \
int i; \
declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, int stride); \
declare_func_emms(AV_CPU_FLAG_MMX, void, int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride); \
\
for (i = 0; i < BUF_UNITS; i++) { \
int src_offset = i * 64 * sizeof(type) + 8 * i; /* Test various alignments */ \


Write Preview
Loading…
Cancel
Save