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
f61bece6
Commit
f61bece6
authored
Aug 20, 2013
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc: Add and use convenience macro to check for AltiVec availability
parent
8410d6e9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
13 deletions
+38
-13
dsputil_ppc.c
libavcodec/ppc/dsputil_ppc.c
+2
-3
cpu.h
libavutil/ppc/cpu.h
+28
-0
float_dsp_init.c
libavutil/ppc/float_dsp_init.c
+2
-3
utils.c
libswscale/utils.c
+6
-7
No files found.
libavcodec/ppc/dsputil_ppc.c
View file @
f61bece6
...
...
@@ -25,6 +25,7 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/mem.h"
#include "libavutil/ppc/cpu.h"
#include "dsputil_altivec.h"
/* ***** WARNING ***** WARNING ***** WARNING ***** */
...
...
@@ -155,8 +156,7 @@ av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
}
}
#if HAVE_ALTIVEC
if
(
av_get_cpu_flags
()
&
AV_CPU_FLAG_ALTIVEC
)
{
if
(
PPC_ALTIVEC
(
av_get_cpu_flags
()))
{
ff_dsputil_init_altivec
(
c
,
avctx
);
ff_int_init_altivec
(
c
,
avctx
);
c
->
gmc1
=
ff_gmc1_altivec
;
...
...
@@ -179,5 +179,4 @@ av_cold void ff_dsputil_init_ppc(DSPContext *c, AVCodecContext *avctx)
}
}
#endif
/* HAVE_ALTIVEC */
}
libavutil/ppc/cpu.h
0 → 100644
View file @
f61bece6
/*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef AVUTIL_PPC_CPU_H
#define AVUTIL_PPC_CPU_H
#include "config.h"
#include "libavutil/cpu.h"
#include "libavutil/cpu_internal.h"
#define PPC_ALTIVEC(flags) CPUEXT(flags, ALTIVEC)
#endif
/* AVUTIL_PPC_CPU_H */
libavutil/ppc/float_dsp_init.c
View file @
f61bece6
...
...
@@ -22,12 +22,12 @@
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/float_dsp.h"
#include "libavutil/ppc/cpu.h"
#include "float_dsp_altivec.h"
av_cold
void
ff_float_dsp_init_ppc
(
AVFloatDSPContext
*
fdsp
,
int
bit_exact
)
{
#if HAVE_ALTIVEC
if
(
!
(
av_get_cpu_flags
()
&
AV_CPU_FLAG_ALTIVEC
))
if
(
!
PPC_ALTIVEC
(
av_get_cpu_flags
()))
return
;
fdsp
->
vector_fmul
=
ff_vector_fmul_altivec
;
...
...
@@ -37,5 +37,4 @@ av_cold void ff_float_dsp_init_ppc(AVFloatDSPContext *fdsp, int bit_exact)
if
(
!
bit_exact
)
{
fdsp
->
vector_fmul_window
=
ff_vector_fmul_window_altivec
;
}
#endif
}
libswscale/utils.c
View file @
f61bece6
...
...
@@ -45,6 +45,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
#include "libavutil/ppc/cpu.h"
#include "libavutil/x86/asm.h"
#include "libavutil/x86/cpu.h"
#include "rgb2rgb.h"
...
...
@@ -492,7 +493,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
minFilterSize
=
min
;
}
if
(
HAVE_ALTIVEC
&&
cpu_flags
&
AV_CPU_FLAG_ALTIVEC
)
{
if
(
PPC_ALTIVEC
(
cpu_flags
)
)
{
// we can handle the special case 4, so we don't want to go the full 8
if
(
minFilterSize
<
5
)
filterAlign
=
4
;
...
...
@@ -805,7 +806,7 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4],
contrast
,
saturation
);
// FIXME factorize
if
(
HAVE_ALTIVEC
&&
av_get_cpu_flags
()
&
AV_CPU_FLAG_ALTIVEC
)
if
(
PPC_ALTIVEC
(
av_get_cpu_flags
())
)
ff_yuv2rgb_init_tables_altivec
(
c
,
inv_table
,
brightness
,
contrast
,
saturation
);
return
0
;
...
...
@@ -1121,8 +1122,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
{
const
int
filterAlign
=
(
HAVE_MMX
&&
cpu_flags
&
AV_CPU_FLAG_MMX
)
?
4
:
(
HAVE_ALTIVEC
&&
cpu_flags
&
AV_CPU_FLAG_ALTIVEC
)
?
8
:
1
;
PPC_ALTIVEC
(
cpu_flags
)
?
8
:
1
;
if
(
initFilter
(
&
c
->
hLumFilter
,
&
c
->
hLumFilterPos
,
&
c
->
hLumFilterSize
,
c
->
lumXInc
,
...
...
@@ -1145,8 +1145,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
{
const
int
filterAlign
=
(
HAVE_MMX
&&
cpu_flags
&
AV_CPU_FLAG_MMX
)
?
2
:
(
HAVE_ALTIVEC
&&
cpu_flags
&
AV_CPU_FLAG_ALTIVEC
)
?
8
:
1
;
PPC_ALTIVEC
(
cpu_flags
)
?
8
:
1
;
if
(
initFilter
(
&
c
->
vLumFilter
,
&
c
->
vLumFilterPos
,
&
c
->
vLumFilterSize
,
c
->
lumYInc
,
srcH
,
dstH
,
filterAlign
,
(
1
<<
12
),
...
...
@@ -1283,7 +1282,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
av_log
(
c
,
AV_LOG_INFO
,
"using 3DNOW
\n
"
);
else
if
(
INLINE_MMX
(
cpu_flags
))
av_log
(
c
,
AV_LOG_INFO
,
"using MMX
\n
"
);
else
if
(
HAVE_ALTIVEC
&&
cpu_flags
&
AV_CPU_FLAG_ALTIVEC
)
else
if
(
PPC_ALTIVEC
(
cpu_flags
)
)
av_log
(
c
,
AV_LOG_INFO
,
"using AltiVec
\n
"
);
else
av_log
(
c
,
AV_LOG_INFO
,
"using C
\n
"
);
...
...
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