Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
ae27b70b
Commit
ae27b70b
authored
Dec 21, 2012
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alsdec: channel sorting
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
29707f5b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
+13
-3
alsdec.c
libavcodec/alsdec.c
+13
-3
No files found.
libavcodec/alsdec.c
View file @
ae27b70b
...
...
@@ -355,11 +355,16 @@ static av_cold int read_specific_config(ALSDecContext *ctx)
if
(
!
(
sconf
->
chan_pos
=
av_malloc
(
avctx
->
channels
*
sizeof
(
*
sconf
->
chan_pos
))))
return
AVERROR
(
ENOMEM
);
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
{
sconf
->
chan_pos
[
i
]
=
get_bits
(
&
gb
,
chan_pos_bits
);
if
(
sconf
->
chan_pos
[
i
]
>=
avctx
->
channels
)
{
av_log
(
avctx
,
AV_LOG_WARNING
,
"Invalid original channel position.
\n
"
);
sconf
->
chan_sort
=
0
;
break
;
}
}
align_get_bits
(
&
gb
);
// TODO: use this to actually do channel sorting
}
else
{
sconf
->
chan_sort
=
0
;
}
...
...
@@ -430,7 +435,6 @@ static int check_specific_config(ALSDecContext *ctx)
MISSING_ERR
(
sconf
->
floating
,
"Floating point decoding"
,
AVERROR_PATCHWELCOME
);
MISSING_ERR
(
sconf
->
rlslms
,
"Adaptive RLS-LMS prediction"
,
AVERROR_PATCHWELCOME
);
MISSING_ERR
(
sconf
->
chan_sort
,
"Channel sorting"
,
0
);
return
error
;
}
...
...
@@ -1480,9 +1484,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
{ \
int##bps##_t *dest = (int##bps##_t*)ctx->frame.data[0]; \
shift = bps - ctx->avctx->bits_per_raw_sample; \
if (!sconf->chan_sort) { \
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
for (c = 0; c < avctx->channels; c++) \
*dest++ = ctx->raw_samples[c][sample] << shift; \
} else { \
for (sample = 0; sample < ctx->cur_frame_length; sample++) \
for (c = 0; c < avctx->channels; c++) \
*dest++ = ctx->raw_samples[sconf->chan_pos[c]][sample] << shift; \
} \
}
if
(
ctx
->
avctx
->
bits_per_raw_sample
<=
16
)
{
...
...
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