2004-03-18 14:47:41 +01:00
|
|
|
/* the Music Player Daemon (MPD)
|
2006-07-14 21:37:45 +02:00
|
|
|
* (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
|
2004-03-18 14:47:41 +01:00
|
|
|
* This project's homepage is: http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*/
|
|
|
|
|
2004-05-31 04:42:22 +02:00
|
|
|
#include "../inputPlugin.h"
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
#ifdef HAVE_FAAD
|
|
|
|
|
2004-05-31 04:42:22 +02:00
|
|
|
#include "../utils.h"
|
|
|
|
#include "../audio.h"
|
|
|
|
#include "../log.h"
|
|
|
|
#include "../pcm_utils.h"
|
|
|
|
#include "../inputStream.h"
|
|
|
|
#include "../outputBuffer.h"
|
|
|
|
#include "../decode.h"
|
2004-03-18 14:47:41 +01:00
|
|
|
|
2004-05-31 04:42:22 +02:00
|
|
|
#include "../mp4ff/mp4ff.h"
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <faad.h>
|
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
/* all code here is either based on or copied from FAAD2's frontend code */
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static int mp4_getAACTrack(mp4ff_t *infile) {
|
2004-03-18 14:47:41 +01:00
|
|
|
/* find AAC track */
|
|
|
|
int i, rc;
|
|
|
|
int numTracks = mp4ff_total_tracks(infile);
|
|
|
|
|
|
|
|
for (i = 0; i < numTracks; i++) {
|
|
|
|
unsigned char *buff = NULL;
|
|
|
|
int buff_size = 0;
|
2004-03-25 02:08:13 +01:00
|
|
|
#ifdef HAVE_MP4AUDIOSPECIFICCONFIG
|
2004-03-18 14:47:41 +01:00
|
|
|
mp4AudioSpecificConfig mp4ASC;
|
2004-03-25 02:08:13 +01:00
|
|
|
#else
|
|
|
|
unsigned long dummy1_32;
|
|
|
|
unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8,
|
|
|
|
dummy7_8, dummy8_8;
|
|
|
|
#endif
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
mp4ff_get_decoder_config(infile, i, &buff, &buff_size);
|
|
|
|
|
|
|
|
if (buff) {
|
2004-03-25 02:08:13 +01:00
|
|
|
#ifdef HAVE_MP4AUDIOSPECIFICCONFIG
|
2004-03-18 14:47:41 +01:00
|
|
|
rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);
|
2004-03-25 02:08:13 +01:00
|
|
|
#else
|
|
|
|
rc = AudioSpecificConfig(buff, &dummy1_32, &dummy2_8,
|
|
|
|
&dummy3_8, &dummy4_8, &dummy5_8,
|
|
|
|
&dummy6_8, &dummy7_8, &dummy8_8);
|
|
|
|
#endif
|
2004-03-18 14:47:41 +01:00
|
|
|
free(buff);
|
|
|
|
if (rc < 0) continue;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* can't decode this */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static uint32_t mp4_inputStreamReadCallback(void *inStream, void *buffer,
|
2004-05-06 20:49:04 +02:00
|
|
|
uint32_t length)
|
|
|
|
{
|
|
|
|
return readFromInputStream((InputStream*) inStream, buffer, 1, length);
|
2004-03-18 14:47:41 +01:00
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static uint32_t mp4_inputStreamSeekCallback(void *inStream, uint64_t position) {
|
2004-05-06 20:49:04 +02:00
|
|
|
return seekInputStream((InputStream *) inStream, position, SEEK_SET);
|
2004-03-18 14:47:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static int mp4_decode(OutputBuffer * cb, DecoderControl * dc, char * path) {
|
2004-03-18 14:47:41 +01:00
|
|
|
mp4ff_t * mp4fh;
|
|
|
|
mp4ff_callback_t * mp4cb;
|
|
|
|
int32_t track;
|
2004-03-18 17:31:29 +01:00
|
|
|
float time;
|
2004-03-18 14:47:41 +01:00
|
|
|
int32_t scale;
|
|
|
|
faacDecHandle decoder;
|
|
|
|
faacDecFrameInfo frameInfo;
|
|
|
|
faacDecConfigurationPtr config;
|
|
|
|
unsigned char * mp4Buffer;
|
|
|
|
int mp4BufferSize;
|
|
|
|
unsigned long sampleRate;
|
|
|
|
unsigned char channels;
|
|
|
|
long sampleId;
|
|
|
|
long numSamples;
|
2004-03-18 17:31:29 +01:00
|
|
|
int eof = 0;
|
|
|
|
long dur;
|
|
|
|
unsigned int sampleCount;
|
|
|
|
char * sampleBuffer;
|
|
|
|
size_t sampleBufferLen;
|
2004-03-18 20:43:07 +01:00
|
|
|
unsigned int initial = 1;
|
2004-03-18 23:20:26 +01:00
|
|
|
float * seekTable;
|
|
|
|
long seekTableEnd = -1;
|
|
|
|
int seekPositionFound = 0;
|
2004-03-20 01:54:20 +01:00
|
|
|
long offset;
|
2004-03-20 15:44:39 +01:00
|
|
|
mpd_uint16 bitRate = 0;
|
2004-05-06 20:49:04 +02:00
|
|
|
InputStream inStream;
|
2004-07-03 16:49:10 +02:00
|
|
|
int seeking = 0;
|
2004-03-18 14:47:41 +01:00
|
|
|
|
2004-05-31 13:42:46 +02:00
|
|
|
if(openInputStream(&inStream, path) < 0) {
|
|
|
|
ERROR("failed to open %s\n", path);
|
2004-03-18 14:47:41 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp4cb = malloc(sizeof(mp4ff_callback_t));
|
2004-05-06 20:49:04 +02:00
|
|
|
mp4cb->read = mp4_inputStreamReadCallback;
|
|
|
|
mp4cb->seek = mp4_inputStreamSeekCallback;
|
|
|
|
mp4cb->user_data = &inStream;
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
mp4fh = mp4ff_open_read(mp4cb);
|
|
|
|
if(!mp4fh) {
|
|
|
|
ERROR("Input does not appear to be a mp4 stream.\n");
|
|
|
|
free(mp4cb);
|
2004-05-06 20:49:04 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-03-18 14:47:41 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
track = mp4_getAACTrack(mp4fh);
|
|
|
|
if(track < 0) {
|
|
|
|
ERROR("No AAC track found in mp4 stream.\n");
|
|
|
|
mp4ff_close(mp4fh);
|
2004-05-06 20:49:04 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-03-18 14:47:41 +01:00
|
|
|
free(mp4cb);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
decoder = faacDecOpen();
|
|
|
|
|
|
|
|
config = faacDecGetCurrentConfiguration(decoder);
|
|
|
|
config->outputFormat = FAAD_FMT_16BIT;
|
2004-03-21 14:47:45 +01:00
|
|
|
#ifdef HAVE_FAACDECCONFIGURATION_DOWNMATRIX
|
2004-03-18 14:47:41 +01:00
|
|
|
config->downMatrix = 1;
|
2004-03-21 14:47:45 +01:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FAACDECCONFIGURATION_DONTUPSAMPLEIMPLICITSBR
|
|
|
|
config->dontUpSampleImplicitSBR = 0;
|
|
|
|
#endif
|
2004-03-18 14:47:41 +01:00
|
|
|
faacDecSetConfiguration(decoder,config);
|
|
|
|
|
2004-05-10 14:35:18 +02:00
|
|
|
dc->audioFormat.bits = 16;
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
mp4Buffer = NULL;
|
|
|
|
mp4BufferSize = 0;
|
|
|
|
mp4ff_get_decoder_config(mp4fh,track,&mp4Buffer,&mp4BufferSize);
|
|
|
|
|
|
|
|
if(faacDecInit2(decoder,mp4Buffer,mp4BufferSize,&sampleRate,&channels)
|
|
|
|
< 0)
|
|
|
|
{
|
2004-03-22 03:44:22 +01:00
|
|
|
ERROR("Error not a AAC stream.\n");
|
2004-03-18 14:47:41 +01:00
|
|
|
faacDecClose(decoder);
|
|
|
|
mp4ff_close(mp4fh);
|
|
|
|
free(mp4cb);
|
2004-05-06 20:49:04 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-03-18 14:47:41 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 14:35:18 +02:00
|
|
|
dc->audioFormat.sampleRate = sampleRate;
|
|
|
|
dc->audioFormat.channels = channels;
|
2004-03-18 14:47:41 +01:00
|
|
|
time = mp4ff_get_track_duration_use_offsets(mp4fh,track);
|
|
|
|
scale = mp4ff_time_scale(mp4fh,track);
|
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
if(mp4Buffer) free(mp4Buffer);
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
if(scale < 0) {
|
|
|
|
ERROR("Error getting audio format of mp4 AAC track.\n");
|
|
|
|
faacDecClose(decoder);
|
|
|
|
mp4ff_close(mp4fh);
|
2004-05-06 20:49:04 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-03-18 14:47:41 +01:00
|
|
|
free(mp4cb);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-05-10 14:35:18 +02:00
|
|
|
dc->totalTime = ((float)time)/scale;
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
numSamples = mp4ff_num_samples(mp4fh,track);
|
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
time = 0.0;
|
|
|
|
|
2004-03-18 23:20:26 +01:00
|
|
|
seekTable = malloc(sizeof(float)*numSamples);
|
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
for(sampleId=0; sampleId<numSamples && !eof; sampleId++) {
|
2004-07-03 16:49:10 +02:00
|
|
|
if(dc->seek) seeking = 1;
|
|
|
|
|
|
|
|
if(seeking && seekTableEnd>1 &&
|
2004-03-18 23:20:26 +01:00
|
|
|
seekTable[seekTableEnd]>=dc->seekWhere)
|
|
|
|
{
|
|
|
|
int i = 2;
|
|
|
|
while(seekTable[i]<dc->seekWhere) i++;
|
|
|
|
sampleId = i-1;
|
|
|
|
time = seekTable[sampleId];
|
|
|
|
}
|
|
|
|
|
2004-03-19 02:24:20 +01:00
|
|
|
dur = mp4ff_get_sample_duration(mp4fh,track,sampleId);
|
2004-03-20 01:54:20 +01:00
|
|
|
offset = mp4ff_get_sample_offset(mp4fh,track,sampleId);
|
2004-03-18 23:20:26 +01:00
|
|
|
|
|
|
|
if(sampleId>seekTableEnd) {
|
|
|
|
seekTable[sampleId] = time;
|
|
|
|
seekTableEnd = sampleId;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(sampleId==0) dur = 0;
|
2004-03-20 02:34:25 +01:00
|
|
|
if(offset>dur) dur = 0;
|
|
|
|
else dur-=offset;
|
2004-03-18 23:20:26 +01:00
|
|
|
time+=((float)dur)/scale;
|
|
|
|
|
2004-07-03 16:49:10 +02:00
|
|
|
if(seeking && time>dc->seekWhere) seekPositionFound = 1;
|
2004-03-18 23:20:26 +01:00
|
|
|
|
2004-07-03 16:49:10 +02:00
|
|
|
if(seeking && seekPositionFound) {
|
2004-03-18 23:20:26 +01:00
|
|
|
seekPositionFound = 0;
|
2004-05-18 05:37:55 +02:00
|
|
|
clearOutputBuffer(cb);
|
2004-07-03 16:49:10 +02:00
|
|
|
seeking = 0;
|
2004-03-18 17:31:29 +01:00
|
|
|
dc->seek = 0;
|
|
|
|
}
|
2004-03-18 14:47:41 +01:00
|
|
|
|
2004-07-03 16:49:10 +02:00
|
|
|
if(seeking) continue;
|
2004-03-18 23:20:26 +01:00
|
|
|
|
|
|
|
if(mp4ff_read_sample(mp4fh,track,sampleId,&mp4Buffer,
|
|
|
|
&mp4BufferSize) == 0)
|
|
|
|
{
|
2004-03-18 17:31:29 +01:00
|
|
|
eof = 1;
|
2004-03-19 02:24:20 +01:00
|
|
|
continue;
|
2004-03-18 17:31:29 +01:00
|
|
|
}
|
|
|
|
|
2004-03-25 02:08:13 +01:00
|
|
|
#ifdef HAVE_FAAD_BUFLEN_FUNCS
|
2004-03-18 17:31:29 +01:00
|
|
|
sampleBuffer = faacDecDecode(decoder,&frameInfo,mp4Buffer,
|
|
|
|
mp4BufferSize);
|
2004-03-25 02:08:13 +01:00
|
|
|
#else
|
|
|
|
sampleBuffer = faacDecDecode(decoder,&frameInfo,mp4Buffer);
|
|
|
|
#endif
|
2004-03-22 06:08:14 +01:00
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
if(mp4Buffer) free(mp4Buffer);
|
2004-03-20 02:34:25 +01:00
|
|
|
if(frameInfo.error > 0) {
|
2004-05-31 13:42:46 +02:00
|
|
|
ERROR("error decoding MP4 file: %s\n", path);
|
2004-03-22 05:24:16 +01:00
|
|
|
ERROR("faad2 error: %s\n",
|
|
|
|
faacDecGetErrorMessage(frameInfo.error));
|
2004-03-20 02:34:25 +01:00
|
|
|
eof = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2004-05-19 04:14:20 +02:00
|
|
|
if(dc->state != DECODE_STATE_DECODE) {
|
2004-03-22 19:44:15 +01:00
|
|
|
channels = frameInfo.channels;
|
2004-03-25 02:08:13 +01:00
|
|
|
#ifdef HAVE_FAACDECFRAMEINFO_SAMPLERATE
|
2004-03-22 19:44:15 +01:00
|
|
|
scale = frameInfo.samplerate;
|
2004-03-25 02:08:13 +01:00
|
|
|
#endif
|
2004-05-10 14:35:18 +02:00
|
|
|
dc->audioFormat.sampleRate = scale;
|
|
|
|
dc->audioFormat.channels = frameInfo.channels;
|
|
|
|
getOutputAudioFormat(&(dc->audioFormat),
|
|
|
|
&(cb->audioFormat));
|
2004-03-22 19:44:15 +01:00
|
|
|
dc->state = DECODE_STATE_DECODE;
|
|
|
|
}
|
|
|
|
|
2004-03-20 15:44:39 +01:00
|
|
|
if(channels*(dur+offset) > frameInfo.samples) {
|
2004-03-22 03:44:22 +01:00
|
|
|
dur = frameInfo.samples/channels;
|
2004-03-20 02:34:25 +01:00
|
|
|
offset = 0;
|
|
|
|
}
|
2004-03-20 15:44:39 +01:00
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
sampleCount = (unsigned long)(dur*channels);
|
|
|
|
|
2004-03-20 15:44:39 +01:00
|
|
|
if(sampleCount>0) {
|
|
|
|
initial =0;
|
|
|
|
bitRate = frameInfo.bytesconsumed*8.0*
|
|
|
|
frameInfo.channels*scale/
|
2004-04-03 06:01:31 +02:00
|
|
|
frameInfo.samples/1000+0.5;
|
2004-03-20 15:44:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
sampleBufferLen = sampleCount*2;
|
2004-03-20 01:54:20 +01:00
|
|
|
|
|
|
|
sampleBuffer+=offset*channels*2;
|
|
|
|
|
2004-05-29 14:05:49 +02:00
|
|
|
sendDataToOutputBuffer(cb, NULL, dc, 1, sampleBuffer,
|
2004-11-02 20:56:59 +01:00
|
|
|
sampleBufferLen, time, bitRate, NULL);
|
2004-05-07 21:35:39 +02:00
|
|
|
if(dc->stop) {
|
|
|
|
eof = 1;
|
|
|
|
break;
|
2004-03-18 14:47:41 +01:00
|
|
|
}
|
2004-03-18 17:31:29 +01:00
|
|
|
}
|
2004-03-18 14:47:41 +01:00
|
|
|
|
2004-03-22 06:08:14 +01:00
|
|
|
free(seekTable);
|
|
|
|
faacDecClose(decoder);
|
|
|
|
mp4ff_close(mp4fh);
|
2004-05-06 20:49:04 +02:00
|
|
|
closeInputStream(&inStream);
|
2004-03-22 06:08:14 +01:00
|
|
|
free(mp4cb);
|
|
|
|
|
2004-05-19 04:14:20 +02:00
|
|
|
if(dc->state != DECODE_STATE_DECODE) return -1;
|
2004-03-22 06:08:14 +01:00
|
|
|
|
2004-07-03 16:49:10 +02:00
|
|
|
if(dc->seek && seeking) {
|
|
|
|
clearOutputBuffer(cb);
|
2004-05-30 15:33:13 +02:00
|
|
|
dc->seek = 0;
|
2004-07-03 16:49:10 +02:00
|
|
|
}
|
|
|
|
flushOutputBuffer(cb);
|
2004-03-18 14:47:41 +01:00
|
|
|
|
2004-03-18 17:31:29 +01:00
|
|
|
if(dc->stop) {
|
|
|
|
dc->state = DECODE_STATE_STOP;
|
|
|
|
dc->stop = 0;
|
2004-03-18 14:47:41 +01:00
|
|
|
}
|
2004-03-18 17:31:29 +01:00
|
|
|
else dc->state = DECODE_STATE_STOP;
|
2004-03-18 14:47:41 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static MpdTag * mp4DataDup(char * file, int * mp4MetadataFound) {
|
2004-05-31 04:42:22 +02:00
|
|
|
MpdTag * ret = NULL;
|
|
|
|
InputStream inStream;
|
|
|
|
mp4ff_t * mp4fh;
|
|
|
|
mp4ff_callback_t * cb;
|
|
|
|
int32_t track;
|
|
|
|
int32_t time;
|
|
|
|
int32_t scale;
|
2004-11-10 22:58:27 +01:00
|
|
|
int i;
|
2004-05-31 04:42:22 +02:00
|
|
|
|
|
|
|
*mp4MetadataFound = 0;
|
|
|
|
|
2005-09-08 23:08:02 +02:00
|
|
|
if(openInputStream(&inStream, file) < 0) {
|
|
|
|
DEBUG("mp4DataDup: Failed to open file: %s\n", file);
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-05-31 04:42:22 +02:00
|
|
|
|
|
|
|
cb = malloc(sizeof(mp4ff_callback_t));
|
|
|
|
cb->read = mp4_inputStreamReadCallback;
|
|
|
|
cb->seek = mp4_inputStreamSeekCallback;
|
|
|
|
cb->user_data = &inStream;
|
|
|
|
|
|
|
|
mp4fh = mp4ff_open_read(cb);
|
|
|
|
if(!mp4fh) {
|
|
|
|
free(cb);
|
|
|
|
closeInputStream(&inStream);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
track = mp4_getAACTrack(mp4fh);
|
|
|
|
if(track < 0) {
|
|
|
|
mp4ff_close(mp4fh);
|
|
|
|
closeInputStream(&inStream);
|
|
|
|
free(cb);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = newMpdTag();
|
|
|
|
time = mp4ff_get_track_duration_use_offsets(mp4fh,track);
|
|
|
|
scale = mp4ff_time_scale(mp4fh,track);
|
|
|
|
if(scale < 0) {
|
|
|
|
mp4ff_close(mp4fh);
|
|
|
|
closeInputStream(&inStream);
|
|
|
|
free(cb);
|
|
|
|
freeMpdTag(ret);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ret->time = ((float)time)/scale+0.5;
|
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
for(i = 0; i < mp4ff_meta_get_num_items(mp4fh); i++) {
|
|
|
|
char * item;
|
|
|
|
char * value;
|
2004-05-31 04:42:22 +02:00
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
mp4ff_meta_get_by_index(mp4fh, i, &item, &value);
|
2004-05-31 04:42:22 +02:00
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
if(0 == strcasecmp("artist", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_ARTIST, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
|
|
|
else if(0 == strcasecmp("title", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_TITLE, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
|
|
|
else if(0 == strcasecmp("album", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_ALBUM, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
|
|
|
else if(0 == strcasecmp("track", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_TRACK, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
2006-04-30 21:55:56 +02:00
|
|
|
else if(0 == strcasecmp("disc", item)) { /* Is that the correct id? */
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_DISC, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
2004-11-10 22:58:27 +01:00
|
|
|
else if(0 == strcasecmp("genre", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_GENRE, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
|
|
|
else if(0 == strcasecmp("date", item)) {
|
|
|
|
addItemToMpdTag(ret, TAG_ITEM_DATE, value);
|
|
|
|
*mp4MetadataFound = 1;
|
|
|
|
}
|
2004-05-31 04:42:22 +02:00
|
|
|
|
2004-11-10 22:58:27 +01:00
|
|
|
free(item);
|
|
|
|
free(value);
|
2004-05-31 04:42:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
mp4ff_close(mp4fh);
|
|
|
|
closeInputStream(&inStream);
|
|
|
|
free(cb);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static MpdTag * mp4TagDup(char * file) {
|
2004-05-31 04:42:22 +02:00
|
|
|
MpdTag * ret = NULL;
|
|
|
|
int mp4MetadataFound = 0;
|
|
|
|
|
|
|
|
ret = mp4DataDup(file, &mp4MetadataFound);
|
|
|
|
if(!ret) return NULL;
|
|
|
|
if(!mp4MetadataFound) {
|
|
|
|
MpdTag * temp = id3Dup(file);
|
|
|
|
if(temp) {
|
|
|
|
temp->time = ret->time;
|
|
|
|
freeMpdTag(ret);
|
|
|
|
ret = temp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-07-17 03:47:32 +02:00
|
|
|
static char * mp4Suffixes[] = {"m4a", "mp4", NULL};
|
2004-05-31 04:42:22 +02:00
|
|
|
|
|
|
|
InputPlugin mp4Plugin =
|
|
|
|
{
|
|
|
|
"mp4",
|
|
|
|
NULL,
|
2004-05-31 22:59:55 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2006-03-16 07:52:46 +01:00
|
|
|
NULL,
|
2004-05-31 04:42:22 +02:00
|
|
|
mp4_decode,
|
|
|
|
mp4TagDup,
|
|
|
|
INPUT_PLUGIN_STREAM_FILE,
|
|
|
|
mp4Suffixes,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
InputPlugin mp4Plugin =
|
|
|
|
{
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
NULL,
|
2004-05-31 22:59:55 +02:00
|
|
|
NULL,
|
|
|
|
NULL,
|
2006-03-16 07:52:46 +01:00
|
|
|
NULL,
|
2004-05-31 04:42:22 +02:00
|
|
|
NULL,
|
|
|
|
0,
|
|
|
|
NULL,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2004-03-18 14:47:41 +01:00
|
|
|
#endif /* HAVE_FAAD */
|