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
14165fe1
Commit
14165fe1
authored
Dec 16, 2011
by
Hendrik Leppkes
Committed by
Justin Ruggles
Jan 02, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wavpack: determine sample_fmt before requesting a buffer
Signed-off-by:
Justin Ruggles
<
justin.ruggles@gmail.com
>
parent
8893fbdf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
13 deletions
+18
-13
wavpack.c
libavcodec/wavpack.c
+18
-13
No files found.
libavcodec/wavpack.c
View file @
14165fe1
...
...
@@ -783,13 +783,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s
->
samples
=
wc
->
samples
;
}
s
->
frame_flags
=
AV_RL32
(
buf
);
buf
+=
4
;
if
(
s
->
frame_flags
&
0x80
){
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_FLT
;
}
else
if
((
s
->
frame_flags
&
0x03
)
<=
1
){
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
}
else
{
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S32
;
}
bpp
=
av_get_bytes_per_sample
(
avctx
->
sample_fmt
);
samples
=
(
uint8_t
*
)
samples
+
bpp
*
wc
->
ch_offset
;
...
...
@@ -1147,7 +1140,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
WavpackContext
*
s
=
avctx
->
priv_data
;
const
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
int
frame_size
,
ret
;
int
frame_size
,
ret
,
frame_flags
;
int
samplecount
=
0
;
s
->
block
=
0
;
...
...
@@ -1155,12 +1148,16 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
/* determine number of samples */
if
(
s
->
mkv_mode
){
s
->
samples
=
AV_RL32
(
buf
);
buf
+=
4
;
s
->
samples
=
AV_RL32
(
buf
);
buf
+=
4
;
frame_flags
=
AV_RL32
(
buf
);
}
else
{
if
(
s
->
multichannel
)
s
->
samples
=
AV_RL32
(
buf
+
4
);
else
s
->
samples
=
AV_RL32
(
buf
);
if
(
s
->
multichannel
)
{
s
->
samples
=
AV_RL32
(
buf
+
4
);
frame_flags
=
AV_RL32
(
buf
+
8
);
}
else
{
s
->
samples
=
AV_RL32
(
buf
);
frame_flags
=
AV_RL32
(
buf
+
4
);
}
}
if
(
s
->
samples
<=
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Invalid number of samples: %d
\n
"
,
...
...
@@ -1168,6 +1165,14 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
return
AVERROR
(
EINVAL
);
}
if
(
frame_flags
&
0x80
)
{
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_FLT
;
}
else
if
((
frame_flags
&
0x03
)
<=
1
)
{
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
}
else
{
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S32
;
}
/* get output buffer */
s
->
frame
.
nb_samples
=
s
->
samples
;
if
((
ret
=
avctx
->
get_buffer
(
avctx
,
&
s
->
frame
))
<
0
)
{
...
...
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