generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'

Browse Source 
* commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0':
  x86: h264_idct_10_bit: Use proper type in function prototype comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-14 00:00:12 +01:00
commit a9b1936a4e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/x86/h264_idct_10bit.asm
View File

@ -32,7 +32,7 @@ pd_32: times 4 dd 32
SECTION .text SECTION .text
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_idct_add(pixel *dst, dctcoef *block, int stride) ; void h264_idct_add(pixel *dst, int16_t *block, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro STORE_DIFFx2 6 %macro STORE_DIFFx2 6
psrad %1, 6 psrad %1, 6
@ -89,7 +89,8 @@ IDCT_ADD_10
%endif %endif
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; h264_idct_add16(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) ; h264_idct_add16(pixel *dst, const int *block_offset, int16_t *block,
; int stride, const uint8_t nnzc[6*8])
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
;;;;;;; NO FATE SAMPLES TRIGGER THIS ;;;;;;; NO FATE SAMPLES TRIGGER THIS
%macro ADD4x4IDCT 0 %macro ADD4x4IDCT 0
@ -163,7 +164,7 @@ IDCT_ADD16_10
%endif %endif
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_idct_dc_add(pixel *dst, dctcoef *block, int stride) ; void h264_idct_dc_add(pixel *dst, int16_t *block, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro IDCT_DC_ADD_OP_10 3 %macro IDCT_DC_ADD_OP_10 3
pxor m5, m5 pxor m5, m5
@ -205,7 +206,7 @@ cglobal h264_idct_dc_add_10,3,3
RET RET
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_idct8_dc_add(pixel *dst, dctcoef *block, int stride) ; void h264_idct8_dc_add(pixel *dst, int16_t *block, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro IDCT8_DC_ADD 0 %macro IDCT8_DC_ADD 0
cglobal h264_idct8_dc_add_10,3,4,7 cglobal h264_idct8_dc_add_10,3,4,7
@ -230,7 +231,8 @@ IDCT8_DC_ADD
%endif %endif
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; h264_idct_add16intra(pixel *dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) ; h264_idct_add16intra(pixel *dst, const int *block_offset, int16_t *block,
; int stride, const uint8_t nnzc[6*8])
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro AC 1 %macro AC 1
.ac%1: .ac%1:
@ -304,7 +306,8 @@ IDCT_ADD16INTRA_10
%assign last_block 36 %assign last_block 36
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; h264_idct_add8(pixel **dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) ; h264_idct_add8(pixel **dst, const int *block_offset, int16_t *block,
; int stride, const uint8_t nnzc[6*8])
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro IDCT_ADD8 0 %macro IDCT_ADD8 0
cglobal h264_idct_add8_10,5,8,7 cglobal h264_idct_add8_10,5,8,7
@ -340,7 +343,7 @@ IDCT_ADD8
%endif %endif
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; void h264_idct8_add(pixel *dst, dctcoef *block, int stride) ; void h264_idct8_add(pixel *dst, int16_t *block, int stride)
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
%macro IDCT8_1D 2 %macro IDCT8_1D 2
SWAP 0, 1 SWAP 0, 1
@ -549,7 +552,8 @@ IDCT8_ADD
%endif %endif
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
; h264_idct8_add4(pixel **dst, const int *block_offset, dctcoef *block, int stride, const uint8_t nnzc[6*8]) ; h264_idct8_add4(pixel **dst, const int *block_offset, int16_t *block,
; int stride, const uint8_t nnzc[6*8])
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
;;;;;;; NO FATE SAMPLES TRIGGER THIS ;;;;;;; NO FATE SAMPLES TRIGGER THIS
%macro IDCT8_ADD4_OP 2 %macro IDCT8_ADD4_OP 2