virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

Browse Source 
* commit '620289a20e022b9c16c10d546ef86cc0bb77cc84':
  sh4: Fix silly type vs. variable name search and replace typo
  configure: Group all hwaccels together in a separate variable
  Add av_cold attributes to arch-specific init functions

Conflicts:
	configure
	libavcodec/arm/mpegvideo_armv5te.c
	libavcodec/x86/mlpdsp.c
	libavcodec/x86/motion_est.c
	libavcodec/x86/mpegvideoenc.c
	libavcodec/x86/videodsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-06 13:27:24 +01:00
commit 6c38884876
54 changed files with 146 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -139,6 +139,8 @@ Component options:
--disable-mdct disable MDCT code --disable-mdct disable MDCT code
--disable-rdft disable RDFT code --disable-rdft disable RDFT code
--disable-fft disable FFT code --disable-fft disable FFT code
Hardware accelerators:
--enable-dxva2 enable DXVA2 code --enable-dxva2 enable DXVA2 code
--enable-vaapi enable VAAPI code [autodetect] --enable-vaapi enable VAAPI code [autodetect]
--enable-vda enable VDA code [autodetect] --enable-vda enable VDA code [autodetect]
@ -1109,6 +1111,13 @@ DOCUMENT_LIST="
txtpages txtpages
" "
HWACCEL_LIST="
dxva2
vaapi
vda
vdpau
"
LIBRARY_LIST=" LIBRARY_LIST="
avcodec avcodec
avdevice avdevice
@ -1131,6 +1140,7 @@ PROGRAM_LIST="
CONFIG_LIST=" CONFIG_LIST="
$COMPONENT_LIST $COMPONENT_LIST
$DOCUMENT_LIST $DOCUMENT_LIST
$HWACCEL_LIST
$LIBRARY_LIST $LIBRARY_LIST
$PROGRAM_LIST $PROGRAM_LIST
avisynth avisynth
@ -1138,7 +1148,6 @@ CONFIG_LIST="
crystalhd crystalhd
dct dct
dwt dwt
dxva2
fast_unaligned fast_unaligned
fft fft
fontconfig fontconfig
@ -1207,9 +1216,6 @@ CONFIG_LIST="
static static
swscale_alpha swscale_alpha
thumb thumb
vaapi
vda
vdpau
version3 version3
xmm_clobber_test xmm_clobber_test
x11grab x11grab

3
libavcodec/alpha/dsputil_alpha.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_alpha.h" #include "dsputil_alpha.h"
#include "asm.h" #include "asm.h"
@ -268,7 +269,7 @@ static void put_pixels16_axp_asm(uint8_t *block, const uint8_t *pixels,
put_pixels_axp_asm(block + 8, pixels + 8, line_size, h); put_pixels_axp_asm(block + 8, pixels + 8, line_size, h);
} }
void ff_dsputil_init_alpha(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_alpha(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/alpha/mpegvideo_alpha.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h" #include "libavcodec/mpegvideo.h"
#include "asm.h" #include "asm.h"
@ -103,7 +104,7 @@ static void dct_unquantize_h263_inter_axp(MpegEncContext *s, int16_t *block,
dct_unquantize_h263_axp(block, n_coeffs, qscale, (qscale - 1) | 1); dct_unquantize_h263_axp(block, n_coeffs, qscale, (qscale - 1) | 1);
} }
void ff_MPV_common_init_axp(MpegEncContext *s) av_cold void ff_MPV_common_init_axp(MpegEncContext *s)
{ {
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_axp; s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_axp;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_axp; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_axp;

3
libavcodec/arm/dsputil_init_arm.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_arm.h" #include "dsputil_arm.h"
@ -74,7 +75,7 @@ static void simple_idct_arm_add(uint8_t *dest, int line_size, int16_t *block)
ff_add_pixels_clamped(block, dest, line_size); ff_add_pixels_clamped(block, dest, line_size);
} }
void ff_dsputil_init_arm(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_arm(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/dsputil_init_neon.c
View File

@ -21,6 +21,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_arm.h" #include "dsputil_arm.h"
@ -83,7 +84,7 @@ int32_t ff_scalarproduct_and_madd_int16_neon(int16_t *v1, const int16_t *v2,
void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src, void ff_apply_window_int16_neon(int16_t *dst, const int16_t *src,
const int16_t *window, unsigned n); const int16_t *window, unsigned n);
void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx) av_cold void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/arm/fmtconvert_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/fmtconvert.h" #include "libavcodec/fmtconvert.h"
@ -32,7 +33,7 @@ void ff_float_to_int16_interleave_neon(int16_t *, const float **, long, int);
void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len); void ff_float_to_int16_vfp(int16_t *dst, const float *src, long len);
void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx) av_cold void ff_fmt_convert_init_arm(FmtConvertContext *c, AVCodecContext *avctx)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

