Browse Source

DNxHD: make get_pixel_8x4_sym accept ptrdiff_t as stride

tags/n2.3
Timothy Gu Vittorio Giovara 12 years ago
parent
commit
676856204b
3 changed files with 5 additions and 4 deletions
  1. +2
    -2
      libavcodec/dnxhdenc.c
  2. +2
    -1
      libavcodec/dnxhdenc.h
  3. +1
    -1
      libavcodec/x86/dnxhdenc.c

+ 2
- 2
libavcodec/dnxhdenc.c View File

@@ -55,7 +55,7 @@ static const AVClass class = {


static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block, static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block,
const uint8_t *pixels, const uint8_t *pixels,
int line_size)
ptrdiff_t line_size)
{ {
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
@@ -79,7 +79,7 @@ static void dnxhd_8bit_get_pixels_8x4_sym(int16_t *restrict block,
static av_always_inline static av_always_inline
void dnxhd_10bit_get_pixels_8x4_sym(int16_t *restrict block, void dnxhd_10bit_get_pixels_8x4_sym(int16_t *restrict block,
const uint8_t *pixels, const uint8_t *pixels,
int line_size)
ptrdiff_t line_size)
{ {
int i; int i;




+ 2
- 1
libavcodec/dnxhdenc.h View File

@@ -91,7 +91,8 @@ typedef struct DNXHDEncContext {
RCCMPEntry *mb_cmp; RCCMPEntry *mb_cmp;
RCEntry (*mb_rc)[8160]; RCEntry (*mb_rc)[8160];


void (*get_pixels_8x4_sym)(int16_t * /*align 16*/, const uint8_t *, int);
void (*get_pixels_8x4_sym)(int16_t * /* align 16 */,
const uint8_t *, ptrdiff_t);
} DNXHDEncContext; } DNXHDEncContext;


void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx); void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx);


+ 1
- 1
libavcodec/x86/dnxhdenc.c View File

@@ -28,7 +28,7 @@


#if HAVE_SSE2_INLINE #if HAVE_SSE2_INLINE


static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, int line_size)
static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, ptrdiff_t line_size)
{ {
__asm__ volatile( __asm__ volatile(
"pxor %%xmm5, %%xmm5 \n\t" "pxor %%xmm5, %%xmm5 \n\t"


Loading…
Cancel
Save