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
689be85a
Commit
689be85a
authored
Mar 17, 2012
by
Ronald S. Bultje
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adpcm: convert adpcm_4xm to bytestream2.
parent
39505f42
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
adpcm.c
libavcodec/adpcm.c
+9
-5
No files found.
libavcodec/adpcm.c
View file @
689be85a
...
...
@@ -647,18 +647,22 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data,
break
;
case
CODEC_ID_ADPCM_4XM
:
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
c
->
status
[
i
].
predictor
=
(
int16_t
)
bytestream_get_le16
(
&
src
);
c
->
status
[
i
].
predictor
=
sign_extend
(
bytestream2_get_le16u
(
&
gb
),
16
);
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
{
c
->
status
[
i
].
step_index
=
(
int16_t
)
bytestream_get_le16
(
&
src
);
c
->
status
[
i
].
step_index
=
av_clip
(
c
->
status
[
i
].
step_index
,
0
,
88
);
c
->
status
[
i
].
step_index
=
sign_extend
(
bytestream2_get_le16u
(
&
gb
),
16
);
if
(
c
->
status
[
i
].
step_index
>
88u
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"ERROR: step_index[%d] = %i
\n
"
,
i
,
c
->
status
[
i
].
step_index
);
return
AVERROR_INVALIDDATA
;
}
}
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
{
samples
=
(
short
*
)
c
->
frame
.
data
[
0
]
+
i
;
cs
=
&
c
->
status
[
i
];
for
(
n
=
nb_samples
>>
1
;
n
>
0
;
n
--
,
src
++
)
{
uint8_t
v
=
*
src
;
for
(
n
=
nb_samples
>>
1
;
n
>
0
;
n
--
)
{
int
v
=
bytestream2_get_byteu
(
&
gb
)
;
*
samples
=
adpcm_ima_expand_nibble
(
cs
,
v
&
0x0F
,
4
);
samples
+=
avctx
->
channels
;
*
samples
=
adpcm_ima_expand_nibble
(
cs
,
v
>>
4
,
4
);
...
...
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