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
f2408ec9
Commit
f2408ec9
authored
Feb 18, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give IDCT matrix transpose macro a more descriptive name
This also avoids a macro name clash and related warning on ARM.
parent
291e49d4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
17 deletions
+17
-17
h264.c
libavcodec/h264.c
+10
-10
vp3.c
libavcodec/vp3.c
+4
-4
vp56.c
libavcodec/vp56.c
+3
-3
No files found.
libavcodec/h264.c
View file @
f2408ec9
...
...
@@ -2904,18 +2904,18 @@ static void init_scan_tables(H264Context *h)
{
int
i
;
for
(
i
=
0
;
i
<
16
;
i
++
)
{
#define T(x) (x >> 2) | ((x << 2) & 0xF)
h
->
zigzag_scan
[
i
]
=
T
(
zigzag_scan
[
i
]);
h
->
field_scan
[
i
]
=
T
(
field_scan
[
i
]);
#undef T
#define T
RANSPOSE
(x) (x >> 2) | ((x << 2) & 0xF)
h
->
zigzag_scan
[
i
]
=
T
RANSPOSE
(
zigzag_scan
[
i
]);
h
->
field_scan
[
i
]
=
T
RANSPOSE
(
field_scan
[
i
]);
#undef T
RANSPOSE
}
for
(
i
=
0
;
i
<
64
;
i
++
)
{
#define T(x) (x >> 3) | ((x & 7) << 3)
h
->
zigzag_scan8x8
[
i
]
=
T
(
ff_zigzag_direct
[
i
]);
h
->
zigzag_scan8x8_cavlc
[
i
]
=
T
(
zigzag_scan8x8_cavlc
[
i
]);
h
->
field_scan8x8
[
i
]
=
T
(
field_scan8x8
[
i
]);
h
->
field_scan8x8_cavlc
[
i
]
=
T
(
field_scan8x8_cavlc
[
i
]);
#undef T
#define T
RANSPOSE
(x) (x >> 3) | ((x & 7) << 3)
h
->
zigzag_scan8x8
[
i
]
=
T
RANSPOSE
(
ff_zigzag_direct
[
i
]);
h
->
zigzag_scan8x8_cavlc
[
i
]
=
T
RANSPOSE
(
zigzag_scan8x8_cavlc
[
i
]);
h
->
field_scan8x8
[
i
]
=
T
RANSPOSE
(
field_scan8x8
[
i
]);
h
->
field_scan8x8_cavlc
[
i
]
=
T
RANSPOSE
(
field_scan8x8_cavlc
[
i
]);
#undef T
RANSPOSE
}
if
(
h
->
sps
.
transform_bypass
)
{
// FIXME same ugly
h
->
zigzag_scan_q0
=
zigzag_scan
;
...
...
libavcodec/vp3.c
View file @
f2408ec9
...
...
@@ -1705,10 +1705,10 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx)
ff_vp3dsp_init
(
&
s
->
vp3dsp
,
avctx
->
flags
);
for
(
i
=
0
;
i
<
64
;
i
++
)
{
#define T(x) (x >> 3) | ((x & 7) << 3)
s
->
idct_permutation
[
i
]
=
T
(
i
);
s
->
idct_scantable
[
i
]
=
T
(
ff_zigzag_direct
[
i
]);
#undef T
#define T
RANSPOSE
(x) (x >> 3) | ((x & 7) << 3)
s
->
idct_permutation
[
i
]
=
T
RANSPOSE
(
i
);
s
->
idct_scantable
[
i
]
=
TRANSPOSE
(
ff_zigzag_direct
[
i
]);
#undef T
RANSPOSE
}
/* initialize to an impossible value which will force a recalculation
...
...
libavcodec/vp56.c
View file @
f2408ec9
...
...
@@ -664,9 +664,9 @@ av_cold int ff_vp56_init(AVCodecContext *avctx, int flip, int has_alpha)
ff_vp3dsp_init
(
&
s
->
vp3dsp
,
avctx
->
flags
);
ff_vp56dsp_init
(
&
s
->
vp56dsp
,
avctx
->
codec
->
id
);
for
(
i
=
0
;
i
<
64
;
i
++
)
{
#define T(x) (x >> 3) | ((x & 7) << 3)
s
->
idct_scantable
[
i
]
=
T
(
ff_zigzag_direct
[
i
]);
#undef T
#define T
RANSPOSE
(x) (x >> 3) | ((x & 7) << 3)
s
->
idct_scantable
[
i
]
=
T
RANSPOSE
(
ff_zigzag_direct
[
i
]);
#undef T
RANSPOSE
}
for
(
i
=
0
;
i
<
FF_ARRAY_ELEMS
(
s
->
frames
);
i
++
)
{
...
...
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