oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/mp4ff: move mp4ff_callback_t into mp4ff_input_stream 

Allocate only one item on the stack.
This commit is contained in:
Max Kellermann 2010-05-31 09:23:27 +02:00
parent 1b2fc2ae19
commit 1729a0b437
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/decoder/mp4ff_decoder_plugin.c
View File

@ -37,6 +37,8 @@
/* all code here is either based on or copied from FAAD2's frontend code */ /* all code here is either based on or copied from FAAD2's frontend code */
struct mp4ff_input_stream { struct mp4ff_input_stream {
mp4ff_callback_t callback;
struct decoder *decoder; struct decoder *decoder;
struct input_stream *input_stream; struct input_stream *input_stream;
}; };
@ -104,6 +106,11 @@ mp4_seek(void *user_data, uint64_t position)
? 0 : -1; ? 0 : -1;
} }
static const mp4ff_callback_t mpd_mp4ff_callback = {
.read = mp4_read,
.seek = mp4_seek,
};
static faacDecHandle static faacDecHandle
mp4_faad_new(mp4ff_t *mp4fh, int *track_r, struct audio_format *audio_format) mp4_faad_new(mp4ff_t *mp4fh, int *track_r, struct audio_format *audio_format)
{ {
@ -151,14 +158,10 @@ static void
mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream) mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
{ {
struct mp4ff_input_stream mis = { struct mp4ff_input_stream mis = {
.callback = mpd_mp4ff_callback,
.decoder = mpd_decoder, .decoder = mpd_decoder,
.input_stream = input_stream, .input_stream = input_stream,
}; };
mp4ff_callback_t callback = {
.read = mp4_read,
.seek = mp4_seek,
.user_data = &mis,
};
mp4ff_t *mp4fh; mp4ff_t *mp4fh;
int32_t track; int32_t track;
float file_time, total_time; float file_time, total_time;
@ -184,7 +187,9 @@ mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
double seek_where = 0; double seek_where = 0;
enum decoder_command cmd = DECODE_COMMAND_NONE; enum decoder_command cmd = DECODE_COMMAND_NONE;
mp4fh = mp4ff_open_read(&callback); mis.callback.user_data = &mis;
mp4fh = mp4ff_open_read(&mis.callback);
if (!mp4fh) { if (!mp4fh) {
g_warning("Input does not appear to be a mp4 stream.\n"); g_warning("Input does not appear to be a mp4 stream.\n");
return; return;
@ -357,21 +362,19 @@ mp4_stream_tag(struct input_stream *is)
{ {
struct tag *ret = NULL; struct tag *ret = NULL;
struct mp4ff_input_stream mis = { struct mp4ff_input_stream mis = {
.callback = mpd_mp4ff_callback,
.decoder = NULL, .decoder = NULL,
.input_stream = is, .input_stream = is,
}; };
mp4ff_callback_t callback = {
.read = mp4_read,
.seek = mp4_seek,
.user_data = &mis,
};
mp4ff_t *mp4fh; mp4ff_t *mp4fh;
int32_t track; int32_t track;
int32_t file_time; int32_t file_time;
int32_t scale; int32_t scale;
int i; int i;
mp4fh = mp4ff_open_read(&callback); mis.callback.user_data = &mis;
mp4fh = mp4ff_open_read(&mis.callback);
if (mp4fh == NULL) if (mp4fh == NULL)
return NULL; return NULL;