git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7b78321
)
dca: decode directly to the user-provided AVFrame
author
Justin Ruggles
<justin.ruggles@gmail.com>
Sun, 23 Dec 2012 22:43:47 +0000
(17:43 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Tue, 12 Feb 2013 17:21:22 +0000
(12:21 -0500)
libavcodec/dcadec.c
patch
|
blob
|
history
diff --git
a/libavcodec/dcadec.c
b/libavcodec/dcadec.c
index
ab27575
..
96f1ee2
100644
(file)
--- a/
libavcodec/dcadec.c
+++ b/
libavcodec/dcadec.c
@@
-285,7
+285,6
@@
static av_always_inline int get_bitalloc(GetBitContext *gb, BitAlloc *ba,
typedef struct {
AVCodecContext *avctx;
typedef struct {
AVCodecContext *avctx;
- AVFrame frame;
/* Frame header */
int frame_type; ///< type of the current frame
int samples_deficit; ///< deficit sample count
/* Frame header */
int frame_type; ///< type of the current frame
int samples_deficit; ///< deficit sample count
@@
-1653,6
+1652,7
@@
static void dca_exss_parse_header(DCAContext *s)
static int dca_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
static int dca_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;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
@@
-1835,17
+1835,17
@@
static int dca_decode_frame(AVCodecContext *avctx, void *data,
avctx->channels = channels;
/* get output buffer */
avctx->channels = channels;
/* get output buffer */
-
s->frame.
nb_samples = 256 * (s->sample_blocks / 8);
- if ((ret = ff_get_buffer(avctx,
&s->
frame)) < 0) {
+
frame->
nb_samples = 256 * (s->sample_blocks / 8);
+ if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
- samples_flt = (float
**) s->frame.
extended_data;
+ samples_flt = (float
**)frame->
extended_data;
/* allocate buffer for extra channels if downmixing */
if (avctx->channels < full_channels) {
ret = av_samples_get_buffer_size(NULL, full_channels - channels,
/* allocate buffer for extra channels if downmixing */
if (avctx->channels < full_channels) {
ret = av_samples_get_buffer_size(NULL, full_channels - channels,
-
s->frame.
nb_samples,
+
frame->
nb_samples,
avctx->sample_fmt, 0);
if (ret < 0)
return ret;
avctx->sample_fmt, 0);
if (ret < 0)
return ret;
@@
-1858,7
+1858,7
@@
static int dca_decode_frame(AVCodecContext *avctx, void *data,
ret = av_samples_fill_arrays((uint8_t **)s->extra_channels, NULL,
s->extra_channels_buffer,
full_channels - channels,
ret = av_samples_fill_arrays((uint8_t **)s->extra_channels, NULL,
s->extra_channels_buffer,
full_channels - channels,
-
s->frame.
nb_samples, avctx->sample_fmt, 0);
+
frame->
nb_samples, avctx->sample_fmt, 0);
if (ret < 0)
return ret;
}
if (ret < 0)
return ret;
}
@@
-1890,8
+1890,7
@@
static int dca_decode_frame(AVCodecContext *avctx, void *data,
for (i = 0; i < 2 * s->lfe * 4; i++)
s->lfe_data[i] = s->lfe_data[i + lfe_samples];
for (i = 0; i < 2 * s->lfe * 4; i++)
s->lfe_data[i] = s->lfe_data[i + lfe_samples];
- *got_frame_ptr = 1;
- *(AVFrame *) data = s->frame;
+ *got_frame_ptr = 1;
return buf_size;
}
return buf_size;
}
@@
-1925,9
+1924,6
@@
static av_cold int dca_decode_init(AVCodecContext *avctx)
avctx->channels = avctx->request_channels;
}
avctx->channels = avctx->request_channels;
}
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
-
return 0;
}
return 0;
}