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
e8e733ad
Commit
e8e733ad
authored
Jun 29, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dca: favor native over ffmpeg in table name
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
4fd07b93
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
dca.c
libavcodec/dca.c
+3
-3
No files found.
libavcodec/dca.c
View file @
e8e733ad
...
...
@@ -126,7 +126,7 @@ enum DCAXxchSpeakerMask {
DCA_XXCH_REAR_LOW_RIGHT
=
0x8000000
,
};
static
const
uint32_t
map_xxch_to_
ffmpeg
[
28
]
=
{
static
const
uint32_t
map_xxch_to_
native
[
28
]
=
{
AV_CH_FRONT_CENTER
,
AV_CH_FRONT_LEFT
,
AV_CH_FRONT_RIGHT
,
...
...
@@ -2272,7 +2272,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
channel_layout
=
0
;
for
(
i
=
0
;
i
<
s
->
xxch_nbits_spk_mask
;
++
i
)
{
if
(
channel_mask
&
(
1
<<
i
))
{
channel_layout
|=
map_xxch_to_
ffmpeg
[
i
];
channel_layout
|=
map_xxch_to_
native
[
i
];
}
}
...
...
@@ -2293,7 +2293,7 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
:
s
->
xxch_core_spkmask
;
for
(
i
=
0
;
i
<
s
->
xxch_nbits_spk_mask
;
i
++
)
{
if
(
mask
&
~
(
DCA_XXCH_LFE1
|
DCA_XXCH_LFE2
)
&
(
1
<<
i
))
{
lavc
=
map_xxch_to_
ffmpeg
[
i
];
lavc
=
map_xxch_to_
native
[
i
];
posn
=
av_popcount
(
channel_layout
&
(
lavc
-
1
));
s
->
xxch_order_tab
[
j
++
]
=
posn
;
}
...
...
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