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

mp4: use decoder_read() instead of input_stream_read()

Browse Source 
decoder_read() handles decoder commands, and should be used in decoder
plugins.
This commit is contained in:
Max Kellermann 2008-11-04 17:05:02 +01:00
parent 9ecfc57c3a
commit 290347c482
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/decoder/mp4_plugin.c
View File

@ -29,6 +29,7 @@
/* 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 mp4_context { struct mp4_context {
struct decoder *decoder;
struct input_stream *input_stream; struct input_stream *input_stream;
}; };
@ -77,7 +78,7 @@ mp4_read(void *user_data, void *buffer, uint32_t length)
{ {
struct mp4_context *ctx = user_data; struct mp4_context *ctx = user_data;
return input_stream_read(ctx->input_stream, buffer, length); return decoder_read(ctx->decoder, ctx->input_stream, buffer, length);
} }
static uint32_t static uint32_t
@ -93,6 +94,7 @@ static bool
mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream) mp4_decode(struct decoder *mpd_decoder, struct input_stream *input_stream)
{ {
struct mp4_context ctx = { struct mp4_context ctx = {
.decoder = mpd_decoder,
.input_stream = input_stream, .input_stream = input_stream,
}; };
mp4ff_callback_t callback = { mp4ff_callback_t callback = {
@ -313,6 +315,7 @@ mp4_load_tag(const char *file)
struct tag *ret = NULL; struct tag *ret = NULL;
struct input_stream input_stream; struct input_stream input_stream;
struct mp4_context ctx = { struct mp4_context ctx = {
.decoder = NULL,
.input_stream = &input_stream, .input_stream = &input_stream,
}; };
mp4ff_callback_t callback = { mp4ff_callback_t callback = {