7
libavcodec/arm/h264dsp_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/h264dsp.h" #include "libavcodec/h264dsp.h"
@ -68,7 +69,8 @@ void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset,
int16_t *block, int stride, int16_t *block, int stride,
const uint8_t nnzc[6*8]); const uint8_t nnzc[6*8]);
static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) static av_cold void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc)
{ {
#if HAVE_NEON #if HAVE_NEON
if (bit_depth == 8) { if (bit_depth == 8) {
@ -100,7 +102,8 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i
#endif // HAVE_NEON #endif // HAVE_NEON
} }
void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) av_cold void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

8
libavcodec/arm/h264pred_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/h264pred.h" #include "libavcodec/h264pred.h"
@ -44,7 +45,9 @@ void ff_pred8x8_0lt_dc_neon(uint8_t *src, ptrdiff_t stride);
void ff_pred8x8_l00_dc_neon(uint8_t *src, ptrdiff_t stride); void ff_pred8x8_l00_dc_neon(uint8_t *src, ptrdiff_t stride);
void ff_pred8x8_0l0_dc_neon(uint8_t *src, ptrdiff_t stride); void ff_pred8x8_0l0_dc_neon(uint8_t *src, ptrdiff_t stride);
static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc) static av_cold void ff_h264_pred_init_neon(H264PredContext *h, int codec_id,
const int bit_depth,
const int chroma_format_idc)
{ {
#if HAVE_NEON #if HAVE_NEON
const int high_depth = bit_depth > 8; const int high_depth = bit_depth > 8;
@ -79,7 +82,8 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b
#endif // HAVE_NEON #endif // HAVE_NEON
} }
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc) av_cold void ff_h264_pred_init_arm(H264PredContext *h, int codec_id,
int bit_depth, const int chroma_format_idc)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/h264qpel_init_arm.c
View File

@ -22,6 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/h264qpel.h" #include "libavcodec/h264qpel.h"
@ -93,7 +94,7 @@ void ff_avg_h264_qpel8_mc13_neon(uint8_t *, uint8_t *, int);
void ff_avg_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, int); void ff_avg_h264_qpel8_mc23_neon(uint8_t *, uint8_t *, int);
void ff_avg_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, int); void ff_avg_h264_qpel8_mc33_neon(uint8_t *, uint8_t *, int);
void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth) av_cold void ff_h264qpel_init_arm(H264QpelContext *c, int bit_depth)
{ {
const int high_bit_depth = bit_depth > 8; const int high_bit_depth = bit_depth > 8;
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/mpegaudiodsp_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/mpegaudiodsp.h" #include "libavcodec/mpegaudiodsp.h"
#include "config.h" #include "config.h"
@ -27,7 +28,7 @@
void ff_mpadsp_apply_window_fixed_armv6(int32_t *synth_buf, int32_t *window, void ff_mpadsp_apply_window_fixed_armv6(int32_t *synth_buf, int32_t *window,
int *dither, int16_t *out, int incr); int *dither, int16_t *out, int incr);
void ff_mpadsp_init_arm(MPADSPContext *s) av_cold void ff_mpadsp_init_arm(MPADSPContext *s)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

2
libavcodec/arm/mpegvideo_arm.c
View File

@ -39,7 +39,7 @@ void ff_dct_unquantize_h263_inter_neon(MpegEncContext *s, int16_t *block,
void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block, void ff_dct_unquantize_h263_intra_neon(MpegEncContext *s, int16_t *block,
int n, int qscale); int n, int qscale);
void ff_MPV_common_init_arm(MpegEncContext *s) av_cold void ff_MPV_common_init_arm(MpegEncContext *s)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/mpegvideo_armv5te.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -95,7 +96,7 @@ static void dct_unquantize_h263_inter_armv5te(MpegEncContext *s,
ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1); ff_dct_unquantize_h263_armv5te(block, qmul, qadd, nCoeffs + 1);
} }
void ff_MPV_common_init_armv5te(MpegEncContext *s) av_cold void ff_MPV_common_init_armv5te(MpegEncContext *s)
{ {
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te; s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_armv5te;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te; s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_armv5te;

3
libavcodec/arm/rv34dsp_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/rv34dsp.h" #include "libavcodec/rv34dsp.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
@ -31,7 +32,7 @@ void ff_rv34_inv_transform_noround_dc_neon(int16_t *block);
void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, int16_t *block); void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, int16_t *block);
void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc); void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc);
void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext* dsp) av_cold void ff_rv34dsp_init_arm(RV34DSPContext *c, DSPContext *dsp)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

