Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c1ad70c3
Commit
c1ad70c3
authored
Apr 22, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
x86: Move some conditional code around to avoid unused variable warnings
parent
10f1a4d9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
19 deletions
+17
-19
dsputil_mmx.c
libavcodec/x86/dsputil_mmx.c
+12
-15
dsputilenc_mmx.c
libavcodec/x86/dsputilenc_mmx.c
+2
-1
mpegvideoenc.c
libavcodec/x86/mpegvideoenc.c
+1
-1
vf_gradfun.c
libavfilter/x86/vf_gradfun.c
+1
-1
vf_yadif_init.c
libavfilter/x86/vf_yadif_init.c
+1
-1
No files found.
libavcodec/x86/dsputil_mmx.c
View file @
c1ad70c3
...
...
@@ -1279,9 +1279,9 @@ void ff_vector_clip_int32_sse4 (int32_t *dst, const int32_t *src,
static
av_cold
void
dsputil_init_mmx
(
DSPContext
*
c
,
AVCodecContext
*
avctx
,
int
mm_flags
)
{
#if HAVE_INLINE_ASM
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
#if HAVE_INLINE_ASM
c
->
put_pixels_clamped
=
ff_put_pixels_clamped_mmx
;
c
->
put_signed_pixels_clamped
=
ff_put_signed_pixels_clamped_mmx
;
c
->
add_pixels_clamped
=
ff_add_pixels_clamped_mmx
;
...
...
@@ -1319,26 +1319,15 @@ static av_cold void dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx,
}
c
->
vector_clip_int32
=
ff_vector_clip_int32_mmx
;
#endif
#endif
/* HAVE_YASM */
}
static
av_cold
void
dsputil_init_mmxext
(
DSPContext
*
c
,
AVCodecContext
*
avctx
,
int
mm_flags
)
{
#if HAVE_INLINE_ASM
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
#if HAVE_YASM
SET_QPEL_FUNCS
(
avg_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
avg_qpel
,
1
,
8
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_qpel
,
1
,
8
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_no_rnd_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_no_rnd_qpel
,
1
,
8
,
mmxext
,
);
#endif
/* HAVE_YASM */
#if HAVE_INLINE_ASM
if
(
!
high_bit_depth
&&
avctx
->
idct_algo
==
FF_IDCT_XVIDMMX
)
{
c
->
idct_put
=
ff_idct_xvid_mmxext_put
;
c
->
idct_add
=
ff_idct_xvid_mmxext_add
;
...
...
@@ -1347,6 +1336,14 @@ static av_cold void dsputil_init_mmxext(DSPContext *c, AVCodecContext *avctx,
#endif
/* HAVE_INLINE_ASM */
#if HAVE_MMXEXT_EXTERNAL
SET_QPEL_FUNCS
(
avg_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
avg_qpel
,
1
,
8
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_qpel
,
1
,
8
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_no_rnd_qpel
,
0
,
16
,
mmxext
,
);
SET_QPEL_FUNCS
(
put_no_rnd_qpel
,
1
,
8
,
mmxext
,
);
/* slower than cmov version on AMD */
if
(
!
(
mm_flags
&
AV_CPU_FLAG_3DNOW
))
c
->
add_hfyu_median_prediction
=
ff_add_hfyu_median_prediction_mmxext
;
...
...
@@ -1383,9 +1380,9 @@ static av_cold void dsputil_init_sse(DSPContext *c, AVCodecContext *avctx,
static
av_cold
void
dsputil_init_sse2
(
DSPContext
*
c
,
AVCodecContext
*
avctx
,
int
mm_flags
)
{
#if HAVE_SSE2_INLINE
const
int
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
#if HAVE_SSE2_INLINE
if
(
!
high_bit_depth
&&
avctx
->
idct_algo
==
FF_IDCT_XVIDMMX
)
{
c
->
idct_put
=
ff_idct_xvid_sse2_put
;
c
->
idct_add
=
ff_idct_xvid_sse2_add
;
...
...
libavcodec/x86/dsputilenc_mmx.c
View file @
c1ad70c3
...
...
@@ -946,9 +946,10 @@ hadamard_func(ssse3)
av_cold
void
ff_dsputilenc_init_mmx
(
DSPContext
*
c
,
AVCodecContext
*
avctx
)
{
int
mm_flags
=
av_get_cpu_flags
();
int
bit_depth
=
avctx
->
bits_per_raw_sample
;
#if HAVE_YASM
int
bit_depth
=
avctx
->
bits_per_raw_sample
;
if
(
EXTERNAL_MMX
(
mm_flags
))
{
if
(
bit_depth
<=
8
)
c
->
get_pixels
=
ff_get_pixels_mmx
;
...
...
libavcodec/x86/mpegvideoenc.c
View file @
c1ad70c3
...
...
@@ -83,11 +83,11 @@ extern uint16_t ff_inv_zigzag_direct16[64];
av_cold
void
ff_MPV_encode_init_x86
(
MpegEncContext
*
s
)
{
int
mm_flags
=
av_get_cpu_flags
();
const
int
dct_algo
=
s
->
avctx
->
dct_algo
;
if
(
dct_algo
==
FF_DCT_AUTO
||
dct_algo
==
FF_DCT_MMX
)
{
#if HAVE_MMX_INLINE
int
mm_flags
=
av_get_cpu_flags
();
if
(
INLINE_MMX
(
mm_flags
))
s
->
dct_quantize
=
dct_quantize_MMX
;
#endif
...
...
libavfilter/x86/vf_gradfun.c
View file @
c1ad70c3
...
...
@@ -200,9 +200,9 @@ static void gradfun_blur_line_sse2(uint16_t *dc, uint16_t *buf, uint16_t *buf1,
av_cold
void
ff_gradfun_init_x86
(
GradFunContext
*
gf
)
{
#if HAVE_MMXEXT_INLINE
int
cpu_flags
=
av_get_cpu_flags
();
#if HAVE_MMXEXT_INLINE
if
(
cpu_flags
&
AV_CPU_FLAG_MMXEXT
)
gf
->
filter_line
=
gradfun_filter_line_mmxext
;
#endif
...
...
libavfilter/x86/vf_yadif_init.c
View file @
c1ad70c3
...
...
@@ -39,9 +39,9 @@ void ff_yadif_filter_line_ssse3(void *dst, void *prev, void *cur,
av_cold
void
ff_yadif_init_x86
(
YADIFContext
*
yadif
)
{
#if HAVE_YASM
int
cpu_flags
=
av_get_cpu_flags
();
#if HAVE_YASM
#if ARCH_X86_32
if
(
EXTERNAL_MMXEXT
(
cpu_flags
))
{
yadif
->
filter_line
=
ff_yadif_filter_line_mmxext
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment