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
6fdfdb23
Commit
6fdfdb23
authored
Dec 23, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gsm: decode directly to the user-provided AVFrame
parent
cb7b47a6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
gsmdec.c
libavcodec/gsmdec.c
+5
-11
gsmdec_data.h
libavcodec/gsmdec_data.h
+0
-1
No files found.
libavcodec/gsmdec.c
View file @
6fdfdb23
...
...
@@ -34,8 +34,6 @@
static
av_cold
int
gsm_init
(
AVCodecContext
*
avctx
)
{
GSMContext
*
s
=
avctx
->
priv_data
;
avctx
->
channels
=
1
;
avctx
->
channel_layout
=
AV_CH_LAYOUT_MONO
;
avctx
->
sample_rate
=
8000
;
...
...
@@ -51,16 +49,13 @@ static av_cold int gsm_init(AVCodecContext *avctx)
avctx
->
block_align
=
GSM_MS_BLOCK_SIZE
;
}
avcodec_get_frame_defaults
(
&
s
->
frame
);
avctx
->
coded_frame
=
&
s
->
frame
;
return
0
;
}
static
int
gsm_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
GSMContext
*
s
=
avctx
->
priv_
data
;
AVFrame
*
frame
=
data
;
int
res
;
GetBitContext
gb
;
const
uint8_t
*
buf
=
avpkt
->
data
;
...
...
@@ -73,12 +68,12 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data,
}
/* get output buffer */
s
->
frame
.
nb_samples
=
avctx
->
frame_size
;
if
((
res
=
ff_get_buffer
(
avctx
,
&
s
->
frame
))
<
0
)
{
frame
->
nb_samples
=
avctx
->
frame_size
;
if
((
res
=
ff_get_buffer
(
avctx
,
frame
))
<
0
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"get_buffer() failed
\n
"
);
return
res
;
}
samples
=
(
int16_t
*
)
s
->
frame
.
data
[
0
];
samples
=
(
int16_t
*
)
frame
->
data
[
0
];
switch
(
avctx
->
codec_id
)
{
case
AV_CODEC_ID_GSM
:
...
...
@@ -95,8 +90,7 @@ static int gsm_decode_frame(AVCodecContext *avctx, void *data,
return
res
;
}
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
s
->
frame
;
*
got_frame_ptr
=
1
;
return
avctx
->
block_align
;
}
...
...
libavcodec/gsmdec_data.h
View file @
6fdfdb23
...
...
@@ -26,7 +26,6 @@
#include "avcodec.h"
typedef
struct
GSMContext
{
AVFrame
frame
;
// Contains first 120 elements from the previous frame
// (used by long_term_synth according to the "lag"),
// then in the following 160 elements the current
...
...
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