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
86bfcfcf
Commit
86bfcfcf
authored
Dec 24, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mace: decode directly to the user-provided AVFrame
parent
bed957bb
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
mace.c
libavcodec/mace.c
+5
-11
No files found.
libavcodec/mace.c
View file @
86bfcfcf
...
...
@@ -155,7 +155,6 @@ typedef struct ChannelData {
}
ChannelData
;
typedef
struct
MACEContext
{
AVFrame
frame
;
ChannelData
chd
[
2
];
}
MACEContext
;
...
...
@@ -227,21 +226,17 @@ static void chomp6(ChannelData *chd, int16_t *output, uint8_t val, int tab_idx)
static
av_cold
int
mace_decode_init
(
AVCodecContext
*
avctx
)
{
MACEContext
*
ctx
=
avctx
->
priv_data
;
if
(
avctx
->
channels
>
2
)
return
-
1
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16P
;
avcodec_get_frame_defaults
(
&
ctx
->
frame
);
avctx
->
coded_frame
=
&
ctx
->
frame
;
return
0
;
}
static
int
mace_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
AVFrame
*
frame
=
data
;
const
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
int16_t
**
samples
;
...
...
@@ -250,12 +245,12 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
int
is_mace3
=
(
avctx
->
codec_id
==
AV_CODEC_ID_MACE3
);
/* get output buffer */
ctx
->
frame
.
nb_samples
=
3
*
(
buf_size
<<
(
1
-
is_mace3
))
/
avctx
->
channels
;
if
((
ret
=
ff_get_buffer
(
avctx
,
&
ctx
->
frame
))
<
0
)
{
frame
->
nb_samples
=
3
*
(
buf_size
<<
(
1
-
is_mace3
))
/
avctx
->
channels
;
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
ret
;
}
samples
=
(
int16_t
**
)
ctx
->
frame
.
extended_data
;
samples
=
(
int16_t
**
)
frame
->
extended_data
;
for
(
i
=
0
;
i
<
avctx
->
channels
;
i
++
)
{
int16_t
*
output
=
samples
[
i
];
...
...
@@ -280,7 +275,6 @@ static int mace_decode_frame(AVCodecContext *avctx, void *data,
}
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
ctx
->
frame
;
return
buf_size
;
}
...
...
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