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
f7e8c87c
Commit
f7e8c87c
authored
Dec 24, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ra144: decode directly to the user-provided AVFrame
parent
cbeb3ed3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
9 deletions
+5
-9
ra144.h
libavcodec/ra144.h
+0
-1
ra144dec.c
libavcodec/ra144dec.c
+5
-8
No files found.
libavcodec/ra144.h
View file @
f7e8c87c
...
@@ -35,7 +35,6 @@
...
@@ -35,7 +35,6 @@
typedef
struct
RA144Context
{
typedef
struct
RA144Context
{
AVCodecContext
*
avctx
;
AVCodecContext
*
avctx
;
AVFrame
frame
;
LPCContext
lpc_ctx
;
LPCContext
lpc_ctx
;
AudioFrameQueue
afq
;
AudioFrameQueue
afq
;
int
last_frame
;
int
last_frame
;
...
...
libavcodec/ra144dec.c
View file @
f7e8c87c
...
@@ -43,9 +43,6 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
...
@@ -43,9 +43,6 @@ static av_cold int ra144_decode_init(AVCodecContext * avctx)
avctx
->
channel_layout
=
AV_CH_LAYOUT_MONO
;
avctx
->
channel_layout
=
AV_CH_LAYOUT_MONO
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
avctx
->
sample_fmt
=
AV_SAMPLE_FMT_S16
;
avcodec_get_frame_defaults
(
&
ractx
->
frame
);
avctx
->
coded_frame
=
&
ractx
->
frame
;
return
0
;
return
0
;
}
}
...
@@ -65,6 +62,7 @@ static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs,
...
@@ -65,6 +62,7 @@ static void do_output_subblock(RA144Context *ractx, const uint16_t *lpc_coefs,
static
int
ra144_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
static
int
ra144_decode_frame
(
AVCodecContext
*
avctx
,
void
*
data
,
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
int
*
got_frame_ptr
,
AVPacket
*
avpkt
)
{
{
AVFrame
*
frame
=
data
;
const
uint8_t
*
buf
=
avpkt
->
data
;
const
uint8_t
*
buf
=
avpkt
->
data
;
int
buf_size
=
avpkt
->
size
;
int
buf_size
=
avpkt
->
size
;
static
const
uint8_t
sizes
[
LPC_ORDER
]
=
{
6
,
5
,
5
,
4
,
4
,
3
,
3
,
3
,
3
,
2
};
static
const
uint8_t
sizes
[
LPC_ORDER
]
=
{
6
,
5
,
5
,
4
,
4
,
3
,
3
,
3
,
3
,
2
};
...
@@ -80,12 +78,12 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
...
@@ -80,12 +78,12 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
GetBitContext
gb
;
GetBitContext
gb
;
/* get output buffer */
/* get output buffer */
ractx
->
frame
.
nb_samples
=
NBLOCKS
*
BLOCKSIZE
;
frame
->
nb_samples
=
NBLOCKS
*
BLOCKSIZE
;
if
((
ret
=
ff_get_buffer
(
avctx
,
&
ractx
->
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
;
}
}
samples
=
(
int16_t
*
)
ractx
->
frame
.
data
[
0
];
samples
=
(
int16_t
*
)
frame
->
data
[
0
];
if
(
buf_size
<
FRAMESIZE
)
{
if
(
buf_size
<
FRAMESIZE
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
av_log
(
avctx
,
AV_LOG_ERROR
,
...
@@ -124,8 +122,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
...
@@ -124,8 +122,7 @@ static int ra144_decode_frame(AVCodecContext * avctx, void *data,
FFSWAP
(
unsigned
int
*
,
ractx
->
lpc_coef
[
0
],
ractx
->
lpc_coef
[
1
]);
FFSWAP
(
unsigned
int
*
,
ractx
->
lpc_coef
[
0
],
ractx
->
lpc_coef
[
1
]);
*
got_frame_ptr
=
1
;
*
got_frame_ptr
=
1
;
*
(
AVFrame
*
)
data
=
ractx
->
frame
;
return
FRAMESIZE
;
return
FRAMESIZE
;
}
}
...
...
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