5
libavcodec/arm/rv40dsp_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/rv34dsp.h" #include "libavcodec/rv34dsp.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
@ -69,7 +70,7 @@ void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_
int filter_q1, int alpha, int beta, int filter_q1, int alpha, int beta,
int lim_p0q0, int lim_q1, int lim_p1); int lim_p0q0, int lim_q1, int lim_p1);
static void ff_rv40dsp_init_neon(RV34DSPContext *c) static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c)
{ {
c->put_pixels_tab[0][ 1] = ff_put_rv40_qpel16_mc10_neon; c->put_pixels_tab[0][ 1] = ff_put_rv40_qpel16_mc10_neon;
c->put_pixels_tab[0][ 3] = ff_put_rv40_qpel16_mc30_neon; c->put_pixels_tab[0][ 3] = ff_put_rv40_qpel16_mc30_neon;
@ -138,7 +139,7 @@ static void ff_rv40dsp_init_neon(RV34DSPContext *c)
c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon; c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon;
} }
void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext* dsp) av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/videodsp_init_arm.c
View File

@ -18,11 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/videodsp.h" #include "libavcodec/videodsp.h"
#include "videodsp_arm.h" #include "videodsp_arm.h"
void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc) av_cold void ff_videodsp_init_arm(VideoDSPContext *ctx, int bpc)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (have_armv5te(cpu_flags)) ff_videodsp_init_armv5te(ctx, bpc); if (have_armv5te(cpu_flags)) ff_videodsp_init_armv5te(ctx, bpc);

3
libavcodec/arm/videodsp_init_armv5te.c
View File

@ -18,13 +18,14 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/videodsp.h" #include "libavcodec/videodsp.h"
#include "videodsp_arm.h" #include "videodsp_arm.h"
void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h); void ff_prefetch_arm(uint8_t *mem, ptrdiff_t stride, int h);
void ff_videodsp_init_armv5te(VideoDSPContext *ctx, int bpc) av_cold void ff_videodsp_init_armv5te(VideoDSPContext *ctx, int bpc)
{ {
#if HAVE_ARMV5TE_EXTERNAL #if HAVE_ARMV5TE_EXTERNAL
ctx->prefetch = ff_prefetch_arm; ctx->prefetch = ff_prefetch_arm;

2
libavcodec/arm/vorbisdsp_init_arm.c
View File

@ -27,7 +27,7 @@
void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, void ff_vorbis_inverse_coupling_neon(float *mag, float *ang,
intptr_t blocksize); intptr_t blocksize);
void ff_vorbisdsp_init_arm(VorbisDSPContext *c) av_cold void ff_vorbisdsp_init_arm(VorbisDSPContext *c)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/arm/vp56dsp_init_arm.c
View File

@ -20,6 +20,7 @@
#include <stdint.h> #include <stdint.h>
#include "libavutil/attributes.h"
#include "libavutil/arm/cpu.h" #include "libavutil/arm/cpu.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/vp56dsp.h" #include "libavcodec/vp56dsp.h"
@ -27,7 +28,7 @@
void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t); void ff_vp6_edge_filter_hor_neon(uint8_t *yuv, int stride, int t);
void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t); void ff_vp6_edge_filter_ver_neon(uint8_t *yuv, int stride, int t);
void ff_vp56dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec) av_cold void ff_vp56dsp_init_arm(VP56DSPContext *s, enum AVCodecID codec)
{ {
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();

3
libavcodec/bfin/dsputil_bfin.c
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_bfin.h" #include "dsputil_bfin.h"
@ -195,7 +196,7 @@ static int bfin_pix_abs8_xy2 (void *c, uint8_t *blk1, uint8_t *blk2, int line_si
*/ */
void ff_dsputil_init_bfin( DSPContext* c, AVCodecContext *avctx ) av_cold void ff_dsputil_init_bfin(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/bfin/mpegvideo_bfin.c
View File

@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h" #include "libavcodec/mpegvideo.h"
@ -146,7 +147,7 @@ static int dct_quantize_bfin (MpegEncContext *s,
return last_non_zero; return last_non_zero;
} }
void ff_MPV_common_init_bfin (MpegEncContext *s) av_cold void ff_MPV_common_init_bfin (MpegEncContext *s)
{ {
/* s->dct_quantize= dct_quantize_bfin; */ /* s->dct_quantize= dct_quantize_bfin; */
} }

3
libavcodec/bfin/vp3_bfin.c
View File

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/vp3dsp.h" #include "libavcodec/vp3dsp.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -50,7 +51,7 @@ void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block)
memset(block, 0, 128); memset(block, 0, 128);
} }
void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags)
{ {
c->idct_add = ff_bfin_vp3_idct_add; c->idct_add = ff_bfin_vp3_idct_add;
c->idct_put = ff_bfin_vp3_idct_put; c->idct_put = ff_bfin_vp3_idct_put;

3
libavcodec/ppc/dsputil_altivec.c
View File

@ -24,6 +24,7 @@
#if HAVE_ALTIVEC_H #if HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif #endif
#include "libavutil/attributes.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -1346,7 +1347,7 @@ static void avg_pixels8_xy2_altivec(uint8_t *block, const uint8_t *pixels, ptrdi
} }
} }
void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_altivec(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/ppc/dsputil_ppc.c
View File

@ -22,6 +22,7 @@
#include <string.h> #include <string.h>
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -137,7 +138,7 @@ static long check_dcbzl_effect(void)
} }
#endif #endif
void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/ppc/fmtconvert_altivec.c
View File

