Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)
* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
1  2 
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fpel.asm
libavcodec/x86/h263_loopfilter.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_chromamc_10bit.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm
libavcodec/x86/h264_qpel_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/h264_weight_10bit.asm
libavcodec/x86/hpeldsp.asm
libavcodec/x86/mpeg4qpel.asm
libavcodec/x86/proresdsp.asm
libavcodec/x86/qpel.asm
libavcodec/x86/rv40dsp.asm
libavcodec/x86/sbrdsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/vp8dsp_loopfilter.asm

@@@ -61,12 -59,10 +61,13 @@@ cglobal scalarproduct_int16, 3,3,3, v1
  %endif
      paddd   m2, m0
      movd   eax, m2
 +%if mmsize == 8
 +    emms
 +%endif
      RET
  
- ; int scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3, int order, int mul)
+ ; int ff_scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3,
+ ;                                     int order, int mul)
  cglobal scalarproduct_and_madd_int16, 4,4,8, v1, v2, v3, order, mul
      shl orderq, 1
      movd    m7, mulm
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -83,14 -83,13 +83,15 @@@ cglobal h264_idct_add_10, 3,
  
  INIT_XMM sse2
  IDCT_ADD_10
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  IDCT_ADD_10
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; h264_idct_add16(pixel *dst, const int *block_offset, int16_t *block,
- ;                 int stride, const uint8_t nnzc[6*8])
+ ; void ff_h264_idct_add16_10(pixel *dst, const int *block_offset,
+ ;                            int16_t *block, int stride,
+ ;                            const uint8_t nnzc[6*8])
  ;-----------------------------------------------------------------------------
  ;;;;;;; NO FATE SAMPLES TRIGGER THIS
  %macro ADD4x4IDCT 0
@@@ -158,13 -155,11 +159,13 @@@ cglobal h264_idct_add16_10, 5,
  
  INIT_XMM sse2
  IDCT_ADD16_10
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  IDCT_ADD16_10
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void h264_idct_dc_add(pixel *dst, int16_t *block, int stride)
+ ; void ff_h264_idct_dc_add_10(pixel *dst, int16_t *block, int stride)
  ;-----------------------------------------------------------------------------
  %macro IDCT_DC_ADD_OP_10 3
      pxor      m5, m5
@@@ -225,14 -220,13 +226,15 @@@ cglobal h264_idct8_dc_add_10,3,4,
  
  INIT_XMM sse2
  IDCT8_DC_ADD
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  IDCT8_DC_ADD
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; h264_idct_add16intra(pixel *dst, const int *block_offset, int16_t *block,
- ;                      int stride, const uint8_t nnzc[6*8])
+ ; void ff_h264_idct_add16intra_10(pixel *dst, const int *block_offset,
+ ;                                 int16_t *block, int stride,
+ ;                                 const uint8_t nnzc[6*8])
  ;-----------------------------------------------------------------------------
  %macro AC 1
  .ac%1:
@@@ -337,13 -330,11 +340,13 @@@ cglobal h264_idct_add8_10,5,8,
  
  INIT_XMM sse2
  IDCT_ADD8
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  IDCT_ADD8
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void h264_idct8_add(pixel *dst, int16_t *block, int stride)
+ ; void ff_h264_idct8_add_10(pixel *dst, int16_t *block, int stride)
  ;-----------------------------------------------------------------------------
  %macro IDCT8_1D 2
      SWAP      0, 1
@@@ -546,14 -537,13 +549,15 @@@ h264_idct8_add1_10 %+ SUFFIX
  
  INIT_XMM sse2
  IDCT8_ADD
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  IDCT8_ADD
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; h264_idct8_add4(pixel **dst, const int *block_offset, int16_t *block,
- ;                 int stride, const uint8_t nnzc[6*8])
+ ; void ff_h264_idct8_add4_10(pixel **dst, const int *block_offset,
+ ;                            int16_t *block, int stride,
+ ;                            const uint8_t nnzc[6*8])
  ;-----------------------------------------------------------------------------
  ;;;;;;; NO FATE SAMPLES TRIGGER THIS
  %macro IDCT8_ADD4_OP 2
Simple merge
@@@ -82,14 -82,12 +82,14 @@@ INIT_XMM sse
  PRED4x4_DR
  INIT_XMM ssse3
  PRED4x4_DR
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED4x4_DR
 +%endif
  
- ;-----------------------------------------------------------------------------
- ; void pred4x4_vertical_right(pixel *src, const pixel *topright, int stride)
- ;-----------------------------------------------------------------------------
+ ;------------------------------------------------------------------------------
+ ; void ff_pred4x4_vertical_right(pixel *src, const pixel *topright, int stride)
+ ;------------------------------------------------------------------------------
  %macro PRED4x4_VR 0
  cglobal pred4x4_vertical_right_10, 3, 3, 6
      sub     r0, r2
@@@ -121,14 -119,12 +121,14 @@@ INIT_XMM sse
  PRED4x4_VR
  INIT_XMM ssse3
  PRED4x4_VR
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED4x4_VR
 +%endif
  
- ;-----------------------------------------------------------------------------
- ; void pred4x4_horizontal_down(pixel *src, const pixel *topright, int stride)
- ;-----------------------------------------------------------------------------
+ ;-------------------------------------------------------------------------------
+ ; void ff_pred4x4_horizontal_down(pixel *src, const pixel *topright, int stride)
+ ;-------------------------------------------------------------------------------
  %macro PRED4x4_HD 0
  cglobal pred4x4_horizontal_down_10, 3, 3
      sub        r0, r2
