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
8b0dd494
Commit
8b0dd494
authored
Jul 18, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
idctdsp: prettyprinting cosmetics
parent
b4987f72
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
50 additions
and
50 deletions
+50
-50
idctdsp_init_arm.c
libavcodec/arm/idctdsp_init_arm.c
+8
-8
idctdsp_init_armv5te.c
libavcodec/arm/idctdsp_init_armv5te.c
+4
-4
idctdsp_init_armv6.c
libavcodec/arm/idctdsp_init_armv6.c
+4
-4
idctdsp_init_neon.c
libavcodec/arm/idctdsp_init_neon.c
+4
-4
idctdsp.c
libavcodec/idctdsp.c
+16
-16
idctdsp.c
libavcodec/ppc/idctdsp.c
+3
-3
idctdsp_init.c
libavcodec/x86/idctdsp_init.c
+11
-11
No files found.
libavcodec/arm/idctdsp_init_arm.c
View file @
8b0dd494
...
@@ -75,15 +75,15 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -75,15 +75,15 @@ av_cold void ff_idctdsp_init_arm(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
!
high_bit_depth
)
{
if
(
!
high_bit_depth
)
{
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
avctx
->
idct_algo
==
FF_IDCT_ARM
)
{
avctx
->
idct_algo
==
FF_IDCT_ARM
)
{
c
->
idct_put
=
j_rev_dct_arm_put
;
c
->
idct_put
=
j_rev_dct_arm_put
;
c
->
idct_add
=
j_rev_dct_arm_add
;
c
->
idct_add
=
j_rev_dct_arm_add
;
c
->
idct
=
ff_j_rev_dct_arm
;
c
->
idct
=
ff_j_rev_dct_arm
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
}
else
if
(
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARM
)
{
}
else
if
(
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARM
)
{
c
->
idct_put
=
simple_idct_arm_put
;
c
->
idct_put
=
simple_idct_arm_put
;
c
->
idct_add
=
simple_idct_arm_add
;
c
->
idct_add
=
simple_idct_arm_add
;
c
->
idct
=
ff_simple_idct_arm
;
c
->
idct
=
ff_simple_idct_arm
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
}
}
}
}
...
...
libavcodec/arm/idctdsp_init_armv5te.c
View file @
8b0dd494
...
@@ -35,9 +35,9 @@ av_cold void ff_idctdsp_init_armv5te(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -35,9 +35,9 @@ av_cold void ff_idctdsp_init_armv5te(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
!
high_bit_depth
&&
if
(
!
high_bit_depth
&&
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARMV5TE
))
{
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARMV5TE
))
{
c
->
idct_put
=
ff_simple_idct_put_armv5te
;
c
->
idct_put
=
ff_simple_idct_put_armv5te
;
c
->
idct_add
=
ff_simple_idct_add_armv5te
;
c
->
idct_add
=
ff_simple_idct_add_armv5te
;
c
->
idct
=
ff_simple_idct_armv5te
;
c
->
idct
=
ff_simple_idct_armv5te
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
}
}
}
}
libavcodec/arm/idctdsp_init_armv6.c
View file @
8b0dd494
...
@@ -38,10 +38,10 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -38,10 +38,10 @@ av_cold void ff_idctdsp_init_armv6(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
!
high_bit_depth
)
{
if
(
!
high_bit_depth
)
{
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARMV6
)
{
avctx
->
idct_algo
==
FF_IDCT_SIMPLEARMV6
)
{
c
->
idct_put
=
ff_simple_idct_put_armv6
;
c
->
idct_put
=
ff_simple_idct_put_armv6
;
c
->
idct_add
=
ff_simple_idct_add_armv6
;
c
->
idct_add
=
ff_simple_idct_add_armv6
;
c
->
idct
=
ff_simple_idct_armv6
;
c
->
idct
=
ff_simple_idct_armv6
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
}
}
}
}
c
->
add_pixels_clamped
=
ff_add_pixels_clamped_armv6
;
c
->
add_pixels_clamped
=
ff_add_pixels_clamped_armv6
;
...
...
libavcodec/arm/idctdsp_init_neon.c
View file @
8b0dd494
...
@@ -40,10 +40,10 @@ av_cold void ff_idctdsp_init_neon(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -40,10 +40,10 @@ av_cold void ff_idctdsp_init_neon(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
!
high_bit_depth
)
{
if
(
!
high_bit_depth
)
{
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
||
avctx
->
idct_algo
==
FF_IDCT_SIMPLENEON
)
{
avctx
->
idct_algo
==
FF_IDCT_SIMPLENEON
)
{
c
->
idct_put
=
ff_simple_idct_put_neon
;
c
->
idct_put
=
ff_simple_idct_put_neon
;
c
->
idct_add
=
ff_simple_idct_add_neon
;
c
->
idct_add
=
ff_simple_idct_add_neon
;
c
->
idct
=
ff_simple_idct_neon
;
c
->
idct
=
ff_simple_idct_neon
;
c
->
perm_type
=
FF_IDCT_PERM_PARTTRANS
;
c
->
perm_type
=
FF_IDCT_PERM_PARTTRANS
;
}
}
}
}
...
...
libavcodec/idctdsp.c
View file @
8b0dd494
...
@@ -158,26 +158,26 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
...
@@ -158,26 +158,26 @@ av_cold void ff_idctdsp_init(IDCTDSPContext *c, AVCodecContext *avctx)
const
unsigned
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
const
unsigned
high_bit_depth
=
avctx
->
bits_per_raw_sample
>
8
;
if
(
avctx
->
bits_per_raw_sample
==
10
)
{
if
(
avctx
->
bits_per_raw_sample
==
10
)
{
c
->
idct_put
=
ff_simple_idct_put_10
;
c
->
idct_put
=
ff_simple_idct_put_10
;
c
->
idct_add
=
ff_simple_idct_add_10
;
c
->
idct_add
=
ff_simple_idct_add_10
;
c
->
idct
=
ff_simple_idct_10
;
c
->
idct
=
ff_simple_idct_10
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
}
else
{
}
else
{
if
(
avctx
->
idct_algo
==
FF_IDCT_INT
)
{
if
(
avctx
->
idct_algo
==
FF_IDCT_INT
)
{
c
->
idct_put
=
jref_idct_put
;
c
->
idct_put
=
jref_idct_put
;
c
->
idct_add
=
jref_idct_add
;
c
->
idct_add
=
jref_idct_add
;
c
->
idct
=
ff_j_rev_dct
;
c
->
idct
=
ff_j_rev_dct
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
c
->
perm_type
=
FF_IDCT_PERM_LIBMPEG2
;
}
else
if
(
avctx
->
idct_algo
==
FF_IDCT_FAAN
)
{
}
else
if
(
avctx
->
idct_algo
==
FF_IDCT_FAAN
)
{
c
->
idct_put
=
ff_faanidct_put
;
c
->
idct_put
=
ff_faanidct_put
;
c
->
idct_add
=
ff_faanidct_add
;
c
->
idct_add
=
ff_faanidct_add
;
c
->
idct
=
ff_faanidct
;
c
->
idct
=
ff_faanidct
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
}
else
{
// accurate/default
}
else
{
// accurate/default
c
->
idct_put
=
ff_simple_idct_put_8
;
c
->
idct_put
=
ff_simple_idct_put_8
;
c
->
idct_add
=
ff_simple_idct_add_8
;
c
->
idct_add
=
ff_simple_idct_add_8
;
c
->
idct
=
ff_simple_idct_8
;
c
->
idct
=
ff_simple_idct_8
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
c
->
perm_type
=
FF_IDCT_PERM_NONE
;
}
}
}
}
...
...
libavcodec/ppc/idctdsp.c
View file @
8b0dd494
...
@@ -235,9 +235,9 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -235,9 +235,9 @@ av_cold void ff_idctdsp_init_ppc(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
!
high_bit_depth
)
{
if
(
!
high_bit_depth
)
{
if
((
avctx
->
idct_algo
==
FF_IDCT_AUTO
)
||
if
((
avctx
->
idct_algo
==
FF_IDCT_AUTO
)
||
(
avctx
->
idct_algo
==
FF_IDCT_ALTIVEC
))
{
(
avctx
->
idct_algo
==
FF_IDCT_ALTIVEC
))
{
c
->
idct_add
=
idct_add_altivec
;
c
->
idct_add
=
idct_add_altivec
;
c
->
idct_put
=
idct_put_altivec
;
c
->
idct_put
=
idct_put_altivec
;
c
->
perm_type
=
FF_IDCT_PERM_TRANSPOSE
;
c
->
perm_type
=
FF_IDCT_PERM_TRANSPOSE
;
}
}
}
}
}
}
...
...
libavcodec/x86/idctdsp_init.c
View file @
8b0dd494
...
@@ -73,15 +73,15 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -73,15 +73,15 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
switch
(
avctx
->
idct_algo
)
{
switch
(
avctx
->
idct_algo
)
{
case
FF_IDCT_AUTO
:
case
FF_IDCT_AUTO
:
case
FF_IDCT_SIMPLEMMX
:
case
FF_IDCT_SIMPLEMMX
:
c
->
idct_put
=
ff_simple_idct_put_mmx
;
c
->
idct_put
=
ff_simple_idct_put_mmx
;
c
->
idct_add
=
ff_simple_idct_add_mmx
;
c
->
idct_add
=
ff_simple_idct_add_mmx
;
c
->
idct
=
ff_simple_idct_mmx
;
c
->
idct
=
ff_simple_idct_mmx
;
c
->
perm_type
=
FF_IDCT_PERM_SIMPLE
;
c
->
perm_type
=
FF_IDCT_PERM_SIMPLE
;
break
;
break
;
case
FF_IDCT_XVIDMMX
:
case
FF_IDCT_XVIDMMX
:
c
->
idct_put
=
ff_idct_xvid_mmx_put
;
c
->
idct_put
=
ff_idct_xvid_mmx_put
;
c
->
idct_add
=
ff_idct_xvid_mmx_add
;
c
->
idct_add
=
ff_idct_xvid_mmx_add
;
c
->
idct
=
ff_idct_xvid_mmx
;
c
->
idct
=
ff_idct_xvid_mmx
;
break
;
break
;
}
}
}
}
...
@@ -97,10 +97,10 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
...
@@ -97,10 +97,10 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx,
if
(
INLINE_SSE2
(
cpu_flags
))
{
if
(
INLINE_SSE2
(
cpu_flags
))
{
if
(
!
high_bit_depth
&&
avctx
->
idct_algo
==
FF_IDCT_XVIDMMX
)
{
if
(
!
high_bit_depth
&&
avctx
->
idct_algo
==
FF_IDCT_XVIDMMX
)
{
c
->
idct_put
=
ff_idct_xvid_sse2_put
;
c
->
idct_put
=
ff_idct_xvid_sse2_put
;
c
->
idct_add
=
ff_idct_xvid_sse2_add
;
c
->
idct_add
=
ff_idct_xvid_sse2_add
;
c
->
idct
=
ff_idct_xvid_sse2
;
c
->
idct
=
ff_idct_xvid_sse2
;
c
->
perm_type
=
FF_IDCT_PERM_SSE2
;
c
->
perm_type
=
FF_IDCT_PERM_SSE2
;
}
}
}
}
}
}
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