@ -21,6 +21,7 @@
#include "libavcodec/fmtconvert.h" #include "libavcodec/fmtconvert.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavutil/attributes.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
@ -155,7 +156,7 @@ static void float_to_int16_interleave_altivec(int16_t *dst, const float **src,
} }
} }
void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx) av_cold void ff_fmt_convert_init_altivec(FmtConvertContext *c, AVCodecContext *avctx)
{ {
c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec; c->int32_to_float_fmul_scalar = int32_to_float_fmul_scalar_altivec;
if (!(avctx->flags & CODEC_FLAG_BITEXACT)) { if (!(avctx->flags & CODEC_FLAG_BITEXACT)) {

4
libavcodec/ppc/h264_altivec.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
@ -718,7 +719,8 @@ static void ff_biweight_h264_pixels ## W ## _altivec(uint8_t *dst, uint8_t *src,
H264_WEIGHT(16) H264_WEIGHT(16)
H264_WEIGHT( 8) H264_WEIGHT( 8)
void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) av_cold void ff_h264dsp_init_ppc(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc)
{ {
if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {
if (bit_depth == 8) { if (bit_depth == 8) {

4
libavcodec/ppc/h264_qpel.c
View File

@ -19,6 +19,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavcodec/h264qpel.h" #include "libavcodec/h264qpel.h"
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
@ -286,7 +287,8 @@ void ff_dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx)
} }
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
void ff_h264qpel_init_ppc(H264QpelContext* c, int bit_depth) { av_cold void ff_h264qpel_init_ppc(H264QpelContext *c, int bit_depth)
{
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
const int high_bit_depth = bit_depth > 8; const int high_bit_depth = bit_depth > 8;

3
libavcodec/ppc/int_altivec.c
View File

@ -28,6 +28,7 @@
#include <altivec.h> #include <altivec.h>
#endif #endif
#include "libavutil/attributes.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -136,7 +137,7 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t *
return ires; return ires;
} }
void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx) av_cold void ff_int_init_altivec(DSPContext *c, AVCodecContext *avctx)
{ {
c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec; c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec;
c->scalarproduct_int16 = scalarproduct_int16_altivec; c->scalarproduct_int16 = scalarproduct_int16_altivec;

3
libavcodec/ppc/mpegaudiodec_altivec.c
View File

@ -20,6 +20,7 @@
*/ */
#include "dsputil_altivec.h" #include "dsputil_altivec.h"
#include "libavutil/attributes.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavcodec/mpegaudiodsp.h" #include "libavcodec/mpegaudiodsp.h"
@ -123,7 +124,7 @@ static void apply_window_mp3(float *in, float *win, int *unused, float *out,
*out = sum; *out = sum;
} }
void ff_mpadsp_init_altivec(MPADSPContext *s) av_cold void ff_mpadsp_init_altivec(MPADSPContext *s)
{ {
s->apply_window_float = apply_window_mp3; s->apply_window_float = apply_window_mp3;
} }

3
libavcodec/ppc/mpegvideo_altivec.c
View File

@ -24,6 +24,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
@ -112,7 +113,7 @@ static void dct_unquantize_h263_altivec(MpegEncContext *s,
} }
void ff_MPV_common_init_altivec(MpegEncContext *s) av_cold void ff_MPV_common_init_altivec(MpegEncContext *s)
{ {
if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return; if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) return;

3
libavcodec/ppc/vc1dsp_altivec.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/ppc/types_altivec.h" #include "libavutil/ppc/types_altivec.h"
#include "libavutil/ppc/util_altivec.h" #include "libavutil/ppc/util_altivec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -335,7 +336,7 @@ static void vc1_inv_trans_8x4_altivec(uint8_t *dest, int stride, int16_t *block)
#undef OP_U8_ALTIVEC #undef OP_U8_ALTIVEC
#undef PREFIX_no_rnd_vc1_chroma_mc8_altivec #undef PREFIX_no_rnd_vc1_chroma_mc8_altivec
void ff_vc1dsp_init_altivec(VC1DSPContext* dsp) av_cold void ff_vc1dsp_init_altivec(VC1DSPContext *dsp)
{ {
if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC)) if (!(av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC))
return; return;

3
libavcodec/ppc/videodsp_ppc.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/videodsp.h" #include "libavcodec/videodsp.h"
static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h) static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h)
@ -29,7 +30,7 @@ static void prefetch_ppc(uint8_t *mem, ptrdiff_t stride, int h)
} while(--h); } while(--h);
} }
void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc) av_cold void ff_videodsp_init_ppc(VideoDSPContext *ctx, int bpc)
{ {
ctx->prefetch = prefetch_ppc; ctx->prefetch = prefetch_ppc;
} }

