diff options
author | James Almer <jamrial@gmail.com> | 2017-03-21 14:29:52 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-03-21 14:29:52 -0300 |
commit | 5a49097b42cbc3eab888d15a91eeaf5520b5c381 (patch) | |
tree | 080300f20bca98deac895f2ca86a25b72a8428e8 /libavcodec/mips | |
parent | 2c8a3aa985acc906ecab37357f2798da7cb9822d (diff) | |
parent | 2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428 (diff) | |
download | ffmpeg-streaming-5a49097b42cbc3eab888d15a91eeaf5520b5c381.zip ffmpeg-streaming-5a49097b42cbc3eab888d15a91eeaf5520b5c381.tar.gz |
Merge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'
* commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428':
idct: Change type of array stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/mips')
-rw-r--r-- | libavcodec/mips/idctdsp_mips.h | 12 | ||||
-rw-r--r-- | libavcodec/mips/simple_idct_msa.c | 4 | ||||
-rw-r--r-- | libavcodec/mips/vc1dsp_mips.h | 14 | ||||
-rw-r--r-- | libavcodec/mips/vc1dsp_mmi.c | 14 |
4 files changed, 22 insertions, 22 deletions
diff --git a/libavcodec/mips/idctdsp_mips.h b/libavcodec/mips/idctdsp_mips.h index 19267e6..7ca7c1c 100644 --- a/libavcodec/mips/idctdsp_mips.h +++ b/libavcodec/mips/idctdsp_mips.h @@ -34,11 +34,11 @@ void ff_add_pixels_clamped_msa(const int16_t *block, uint8_t *av_restrict pixels, ptrdiff_t line_size); void ff_j_rev_dct_msa(int16_t *data); -void ff_jref_idct_put_msa(uint8_t *dest, int32_t stride, int16_t *block); -void ff_jref_idct_add_msa(uint8_t *dest, int32_t stride, int16_t *block); +void ff_jref_idct_put_msa(uint8_t *dest, ptrdiff_t stride, int16_t *block); +void ff_jref_idct_add_msa(uint8_t *dest, ptrdiff_t stride, int16_t *block); void ff_simple_idct_msa(int16_t *block); -void ff_simple_idct_put_msa(uint8_t *dest, int32_t stride_dst, int16_t *block); -void ff_simple_idct_add_msa(uint8_t *dest, int32_t stride_dst, int16_t *block); +void ff_simple_idct_put_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); +void ff_simple_idct_add_msa(uint8_t *dest, ptrdiff_t stride_dst, int16_t *block); void ff_put_pixels_clamped_mmi(const int16_t *block, uint8_t *av_restrict pixels, ptrdiff_t line_size); @@ -47,7 +47,7 @@ void ff_put_signed_pixels_clamped_mmi(const int16_t *block, void ff_add_pixels_clamped_mmi(const int16_t *block, uint8_t *av_restrict pixels, ptrdiff_t line_size); void ff_simple_idct_mmi(int16_t *block); -void ff_simple_idct_put_mmi(uint8_t *dest, int32_t line_size, int16_t *block); -void ff_simple_idct_add_mmi(uint8_t *dest, int32_t line_size, int16_t *block); +void ff_simple_idct_put_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct_add_mmi(uint8_t *dest, ptrdiff_t line_size, int16_t *block); #endif // #ifndef AVCODEC_MIPS_IDCTDSP_MIPS_H diff --git a/libavcodec/mips/simple_idct_msa.c b/libavcodec/mips/simple_idct_msa.c index bd8b310..8a72359 100644 --- a/libavcodec/mips/simple_idct_msa.c +++ b/libavcodec/mips/simple_idct_msa.c @@ -562,12 +562,12 @@ void ff_simple_idct_msa(int16_t *block) simple_idct_msa(block); } -void ff_simple_idct_put_msa(uint8_t *dst, int32_t dst_stride, int16_t *block) +void ff_simple_idct_put_msa(uint8_t *dst, ptrdiff_t dst_stride, int16_t *block) { simple_idct_put_msa(dst, dst_stride, block); } -void ff_simple_idct_add_msa(uint8_t *dst, int32_t dst_stride, int16_t *block) +void ff_simple_idct_add_msa(uint8_t *dst, ptrdiff_t dst_stride, int16_t *block) { simple_idct_add_msa(dst, dst_stride, block); } diff --git a/libavcodec/mips/vc1dsp_mips.h b/libavcodec/mips/vc1dsp_mips.h index 2cdd900..b9b07e1 100644 --- a/libavcodec/mips/vc1dsp_mips.h +++ b/libavcodec/mips/vc1dsp_mips.h @@ -157,14 +157,14 @@ void ff_avg_vc1_mspel_mc33_16_mmi(uint8_t *dst, const uint8_t *src, ptrdiff_t stride, int rnd); void ff_vc1_inv_trans_8x8_mmi(int16_t block[64]); -void ff_vc1_inv_trans_8x4_mmi(uint8_t *dest, int linesize, int16_t *block); -void ff_vc1_inv_trans_4x8_mmi(uint8_t *dest, int linesize, int16_t *block); -void ff_vc1_inv_trans_4x4_mmi(uint8_t *dest, int linesize, int16_t *block); +void ff_vc1_inv_trans_8x4_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); +void ff_vc1_inv_trans_4x8_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); +void ff_vc1_inv_trans_4x4_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); -void ff_vc1_inv_trans_4x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block); -void ff_vc1_inv_trans_4x8_dc_mmi(uint8_t *dest, int linesize, int16_t *block); -void ff_vc1_inv_trans_8x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block); -void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, int linesize, int16_t *block); +void ff_vc1_inv_trans_4x4_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); +void ff_vc1_inv_trans_4x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); +void ff_vc1_inv_trans_8x4_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); +void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block); void ff_vc1_v_overlap_mmi(uint8_t *src, int stride); void ff_vc1_h_overlap_mmi(uint8_t *src, int stride); diff --git a/libavcodec/mips/vc1dsp_mmi.c b/libavcodec/mips/vc1dsp_mmi.c index dfae2d9..01e7f9f 100644 --- a/libavcodec/mips/vc1dsp_mmi.c +++ b/libavcodec/mips/vc1dsp_mmi.c @@ -141,7 +141,7 @@ /* Do inverse transform on 8x8 block */ -void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int dc = block[0]; double ftmp[9]; @@ -368,7 +368,7 @@ void ff_vc1_inv_trans_8x8_mmi(int16_t block[64]) #endif /* Do inverse transform on 8x4 part of block */ -void ff_vc1_inv_trans_8x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_8x4_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int dc = block[0]; double ftmp[9]; @@ -425,7 +425,7 @@ void ff_vc1_inv_trans_8x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block) } #if _MIPS_SIM != _ABIO32 -void ff_vc1_inv_trans_8x4_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_8x4_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int16_t *src = block; int16_t *dst = block; @@ -599,7 +599,7 @@ void ff_vc1_inv_trans_8x4_mmi(uint8_t *dest, int linesize, int16_t *block) #endif /* Do inverse transform on 4x8 parts of block */ -void ff_vc1_inv_trans_4x8_dc_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_4x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int dc = block[0]; double ftmp[9]; @@ -672,7 +672,7 @@ void ff_vc1_inv_trans_4x8_dc_mmi(uint8_t *dest, int linesize, int16_t *block) } #if _MIPS_SIM != _ABIO32 -void ff_vc1_inv_trans_4x8_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_4x8_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int16_t *src = block; int16_t *dst = block; @@ -838,7 +838,7 @@ void ff_vc1_inv_trans_4x8_mmi(uint8_t *dest, int linesize, int16_t *block) #endif /* Do inverse transform on 4x4 part of block */ -void ff_vc1_inv_trans_4x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_4x4_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int dc = block[0]; double ftmp[5]; @@ -886,7 +886,7 @@ void ff_vc1_inv_trans_4x4_dc_mmi(uint8_t *dest, int linesize, int16_t *block) ); } -void ff_vc1_inv_trans_4x4_mmi(uint8_t *dest, int linesize, int16_t *block) +void ff_vc1_inv_trans_4x4_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *block) { int16_t *src = block; int16_t *dst = block; |