@@@ -163,13 -159,11 +163,13 @@@ INIT_XMM sse
  PRED4x4_HD
  INIT_XMM ssse3
  PRED4x4_HD
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED4x4_HD
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred4x4_dc(pixel *src, const pixel *topright, int stride)
+ ; void ff_pred4x4_dc(pixel *src, const pixel *topright, int stride)
  ;-----------------------------------------------------------------------------
  %macro HADDD 2 ; sum junk
  %if mmsize == 16
@@@ -234,13 -228,11 +234,13 @@@ cglobal pred4x4_down_left_10, 3, 
  
  INIT_XMM sse2
  PRED4x4_DL
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED4x4_DL
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred4x4_vertical_left(pixel *src, const pixel *topright, int stride)
+ ; void ff_pred4x4_vertical_left(pixel *src, const pixel *topright, int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED4x4_VL 0
  cglobal pred4x4_vertical_left_10, 3, 3
  
  INIT_XMM sse2
  PRED4x4_VL
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED4x4_VL
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride)
+ ; void ff_pred4x4_horizontal_up(pixel *src, const pixel *topright, int stride)
  ;-----------------------------------------------------------------------------
  INIT_MMX mmxext
  cglobal pred4x4_horizontal_up_10, 3, 3
@@@ -573,14 -565,12 +575,14 @@@ cglobal pred8x8l_top_dc_10, 4, 4, 
  
  INIT_XMM sse2
  PRED8x8L_TOP_DC
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_TOP_DC
 +%endif
  
- ;-----------------------------------------------------------------------------
- ;void pred8x8l_dc(pixel *src, int has_topleft, int has_topright, int stride)
- ;-----------------------------------------------------------------------------
+ ;-------------------------------------------------------------------------------
+ ; void ff_pred8x8l_dc(pixel *src, int has_topleft, int has_topright, int stride)
+ ;-------------------------------------------------------------------------------
  ;TODO: see if scalar is faster
  %macro PRED8x8L_DC 0
  cglobal pred8x8l_dc_10, 4, 6, 6
  
  INIT_XMM sse2
  PRED8x8L_DC
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_DC
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred8x8l_vertical(pixel *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_vertical(pixel *src, int has_topleft, int has_topright,
+ ;                           int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_VERTICAL 0
  cglobal pred8x8l_vertical_10, 4, 4, 6
  
  INIT_XMM sse2
  PRED8x8L_VERTICAL
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_VERTICAL
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred8x8l_horizontal(uint8_t *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_horizontal(uint8_t *src, int has_topleft, int has_topright,
+ ;                             int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_HORIZONTAL 0
  cglobal pred8x8l_horizontal_10, 4, 4, 5
@@@ -723,13 -711,12 +727,14 @@@ INIT_XMM sse
  PRED8x8L_HORIZONTAL
  INIT_XMM ssse3
  PRED8x8L_HORIZONTAL
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_HORIZONTAL
 +%endif
  
  ;-----------------------------------------------------------------------------
- ;void pred8x8l_down_left(pixel *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_down_left(pixel *src, int has_topleft, int has_topright,
+ ;                            int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_DOWN_LEFT 0
  cglobal pred8x8l_down_left_10, 4, 4, 7
@@@ -791,13 -778,12 +796,14 @@@ INIT_XMM sse
  PRED8x8L_DOWN_LEFT
  INIT_XMM ssse3
  PRED8x8L_DOWN_LEFT
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_DOWN_LEFT
 +%endif
  
  ;-----------------------------------------------------------------------------
- ;void pred8x8l_down_right(pixel *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_down_right(pixel *src, int has_topleft, int has_topright,
+ ;                             int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_DOWN_RIGHT 0
  ; standard forbids this when has_topleft is false
@@@ -865,13 -851,12 +871,14 @@@ INIT_XMM sse
  PRED8x8L_DOWN_RIGHT
  INIT_XMM ssse3
  PRED8x8L_DOWN_RIGHT
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_DOWN_RIGHT
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred8x8l_vertical_right(pixel *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_vertical_right(pixel *src, int has_topleft,
+ ;                                 int has_topright, int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_VERTICAL_RIGHT 0
  ; likewise with 8x8l_down_right
@@@ -935,13 -920,12 +942,14 @@@ INIT_XMM sse
  PRED8x8L_VERTICAL_RIGHT
  INIT_XMM ssse3
  PRED8x8L_VERTICAL_RIGHT
 +%if HAVE_AVX_EXTERNAL
  INIT_XMM avx
  PRED8x8L_VERTICAL_RIGHT
 +%endif
  
  ;-----------------------------------------------------------------------------
- ; void pred8x8l_horizontal_up(pixel *src, int has_topleft, int has_topright, int stride)
+ ; void ff_pred8x8l_horizontal_up(pixel *src, int has_topleft,
+ ;                                int has_topright, int stride)
  ;-----------------------------------------------------------------------------
  %macro PRED8x8L_HORIZONTAL_UP 0
  cglobal pred8x8l_horizontal_up_10, 4, 4, 6
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -249,8 -246,8 +249,8 @@@ cglobal sbr_neg_odd_64, 1,2,4,
      jne      .loop
      REP_RET
  
- ; sbr_qmf_deint_bfly(float *v, const float *src0, const float *src1)
 -INIT_XMM sse2
+ ; void ff_sbr_qmf_deint_bfly_sse2(float *v, const float *src0, const float *src1)
 +%macro SBR_QMF_DEINT_BFLY  0
  cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
      mov               cq, 64*4-2*mmsize
      lea            vrevq, [vq + 64*4]
Simple merge
Simple merge