3
libavcodec/ppc/vorbisdsp_altivec.c
View File

@ -22,6 +22,7 @@
#if HAVE_ALTIVEC_H #if HAVE_ALTIVEC_H
#include <altivec.h> #include <altivec.h>
#endif #endif
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavcodec/vorbisdsp.h" #include "libavcodec/vorbisdsp.h"
@ -50,7 +51,7 @@ static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
} }
#endif /* HAVE_ALTIVEC */ #endif /* HAVE_ALTIVEC */
void ff_vorbisdsp_init_ppc(VorbisDSPContext* c) av_cold void ff_vorbisdsp_init_ppc(VorbisDSPContext *c)
{ {
#if HAVE_ALTIVEC #if HAVE_ALTIVEC
if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) {

6
libavcodec/sh4/dsputil_align.c
View File

@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_sh4.h" #include "dsputil_sh4.h"
@ -262,7 +262,7 @@ if (sz==16) { \
#define DEFFUNC(op,rnd,xy,sz,OP_N,avgfunc) \ #define DEFFUNC(op,rnd,xy,sz,OP_N,avgfunc) \
static void op##_##rnd##_pixels##sz##_##xy (uint8_t * dest, const uint8_t * ref, \ static void op##_##rnd##_pixels##sz##_##xy (uint8_t * dest, const uint8_t * ref, \
const int ptrdiff_t, int height) \ const ptrdiff_t stride, int height) \
{ \ { \
switch((int)ref&3) { \ switch((int)ref&3) { \
case 0:OP_N##0(sz,rnd##_##avgfunc); return; \ case 0:OP_N##0(sz,rnd##_##avgfunc); return; \
@ -326,7 +326,7 @@ DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK)
#endif #endif
void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_align(DSPContext *c, AVCodecContext *avctx)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/sh4/dsputil_sh4.c
View File

@ -20,6 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "dsputil_sh4.h" #include "dsputil_sh4.h"
@ -89,7 +90,7 @@ static void idct_add(uint8_t *dest, int line_size, int16_t *block)
} }
} }
void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_sh4(DSPContext *c, AVCodecContext *avctx)
{ {
const int idct_algo= avctx->idct_algo; const int idct_algo= avctx->idct_algo;
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;

3
libavcodec/sparc/dsputil_vis.c
View File

@ -26,6 +26,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "libavutil/attributes.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "dsputil_vis.h" #include "dsputil_vis.h"
@ -3494,7 +3495,7 @@ static int vis_level(void)
} }
/* libavcodec initialization code */ /* libavcodec initialization code */
void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_vis(DSPContext *c, AVCodecContext *avctx)
{ {
/* VIS-specific optimizations */ /* VIS-specific optimizations */
int accel = vis_level (); int accel = vis_level ();

8
libavcodec/x86/cavsdsp.c
View File

@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
@ -446,7 +447,8 @@ CAVS_MC(put_, 16, mmxext)
CAVS_MC(avg_, 8, mmxext) CAVS_MC(avg_, 8, mmxext)
CAVS_MC(avg_, 16, mmxext) CAVS_MC(avg_, 16, mmxext)
static void ff_cavsdsp_init_mmxext(CAVSDSPContext *c, AVCodecContext *avctx) static av_cold void ff_cavsdsp_init_mmxext(CAVSDSPContext *c,
AVCodecContext *avctx)
{ {
#define dspfunc(PFX, IDX, NUM) \ #define dspfunc(PFX, IDX, NUM) \
c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \ c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \
@ -474,7 +476,9 @@ CAVS_MC(put_, 16,3dnow)
CAVS_MC(avg_, 8, 3dnow) CAVS_MC(avg_, 8, 3dnow)
CAVS_MC(avg_, 16,3dnow) CAVS_MC(avg_, 16,3dnow)
static void ff_cavsdsp_init_3dnow(CAVSDSPContext* c, AVCodecContext *avctx) { static av_cold void ff_cavsdsp_init_3dnow(CAVSDSPContext *c,
AVCodecContext *avctx)
{
#define dspfunc(PFX, IDX, NUM) \ #define dspfunc(PFX, IDX, NUM) \
c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \ c->PFX ## _pixels_tab[IDX][ 0] = ff_ ## PFX ## NUM ## _mc00_mmxext; \
c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_3dnow; \ c->PFX ## _pixels_tab[IDX][ 2] = ff_ ## PFX ## NUM ## _mc20_3dnow; \

3
libavcodec/x86/dnxhdenc.c
View File

@ -21,6 +21,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavcodec/dnxhdenc.h" #include "libavcodec/dnxhdenc.h"
@ -54,7 +55,7 @@ static void get_pixels_8x4_sym_sse2(int16_t *block, const uint8_t *pixels, int l
#endif /* HAVE_SSE2_INLINE */ #endif /* HAVE_SSE2_INLINE */
void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx) av_cold void ff_dnxhdenc_init_x86(DNXHDEncContext *ctx)
{ {
#if HAVE_SSE2_INLINE #if HAVE_SSE2_INLINE
if (av_get_cpu_flags() & AV_CPU_FLAG_SSE2) { if (av_get_cpu_flags() & AV_CPU_FLAG_SSE2) {

31
libavcodec/x86/dsputil_mmx.c
View File

@ -22,6 +22,7 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
@ -1821,7 +1822,8 @@ void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src,
c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \ c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ## CPU; \
} while (0) } while (0)
static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags) static av_cold void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx,
int mm_flags)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
@ -1867,8 +1869,8 @@ static void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
} }
static void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
int mm_flags) int mm_flags)
{ {
const int bit_depth = avctx->bits_per_raw_sample; const int bit_depth = avctx->bits_per_raw_sample;
const int high_bit_depth = bit_depth > 8; const int high_bit_depth = bit_depth > 8;
@ -1946,8 +1948,8 @@ static void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
#endif /* HAVE_MMXEXT_EXTERNAL */ #endif /* HAVE_MMXEXT_EXTERNAL */
} }
static void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,
int mm_flags) int mm_flags)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
@ -1991,7 +1993,8 @@ static void dsputil_init_3dnow(DSPContext *c, AVCodecContext *avctx,
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
} }
static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags) static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
int mm_flags)
{ {
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
@ -2014,8 +2017,8 @@ static void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx, int mm_flags)
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
} }
static void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,
int mm_flags) int mm_flags)
{ {
const int bit_depth = avctx->bits_per_raw_sample; const int bit_depth = avctx->bits_per_raw_sample;
const int high_bit_depth = bit_depth > 8; const int high_bit_depth = bit_depth > 8;
@ -2062,8 +2065,8 @@ static void dsputil_init_sse2(DSPContext *c, AVCodecContext *avctx,
#endif /* HAVE_SSE2_EXTERNAL */ #endif /* HAVE_SSE2_EXTERNAL */
} }
static void dsputil_init_ssse3(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_ssse3(DSPContext *c, AVCodecContext *avctx,
int mm_flags) int mm_flags)
{ {
#if HAVE_SSSE3_EXTERNAL #if HAVE_SSSE3_EXTERNAL
const int high_bit_depth = avctx->bits_per_raw_sample > 8; const int high_bit_depth = avctx->bits_per_raw_sample > 8;
@ -2088,15 +2091,15 @@ static void dsputil_init_ssse3(DSPContext *c, AVCodecContext *avctx,
#endif /* HAVE_SSSE3_EXTERNAL */ #endif /* HAVE_SSSE3_EXTERNAL */
} }
static void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx, static av_cold void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx,
int mm_flags) int mm_flags)
{ {
#if HAVE_SSE4_EXTERNAL #if HAVE_SSE4_EXTERNAL
c->vector_clip_int32 = ff_vector_clip_int32_sse4; c->vector_clip_int32 = ff_vector_clip_int32_sse4;
#endif /* HAVE_SSE4_EXTERNAL */ #endif /* HAVE_SSE4_EXTERNAL */
} }
static void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags) static av_cold void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
{ {
#if HAVE_AVX_EXTERNAL #if HAVE_AVX_EXTERNAL
const int bit_depth = avctx->bits_per_raw_sample; const int bit_depth = avctx->bits_per_raw_sample;
@ -2110,7 +2113,7 @@ static void dsputil_init_avx(DSPContext *c, AVCodecContext *avctx, int mm_flags)
#endif /* HAVE_AVX_EXTERNAL */ #endif /* HAVE_AVX_EXTERNAL */
} }
void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) av_cold void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/dsputilenc_mmx.c
View File

