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
cddf8998
Commit
cddf8998
authored
Dec 23, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comfortnoise: decode directly to the user-provided AVFrame
parent
e42e5a89
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
9 deletions
+5
-9
cngdec.c
libavcodec/cngdec.c
+5
-9
No files found.
libavcodec/cngdec.c
View file @
cddf8998
...
@@ -28,7 +28,6 @@
...
@@ -28,7 +28,6 @@
#include "libavutil/lfg.h"
#include "libavutil/lfg.h"
typedef
struct
CNGContext
{
typedef
struct
CNGContext
{
AVFrame
avframe
;
float
*
refl_coef
,
*
target_refl_coef
;
float
*
refl_coef
,
*
target_refl_coef
;
float
*
lpc_coef
;
float
*
lpc_coef
;
int
order
;
int
order
;
...
@@ -58,8 +57,6 @@ static av_cold int cng_decode_init(AVCodecContext *avctx)
...
@@ -58,8 +57,6 @@ static av_cold int cng_decode_init(AVCodecContext *avctx)
avctx
->
channels
=
1
;
avctx
->
channels
=
1
;
avctx
->
sample_rate
=
8000
;
avctx
->
sample_rate
=
8000
;
avcodec_get_frame_defaults
(
&
p
->
avframe
);
avctx
->
coded_frame
=
&
p
->
avframe
;
p
->
order
=
12
;
p
->
order
=
12
;
avctx
->
frame_size
=
640
;
avctx
->
frame_size
=
640
;
p
->
refl_coef
=
av_mallocz
(
p
->
order
*
sizeof
(
*
p
->
refl_coef
));
p
->
refl_coef
=
av_mallocz
(
p
->
order
*
sizeof
(
*
p
->
refl_coef
));
...
@@ -105,7 +102,7 @@ static void cng_decode_flush(AVCodecContext *avctx)
...
@@ -105,7 +102,7 @@ static void cng_decode_flush(AVCodecContext *avctx)
static
int
cng_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
static
int
cng_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
{
AVFrame
*
frame
=
data
;
CNGContext
*
p
=
avctx
->
priv_data
;
CNGContext
*
p
=
avctx
->
priv_data
;
int
buf_size
=
avpkt
->
size
;
int
buf_size
=
avpkt
->
size
;
int
ret
,
i
;
int
ret
,
i
;
...
@@ -144,19 +141,18 @@ static int cng_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -144,19 +141,18 @@ static int cng_decode_frame(AVCodecContext *avctx, void *data,
ff_celp_lp_synthesis_filterf
(
p
->
filter_out
+
p
->
order
,
p
->
lpc_coef
,
ff_celp_lp_synthesis_filterf
(
p
->
filter_out
+
p
->
order
,
p
->
lpc_coef
,
p
->
excitation
,
avctx
->
frame_size
,
p
->
order
);
p
->
excitation
,
avctx
->
frame_size
,
p
->
order
);
p
->
avframe
.
nb_samples
=
avctx
->
frame_size
;
frame
->
nb_samples
=
avctx
->
frame_size
;
if
((
ret
=
ff_get_buffer
(
avctx
,
&
p
->
av
frame
))
<
0
)
{
if
((
ret
=
ff_get_buffer
(
avctx
,
frame
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
ret
;
return
ret
;
}
}
buf_out
=
(
int16_t
*
)
p
->
avframe
.
data
[
0
];
buf_out
=
(
int16_t
*
)
frame
->
data
[
0
];
for
(
i
=
0
;
i
<
avctx
->
frame_size
;
i
++
)
for
(
i
=
0
;
i
<
avctx
->
frame_size
;
i
++
)
buf_out
[
i
]
=
p
->
filter_out
[
i
+
p
->
order
];
buf_out
[
i
]
=
p
->
filter_out
[
i
+
p
->
order
];
memcpy
(
p
->
filter_out
,
p
->
filter_out
+
avctx
->
frame_size
,
memcpy
(
p
->
filter_out
,
p
->
filter_out
+
avctx
->
frame_size
,
p
->
order
*
sizeof
(
*
p
->
filter_out
));
p
->
order
*
sizeof
(
*
p
->
filter_out
));
*
got_frame_ptr
=
1
;
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
p
->
avframe
;
return
buf_size
;
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