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

Adding very experimental streaming support for mp4.

Browse Source 
git-svn-id: https://svn.musicpd.org/mpd/trunk@6483 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
J. Alexander Treuman 2007-06-04 19:24:19 +00:00
parent cbdc0b1534
commit 4734a2e2b4
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/inputPlugins/mp4_plugin.c
View File

@ -88,7 +88,8 @@ static uint32_t mp4_inputStreamSeekCallback(void *inStream, uint64_t position)
return seekInputStream((InputStream *) inStream, position, SEEK_SET); return seekInputStream((InputStream *) inStream, position, SEEK_SET);
} }
static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path) static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,
InputStream * inStream)
{ {
mp4ff_t *mp4fh; mp4ff_t *mp4fh;
mp4ff_callback_t *mp4cb; mp4ff_callback_t *mp4cb;
@ -115,24 +116,18 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
int seekPositionFound = 0; int seekPositionFound = 0;
long offset; long offset;
mpd_uint16 bitRate = 0; mpd_uint16 bitRate = 0;
InputStream inStream;
int seeking = 0; int seeking = 0;
if (openInputStream(&inStream, path) < 0) {
ERROR("failed to open %s\n", path);
return -1;
}
mp4cb = xmalloc(sizeof(mp4ff_callback_t)); mp4cb = xmalloc(sizeof(mp4ff_callback_t));
mp4cb->read = mp4_inputStreamReadCallback; mp4cb->read = mp4_inputStreamReadCallback;
mp4cb->seek = mp4_inputStreamSeekCallback; mp4cb->seek = mp4_inputStreamSeekCallback;
mp4cb->user_data = &inStream; mp4cb->user_data = inStream;
mp4fh = mp4ff_open_read(mp4cb); mp4fh = mp4ff_open_read(mp4cb);
if (!mp4fh) { if (!mp4fh) {
ERROR("Input does not appear to be a mp4 stream.\n"); ERROR("Input does not appear to be a mp4 stream.\n");
free(mp4cb); free(mp4cb);
closeInputStream(&inStream); closeInputStream(inStream);
return -1; return -1;
} }
@ -140,7 +135,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
if (track < 0) { if (track < 0) {
ERROR("No AAC track found in mp4 stream.\n"); ERROR("No AAC track found in mp4 stream.\n");
mp4ff_close(mp4fh); mp4ff_close(mp4fh);
closeInputStream(&inStream); closeInputStream(inStream);
free(mp4cb); free(mp4cb);
return -1; return -1;
} }
@ -169,7 +164,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
faacDecClose(decoder); faacDecClose(decoder);
mp4ff_close(mp4fh); mp4ff_close(mp4fh);
free(mp4cb); free(mp4cb);
closeInputStream(&inStream); closeInputStream(inStream);
return -1; return -1;
} }
@ -185,7 +180,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
ERROR("Error getting audio format of mp4 AAC track.\n"); ERROR("Error getting audio format of mp4 AAC track.\n");
faacDecClose(decoder); faacDecClose(decoder);
mp4ff_close(mp4fh); mp4ff_close(mp4fh);
closeInputStream(&inStream); closeInputStream(inStream);
free(mp4cb); free(mp4cb);
return -1; return -1;
} }
@ -254,7 +249,6 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
if (mp4Buffer) if (mp4Buffer)
free(mp4Buffer); free(mp4Buffer);
if (frameInfo.error > 0) { if (frameInfo.error > 0) {
ERROR("error decoding MP4 file: %s\n", path);
ERROR("faad2 error: %s\n", ERROR("faad2 error: %s\n",
faacDecGetErrorMessage(frameInfo.error)); faacDecGetErrorMessage(frameInfo.error));
eof = 1; eof = 1;
@ -302,7 +296,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char *path)
free(seekTable); free(seekTable);
faacDecClose(decoder); faacDecClose(decoder);
mp4ff_close(mp4fh); mp4ff_close(mp4fh);
closeInputStream(&inStream); closeInputStream(inStream);
free(mp4cb); free(mp4cb);
if (dc->state != DECODE_STATE_DECODE) if (dc->state != DECODE_STATE_DECODE)
@ -441,10 +435,10 @@ InputPlugin mp4Plugin = {
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL,
mp4_decode, mp4_decode,
NULL,
mp4TagDup, mp4TagDup,
INPUT_PLUGIN_STREAM_FILE, INPUT_PLUGIN_STREAM_FILE | INPUT_PLUGIN_STREAM_URL,
mp4_suffixes, mp4_suffixes,
mp4_mimeTypes mp4_mimeTypes
}; };