@ -22,6 +22,7 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -942,7 +943,7 @@ hadamard_func(mmxext)
hadamard_func(sse2) hadamard_func(sse2)
hadamard_func(ssse3) hadamard_func(ssse3)
void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
int bit_depth = avctx->bits_per_raw_sample; int bit_depth = avctx->bits_per_raw_sample;

3
libavcodec/x86/fmtconvert_init.c
View File

@ -22,6 +22,7 @@
* MMX optimization by Nick Kurshev <nickols_k@mail.ru> * MMX optimization by Nick Kurshev <nickols_k@mail.ru>
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -113,7 +114,7 @@ static void float_interleave_sse(float *dst, const float **src,
} }
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx) av_cold void ff_fmt_convert_init_x86(FmtConvertContext *c, AVCodecContext *avctx)
{ {
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

5
libavcodec/x86/h264_intrapred_init.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
@ -180,7 +181,9 @@ PRED4x4(tm_vp8, 8, mmxext)
PRED4x4(tm_vp8, 8, ssse3) PRED4x4(tm_vp8, 8, ssse3)
PRED4x4(vertical_vp8, 8, mmxext) PRED4x4(vertical_vp8, 8, mmxext)
void ff_h264_pred_init_x86(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc) av_cold void ff_h264_pred_init_x86(H264PredContext *h, int codec_id,
const int bit_depth,
const int chroma_format_idc)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/h264_qpel.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -529,7 +530,7 @@ QPEL16(mmxext)
c->avg_h264_qpel_pixels_tab[1][x + y * 4] = ff_avg_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \ c->avg_h264_qpel_pixels_tab[1][x + y * 4] = ff_avg_h264_qpel8_mc ## x ## y ## _10_ ## CPU; \
} while (0) } while (0)
void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth)
{ {
#if HAVE_YASM #if HAVE_YASM
int high_bit_depth = bit_depth > 8; int high_bit_depth = bit_depth > 8;

5
libavcodec/x86/h264dsp_init.c
View File

@ -18,6 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -207,8 +208,8 @@ H264_BIWEIGHT_10_SSE(16, 10)
H264_BIWEIGHT_10_SSE(8, 10) H264_BIWEIGHT_10_SSE(8, 10)
H264_BIWEIGHT_10_SSE(4, 10) H264_BIWEIGHT_10_SSE(4, 10)
void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth, av_cold void ff_h264dsp_init_x86(H264DSPContext *c, const int bit_depth,
const int chroma_format_idc) const int chroma_format_idc)
{ {
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

1
libavcodec/x86/lpc.c
View File

@ -20,6 +20,7 @@
*/ */
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavcodec/lpc.h" #include "libavcodec/lpc.h"

3
libavcodec/x86/mlpdsp.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavcodec/mlpdsp.h" #include "libavcodec/mlpdsp.h"
#include "libavcodec/mlp.h" #include "libavcodec/mlp.h"
@ -173,7 +174,7 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff,
#endif /* HAVE_7REGS && HAVE_INLINE_ASM */ #endif /* HAVE_7REGS && HAVE_INLINE_ASM */
void ff_mlpdsp_init_x86(MLPDSPContext *c) av_cold void ff_mlpdsp_init_x86(MLPDSPContext *c)
{ {
#if HAVE_7REGS && HAVE_INLINE_ASM #if HAVE_7REGS && HAVE_INLINE_ASM
c->mlp_filter_channel = mlp_filter_channel_x86; c->mlp_filter_channel = mlp_filter_channel_x86;

3
libavcodec/x86/motion_est.c
View File

@ -22,6 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
@ -432,7 +433,7 @@ PIX_SAD(mmxext)
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx)
{ {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/mpegaudiodec.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -232,7 +233,7 @@ DECL_IMDCT_BLOCKS(avx,avx)
#endif #endif
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
void ff_mpadsp_init_x86(MPADSPContext *s) av_cold void ff_mpadsp_init_x86(MPADSPContext *s)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/mpegvideo.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
@ -576,7 +577,7 @@ static void denoise_dct_sse2(MpegEncContext *s, int16_t *block){
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
void ff_MPV_common_init_x86(MpegEncContext *s) av_cold void ff_MPV_common_init_x86(MpegEncContext *s)
{ {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/mpegvideoenc.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
@ -80,7 +81,7 @@ extern uint16_t ff_inv_zigzag_direct16[64];
#include "mpegvideoenc_template.c" #include "mpegvideoenc_template.c"
#endif /* HAVE_SSSE3_INLINE */ #endif /* HAVE_SSSE3_INLINE */
void ff_dct_encode_init_x86(MpegEncContext *s) av_cold void ff_dct_encode_init_x86(MpegEncContext *s)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();
const int dct_algo = s->avctx->dct_algo; const int dct_algo = s->avctx->dct_algo;

3
libavcodec/x86/pngdsp_init.c
View File

@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "libavutil/attributes.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/pngdsp.h" #include "libavcodec/pngdsp.h"
@ -32,7 +33,7 @@ void ff_add_bytes_l2_mmx (uint8_t *dst, uint8_t *src1,
void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1, void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1,
uint8_t *src2, int w); uint8_t *src2, int w);
void ff_pngdsp_init_x86(PNGDSPContext *dsp) av_cold void ff_pngdsp_init_x86(PNGDSPContext *dsp)
{ {
int flags = av_get_cpu_flags(); int flags = av_get_cpu_flags();

3
libavcodec/x86/rv40dsp_init.c
View File

@ -27,6 +27,7 @@
*/ */
#include "libavcodec/rv34dsp.h" #include "libavcodec/rv34dsp.h"
#include "libavutil/attributes.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "dsputil_mmx.h" #include "dsputil_mmx.h"
@ -187,7 +188,7 @@ QPEL_FUNCS_SET (OP, 3, 2, OPT)
#endif /* HAVE_YASM */ #endif /* HAVE_YASM */
void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp) av_cold void ff_rv40dsp_init_x86(RV34DSPContext *c, DSPContext *dsp)
{ {
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/sbrdsp_init.c
View File

@ -20,6 +20,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavutil/x86/cpu.h" #include "libavutil/x86/cpu.h"
#include "libavcodec/sbrdsp.h" #include "libavcodec/sbrdsp.h"
@ -33,7 +34,7 @@ void ff_sbr_hf_gen_sse(float (*X_high)[2], const float (*X_low)[2],
float bw, int start, int end); float bw, int start, int end);
void ff_sbr_qmf_post_shuffle_sse(float W[32][2], const float *z); void ff_sbr_qmf_post_shuffle_sse(float W[32][2], const float *z);
void ff_sbrdsp_init_x86(SBRDSPContext *s) av_cold void ff_sbrdsp_init_x86(SBRDSPContext *s)
{ {
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/videodsp_init.c
View File

@ -20,6 +20,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/common.h" #include "libavutil/common.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
@ -104,7 +105,7 @@ static av_noinline void emulated_edge_mc_sse(uint8_t *buf, const uint8_t *src,
void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h); void ff_prefetch_mmxext(uint8_t *buf, ptrdiff_t stride, int h);
void ff_prefetch_3dnow(uint8_t *buf, ptrdiff_t stride, int h); void ff_prefetch_3dnow(uint8_t *buf, ptrdiff_t stride, int h);
void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc) av_cold void ff_videodsp_init_x86(VideoDSPContext *ctx, int bpc)
{ {
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();

3
libavcodec/x86/vorbisdsp_init.c
View File

@ -19,6 +19,7 @@
*/ */
#include "config.h" #include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
#include "libavcodec/vorbisdsp.h" #include "libavcodec/vorbisdsp.h"
@ -27,7 +28,7 @@ void ff_vorbis_inverse_coupling_3dnow(float *mag, float *ang,
void ff_vorbis_inverse_coupling_sse(float *mag, float *ang, void ff_vorbis_inverse_coupling_sse(float *mag, float *ang,
intptr_t blocksize); intptr_t blocksize);
void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp)
{ {
#if HAVE_YASM #if HAVE_YASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();