Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
036e9b04
Commit
036e9b04
authored
Dec 23, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
g722: decode directly to the user-provided AVFrame
parent
b8e9c99e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
g722.h
libavcodec/g722.h
+0
-1
g722dec.c
libavcodec/g722dec.c
+5
-8
No files found.
libavcodec/g722.h
View file @
036e9b04
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
typedef
struct
G722Context
{
typedef
struct
G722Context
{
const
AVClass
*
class
;
const
AVClass
*
class
;
AVFrame
frame
;
int
bits_per_codeword
;
int
bits_per_codeword
;
int16_t
prev_samples
[
PREV_SAMPLES_BUF_SIZE
];
///< memory of past decoded samples
int16_t
prev_samples
[
PREV_SAMPLES_BUF_SIZE
];
///< memory of past decoded samples
int
prev_samples_pos
;
///< the number of values in prev_samples
int
prev_samples_pos
;
///< the number of values in prev_samples
...
...
libavcodec/g722dec.c
View file @
036e9b04
...
@@ -67,9 +67,6 @@ static av_cold int g722_decode_init(AVCodecContext * avctx)
...
@@ -67,9 +67,6 @@ static av_cold int g722_decode_init(AVCodecContext * avctx)
c
->
band
[
1
].
scale_factor
=
2
;
c
->
band
[
1
].
scale_factor
=
2
;
c
->
prev_samples_pos
=
22
;
c
->
prev_samples_pos
=
22
;
avcodec_get_frame_defaults
(
&
c
->
frame
);
avctx
->
coded_frame
=
&
c
->
frame
;
return
0
;
return
0
;
}
}
...
@@ -88,6 +85,7 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -88,6 +85,7 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
{
G722Context
*
c
=
avctx
->
priv_data
;
G722Context
*
c
=
avctx
->
priv_data
;
AVFrame
*
frame
=
data
;
int16_t
*
out_buf
;
int16_t
*
out_buf
;
int
j
,
ret
;
int
j
,
ret
;
const
int
skip
=
8
-
c
->
bits_per_codeword
;
const
int
skip
=
8
-
c
->
bits_per_codeword
;
...
@@ -95,12 +93,12 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -95,12 +93,12 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
GetBitContext
gb
;
GetBitContext
gb
;
/* get output buffer */
/* get output buffer */
c
->
frame
.
nb_samples
=
avpkt
->
size
*
2
;
frame
->
nb_samples
=
avpkt
->
size
*
2
;
if
((
ret
=
ff_get_buffer
(
avctx
,
&
c
->
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
;
}
}
out_buf
=
(
int16_t
*
)
c
->
frame
.
data
[
0
];
out_buf
=
(
int16_t
*
)
frame
->
data
[
0
];
init_get_bits
(
&
gb
,
avpkt
->
data
,
avpkt
->
size
*
8
);
init_get_bits
(
&
gb
,
avpkt
->
data
,
avpkt
->
size
*
8
);
...
@@ -135,8 +133,7 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -135,8 +133,7 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
}
}
}
}
*
got_frame_ptr
=
1
;
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
c
->
frame
;
return
avpkt
->
size
;
return
avpkt
->
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