annotate src/aac/src/libmp4.c @ 682:de446ca64592 trunk

[svn] - i really hate this plugin
author nenolod
date Tue, 20 Feb 2007 04:42:48 -0800
parents 3a06665a810e
children c9eaa64b92b3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
1 #include <glib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
2 #include <gtk/gtk.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
3 #include <string.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
4 #include <stdlib.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
5 #include "faad.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
6 #include "mp4ff.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
7 #include "tagging.h"
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
8
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
9 #include <audacious/plugin.h>
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
10 #include <audacious/output.h>
4
0ad4849f6219 [svn] - the first pass missed some libaudacious references, this fixes them
nenolod
parents: 0
diff changeset
11 #include <audacious/util.h>
0ad4849f6219 [svn] - the first pass missed some libaudacious references, this fixes them
nenolod
parents: 0
diff changeset
12 #include <audacious/titlestring.h>
0ad4849f6219 [svn] - the first pass missed some libaudacious references, this fixes them
nenolod
parents: 0
diff changeset
13 #include <audacious/vfs.h>
527
d124034ebea3 [svn] - glib/gi18n.h -> audacious/i18n.h for automatic dgettext support
nenolod
parents: 393
diff changeset
14 #include <audacious/i18n.h>
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
15
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
16 #define MP4_VERSION VERSION
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
17
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
18 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
19 * BUFFER_SIZE is the highest amount of memory that can be pulled.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
20 * We use this for sanity checks, among other things, as mp4ff needs
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
21 * a labotomy sometimes.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
22 */
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
23 #define BUFFER_SIZE FAAD_MIN_STREAMSIZE*64
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
24
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
25 /*
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
26 * AAC_MAGIC is the pattern that marks the beginning of an MP4 container.
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
27 */
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
28 #define AAC_MAGIC (unsigned char [4]) { 0xFF, 0xF9, 0x5C, 0x80 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
29
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
30 static void mp4_init(void);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
31 static void mp4_about(void);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
32 static int mp4_is_our_file(char *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
33 static void mp4_play(InputPlayback *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
34 static void mp4_stop(InputPlayback *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
35 static void mp4_pause(InputPlayback *, short);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
36 static void mp4_seek(InputPlayback *, int);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
37 static int mp4_get_time(InputPlayback *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
38 static void mp4_cleanup(void);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
39 static void mp4_get_song_title_len(char *filename, char **, int *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
40 static TitleInput* mp4_get_song_tuple(char *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
41 static int mp4_is_our_fd(char *, VFSFile *);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
42
374
7d7d66d0b2c3 [svn] - fix MP4 extension table
nenolod
parents: 372
diff changeset
43 gchar *mp4_fmts[] = { "m4a", "mp4", "aac", NULL };
7d7d66d0b2c3 [svn] - fix MP4 extension table
nenolod
parents: 372
diff changeset
44
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
45 static void * mp4_decode(void *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
46 static gchar * mp4_get_song_title(char *filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
47 static void audmp4_file_info_box(gchar *);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
48 gboolean buffer_playing;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
49
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
50 InputPlugin mp4_ip =
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
51 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
52 NULL, // handle
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
53 NULL, // filename
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
54 "MP4 Audio Plugin",
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
55 mp4_init,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
56 mp4_about,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
57 NULL, // configuration
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
58 mp4_is_our_file,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
59 NULL, //scandir
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
60 mp4_play,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
61 mp4_stop,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
62 mp4_pause,
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
63 mp4_seek,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
64 NULL, // set equalizer
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
65 mp4_get_time,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
66 NULL, // get volume
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
67 NULL,
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
68 mp4_cleanup,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
69 NULL, // obsolete
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
70 NULL, // send visualisation data
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
71 NULL, // set player window info
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
72 NULL, // set song title text
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
73 mp4_get_song_title_len, // get song title text
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
74 NULL, // info box
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
75 NULL, // to output plugin
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
76 mp4_get_song_tuple,
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
77 NULL,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
78 NULL,
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
79 mp4_is_our_fd,
374
7d7d66d0b2c3 [svn] - fix MP4 extension table
nenolod
parents: 372
diff changeset
80 mp4_fmts,
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
81 };
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
82
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
83 typedef struct _mp4cfg
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
84 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
85 #define FILE_UNKNOWN 0
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
86 #define FILE_MP4 1
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
87 #define FILE_AAC 2
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
88 gshort file_type;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
89 } Mp4Config;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
90
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
91 static Mp4Config mp4cfg;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
92 static GThread *decodeThread;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
93 GStaticMutex mutex = G_STATIC_MUTEX_INIT;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
94 static int seekPosition = -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
95
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
96 void getMP4info(char*);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
97 int getAACTrack(mp4ff_t *);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
98
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
99 static guint32 mp4_read_callback(void *data, void *buffer, guint32 len)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
100 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
101 if (data == NULL || buffer == NULL)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
102 return -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
103
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
104 return vfs_fread(buffer, 1, len, (VFSFile *) data);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
105 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
106
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
107 static guint32 mp4_seek_callback(void *data, guint64 pos)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
108 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
109 if (data == NULL)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
110 return -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
111
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
112 return vfs_fseek((VFSFile *) data, pos, SEEK_SET);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
113 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
114
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
115 static gchar *
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
116 extname(const char *filename)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
117 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
118 gchar *ext = strrchr(filename, '.');
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
119
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
120 if (ext != NULL)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
121 ++ext;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
122
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
123 return ext;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
124 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
125
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
126 InputPlugin *get_iplugin_info(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
127 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
128 return(&mp4_ip);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
129 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
130
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
131 static void mp4_init(void)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
132 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
133 mp4cfg.file_type = FILE_UNKNOWN;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
134 seekPosition = -1;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
135 return;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
136 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
137
561
914c96de3244 [svn] Convert plugins to use InputPlayback.output instead of InputPlugin.output
iabervon
parents: 559
diff changeset
138 static void mp4_play(InputPlayback *playback)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
139 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
140 buffer_playing = TRUE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
141 decodeThread = g_thread_create((GThreadFunc)mp4_decode, playback, TRUE, NULL);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
142 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
143
561
914c96de3244 [svn] Convert plugins to use InputPlayback.output instead of InputPlugin.output
iabervon
parents: 559
diff changeset
144 static void mp4_stop(InputPlayback *playback)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
145 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
146 if (buffer_playing)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
147 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
148 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
149 g_thread_join(decodeThread);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
150 playback->output->close_audio();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
151 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
152 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
153
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
154 /*
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
155 * These routines are derived from MPlayer.
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
156 */
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
157
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
158 /// \param srate (out) sample rate
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
159 /// \param num (out) number of audio frames in this ADTS frame
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
160 /// \return size of the ADTS frame in bytes
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
161 /// aac_parse_frames needs a buffer at least 8 bytes long
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
162 int aac_parse_frame(guchar *buf, int *srate, int *num)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
163 {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
164 int i = 0, sr, fl = 0, id;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
165 static int srates[] = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 0, 0, 0};
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
166
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
167 if((buf[i] != 0xFF) || ((buf[i+1] & 0xF6) != 0xF0))
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
168 return 0;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
169
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
170 id = (buf[i+1] >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
171 sr = (buf[i+2] >> 2) & 0x0F;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
172 if(sr > 11)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
173 return 0;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
174 *srate = srates[sr];
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
175
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
176 fl = ((buf[i+3] & 0x03) << 11) | (buf[i+4] << 3) | ((buf[i+5] >> 5) & 0x07);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
177 *num = (buf[i+6] & 0x02) + 1;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
178
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
179 return fl;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
180 }
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
181
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
182 static gboolean parse_aac_stream(VFSFile *stream)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
183 {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
184 int cnt = 0, c, len, srate, num;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
185 off_t init, probed;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
186 static guchar buf[8];
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
187
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
188 init = probed = vfs_ftell(stream);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
189 while(probed-init <= 32768 && cnt < 8)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
190 {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
191 c = 0;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
192 while(probed-init <= 32768 && c != 0xFF)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
193 {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
194 c = vfs_getc(stream);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
195 if(c < 0)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
196 return FALSE;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
197 probed = vfs_ftell(stream);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
198 }
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
199 buf[0] = 0xFF;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
200 if(vfs_fread(&(buf[1]), 1, 7, stream) < 7)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
201 return FALSE;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
202
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
203 len = aac_parse_frame(buf, &srate, &num);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
204 if(len > 0)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
205 {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
206 cnt++;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
207 vfs_fseek(stream, len - 8, SEEK_CUR);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
208 }
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
209 probed = vfs_ftell(stream);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
210 }
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
211
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
212 if(cnt < 8)
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
213 return FALSE;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
214
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
215 return TRUE;
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
216 }
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
217
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
218 static int mp4_is_our_file(char *filename)
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
219 {
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
220 VFSFile *file;
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
221 gchar* extension;
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
222 gchar magic[8];
393
6987b5334081 [svn] Fix:
nenolod
parents: 374
diff changeset
223
6987b5334081 [svn] Fix:
nenolod
parents: 374
diff changeset
224 memset(magic, '\0', 8);
6987b5334081 [svn] Fix:
nenolod
parents: 374
diff changeset
225
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
226 extension = strrchr(filename, '.');
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
227 if ((file = vfs_fopen(filename, "rb"))) {
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
228 vfs_fread(magic, 1, 8, file);
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
229 vfs_rewind(file);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
230 if (parse_aac_stream(file) == TRUE) {
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
231 vfs_fclose(file);
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
232 return TRUE;
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
233 }
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
234 if (!memcmp(magic, "ID3", 3)) { // ID3 tag bolted to the front, obfuscated magic bytes
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
235 vfs_fclose(file);
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
236 if (extension &&(
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
237 !strcasecmp(extension, ".mp4") || // official extension
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
238 !strcasecmp(extension, ".m4a") || // Apple mp4 extension
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
239 !strcasecmp(extension, ".aac") // old MPEG2/4-AAC extension
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
240 ))
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
241 return 1;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
242 else
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
243 return 0;
262
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
244 }
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
245 if (!memcmp(&magic[4], "ftyp", 4)) {
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
246 vfs_fclose(file);
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
247 return 1;
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
248 }
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
249 vfs_fclose(file);
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
250 }
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
251 return 0;
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
252 }
f653f1219db2 [svn] So input.c wants to have the old-style function available...
chainsaw
parents: 255
diff changeset
253
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
254 static int mp4_is_our_fd(char *filename, VFSFile* file)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
255 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
256 gchar* extension;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
257 gchar magic[8];
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
258
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
259 extension = strrchr(filename, '.');
255
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
260 vfs_fread(magic, 1, 8, file);
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
261 vfs_rewind(file);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
262 if (parse_aac_stream(file) == TRUE)
255
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
263 return 1;
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
264 if (!memcmp(&magic[4], "ftyp", 4))
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
265 return 1;
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
266 if (!memcmp(magic, "ID3", 3)) { // ID3 tag bolted to the front, obfuscated magic bytes
255
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
267 if (extension &&(
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
268 !strcasecmp(extension, ".mp4") || // official extension
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
269 !strcasecmp(extension, ".m4a") || // Apple mp4 extension
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
270 !strcasecmp(extension, ".aac") // old MPEG2/4-AAC extension
255
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
271 ))
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
272 return 1;
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
273 else
902605dec467 [svn] Port to NewVFS probe function.
chainsaw
parents: 12
diff changeset
274 return 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
275 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
276 return 0;
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
277 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
278
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
279 static void mp4_about(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
280 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
281 static GtkWidget *aboutbox = NULL;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
282 aboutbox = xmms_show_message("About MP4 AAC player plugin",
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
283 "Using libfaad2-" FAAD2_VERSION " for decoding.\n"
680
3a06665a810e [svn] - satisfy Nero AG attribution requirement for FAAD 2.5 code import
nenolod
parents: 679
diff changeset
284 "FAAD2 AAC/HE-AAC/HE-AACv2/DRM decoder (c) Nero AG, www.nero.com\n"
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
285 "Copyright (c) 2005-2006 Audacious team",
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
286 "Ok", FALSE, NULL, NULL);
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
287 g_signal_connect(G_OBJECT(aboutbox), "destroy",
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
288 G_CALLBACK(gtk_widget_destroyed),
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
289 &aboutbox);
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
290 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
291
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
292 static void mp4_pause(InputPlayback *playback, short flag)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
293 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
294 playback->output->pause(flag);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
295 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
296
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
297 static void mp4_seek(InputPlayback *data, int time)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
298 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
299 seekPosition = time;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
300 while(buffer_playing && seekPosition != -1)
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
301 xmms_usleep(10000);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
302 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
303
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
304 static int mp4_get_time(InputPlayback *playback)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
305 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
306 if(!buffer_playing)
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
307 return (-1);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
308 else
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
309 return (playback->output->output_time());
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
310 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
311
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
312 static void mp4_cleanup(void)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
313 {
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
314 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
315
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
316 static TitleInput *mp4_get_song_tuple(char *fn)
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
317 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
318 mp4ff_callback_t *mp4cb = g_malloc0(sizeof(mp4ff_callback_t));
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
319 VFSFile *mp4fh;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
320 mp4ff_t *mp4file;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
321 TitleInput *input = NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
322 gchar *filename = g_strdup(fn);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
323
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
324 mp4fh = vfs_fopen(filename, "rb");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
325 mp4cb->read = mp4_read_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
326 mp4cb->seek = mp4_seek_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
327 mp4cb->user_data = mp4fh;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
328
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
329 if (!(mp4file = mp4ff_open_read(mp4cb))) {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
330 g_free(mp4cb);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
331 vfs_fclose(mp4fh);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
332 } else {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
333 gint mp4track= getAACTrack(mp4file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
334 gint numSamples = mp4ff_num_samples(mp4file, mp4track);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
335 guint framesize = 1024;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
336 gulong samplerate;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
337 guchar channels;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
338 gint msDuration;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
339 mp4AudioSpecificConfig mp4ASC;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
340 gchar *tmpval;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
341 guchar *buffer = NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
342 guint bufferSize = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
343 faacDecHandle decoder;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
344
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
345 if (mp4track == -1)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
346 return NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
347
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
348 decoder = faacDecOpen();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
349 mp4ff_get_decoder_config(mp4file, mp4track, &buffer, &bufferSize);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
350
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
351 if ( !buffer ) {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
352 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
353 return FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
354 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
355 if ( faacDecInit2(decoder, buffer, bufferSize,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
356 &samplerate, &channels) < 0 ) {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
357 faacDecClose(decoder);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
358
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
359 return FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
360 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
361
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
362 /* Add some hacks for SBR profile */
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
363 if (AudioSpecificConfig(buffer, bufferSize, &mp4ASC) >= 0) {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
364 if (mp4ASC.frameLengthFlag == 1) framesize = 960;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
365 if (mp4ASC.sbr_present_flag == 1) framesize *= 2;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
366 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
367
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
368 g_free(buffer);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
369
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
370 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
371
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
372 msDuration = ((float)numSamples * (float)(framesize - 1.0)/(float)samplerate) * 1000;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
373
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
374 input = bmp_title_input_new();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
375
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
376 mp4ff_meta_get_title(mp4file, &input->track_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
377 mp4ff_meta_get_album(mp4file, &input->album_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
378 mp4ff_meta_get_artist(mp4file, &input->performer);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
379 mp4ff_meta_get_date(mp4file, &tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
380 mp4ff_meta_get_genre(mp4file, &input->genre);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
381
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
382 if (tmpval)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
383 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
384 input->year = atoi(tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
385 free(tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
386 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
387
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
388 input->file_name = g_path_get_basename(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
389 input->file_path = g_path_get_dirname(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
390 input->file_ext = extname(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
391 input->length = msDuration;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
392
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
393 free (mp4cb);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
394 vfs_fclose(mp4fh);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
395 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
396
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
397 return input;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
398 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
399
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
400 static void mp4_get_song_title_len(char *filename, char **title, int *len)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
401 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
402 (*title) = mp4_get_song_title(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
403 (*len) = -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
404 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
405
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
406 static gchar *mp4_get_song_title(char *filename)
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
407 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
408 mp4ff_callback_t *mp4cb = g_malloc0(sizeof(mp4ff_callback_t));
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
409 VFSFile *mp4fh;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
410 mp4ff_t *mp4file;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
411 gchar *title = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
412
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
413 mp4fh = vfs_fopen(filename, "rb");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
414 mp4cb->read = mp4_read_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
415 mp4cb->seek = mp4_seek_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
416 mp4cb->user_data = mp4fh;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
417
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
418 if (!(mp4file = mp4ff_open_read(mp4cb))) {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
419 g_free(mp4cb);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
420 vfs_fclose(mp4fh);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
421 } else {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
422 TitleInput *input;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
423 gchar *tmpval;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
424
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
425 input = bmp_title_input_new();
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
426
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
427 mp4ff_meta_get_title(mp4file, &input->track_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
428 mp4ff_meta_get_album(mp4file, &input->album_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
429 mp4ff_meta_get_artist(mp4file, &input->performer);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
430 mp4ff_meta_get_date(mp4file, &tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
431 mp4ff_meta_get_genre(mp4file, &input->genre);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
432
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
433 if (tmpval)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
434 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
435 input->year = atoi(tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
436 free(tmpval);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
437 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
438
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
439 input->file_name = g_path_get_basename(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
440 input->file_path = g_path_get_dirname(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
441 input->file_ext = extname(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
442
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
443 title = xmms_get_titlestring(xmms_get_gentitle_format(), input);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
444
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
445 free (input->track_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
446 free (input->album_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
447 free (input->performer);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
448 free (input->genre);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
449 free (input->file_name);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
450 free (input->file_path);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
451 free (input);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
452
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
453 free (mp4cb);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
454 vfs_fclose(mp4fh);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
455 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
456
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
457 if (!title)
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
458 {
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
459 title = g_path_get_basename(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
460 if (extname(title))
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
461 *(extname(title) - 1) = '\0';
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
462 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
463
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
464 return title;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
465 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
466
561
914c96de3244 [svn] Convert plugins to use InputPlayback.output instead of InputPlugin.output
iabervon
parents: 559
diff changeset
467 static int my_decode_mp4( InputPlayback *playback, char *filename, mp4ff_t *mp4file )
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
468 {
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
469 // We are reading an MP4 file
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
470 gint mp4track= getAACTrack(mp4file);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
471
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
472 if (mp4track < 0)
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
473 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
474 g_print("Unsupported Audio track type\n");
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
475 return TRUE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
476 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
477
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
478 faacDecHandle decoder;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
479 mp4AudioSpecificConfig mp4ASC;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
480 guchar *buffer = NULL;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
481 guint bufferSize = 0;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
482 gulong samplerate;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
483 guchar channels;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
484 gulong msDuration;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
485 gulong numSamples;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
486 gulong sampleID = 1;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
487 guint framesize = 1024;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
488
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
489 gchar *xmmstitle = NULL;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
490 xmmstitle = mp4_get_song_title(filename);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
491 if(xmmstitle == NULL)
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
492 xmmstitle = g_strdup(filename);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
493
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
494 decoder = faacDecOpen();
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
495 mp4ff_get_decoder_config(mp4file, mp4track, &buffer, &bufferSize);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
496 if ( !buffer ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
497 faacDecClose(decoder);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
498 return FALSE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
499 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
500 if ( faacDecInit2(decoder, buffer, bufferSize,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
501 &samplerate, &channels) < 0 ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
502 faacDecClose(decoder);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
503
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
504 return FALSE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
505 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
506
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
507 /* Add some hacks for SBR profile */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
508 if (AudioSpecificConfig(buffer, bufferSize, &mp4ASC) >= 0) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
509 if (mp4ASC.frameLengthFlag == 1) framesize = 960;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
510 if (mp4ASC.sbr_present_flag == 1) framesize *= 2;
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
511 }
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
512
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
513 g_free(buffer);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
514 if( !channels ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
515 faacDecClose(decoder);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
516
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
517 return FALSE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
518 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
519 numSamples = mp4ff_num_samples(mp4file, mp4track);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
520 msDuration = ((float)numSamples * (float)(framesize - 1.0)/(float)samplerate) * 1000;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
521 playback->output->open_audio(FMT_S16_NE, samplerate, channels);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
522 playback->output->flush(0);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
523
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
524 mp4_ip.set_info(xmmstitle, msDuration,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
525 mp4ff_get_avg_bitrate( mp4file, mp4track ),
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
526 samplerate,channels);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
527
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
528 while ( buffer_playing ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
529 void* sampleBuffer;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
530 faacDecFrameInfo frameInfo;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
531 gint rc;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
532
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
533 /* Seek if seek position has changed */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
534 if ( seekPosition!=-1 ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
535 sampleID = (float)seekPosition*(float)samplerate/(float)(framesize - 1.0);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
536 playback->output->flush(seekPosition*1000);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
537 seekPosition = -1;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
538 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
539
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
540 /* Otherwise continue playing */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
541 buffer=NULL;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
542 bufferSize=0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
543
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
544 /* If we've run to the end of the file, we're done. */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
545 if(sampleID >= numSamples){
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
546 /* Finish playing before we close the
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
547 output. */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
548 while ( playback->output->buffer_playing() ) {
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
549 xmms_usleep(10000);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
550 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
551
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
552 playback->output->flush(seekPosition*1000);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
553 playback->output->close_audio();
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
554 faacDecClose(decoder);
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
555
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
556 g_static_mutex_lock(&mutex);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
557 buffer_playing = FALSE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
558 g_static_mutex_unlock(&mutex);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
559 g_thread_exit(NULL);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
560
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
561 return FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
562 }
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
563 rc= mp4ff_read_sample(mp4file, mp4track,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
564 sampleID++, &buffer, &bufferSize);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
565
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
566 /*g_print(":: %d/%d\n", sampleID-1, numSamples);*/
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
567
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
568 /* If we can't read the file, we're done. */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
569 if((rc == 0) || (buffer== NULL) || (bufferSize == 0) || (bufferSize > BUFFER_SIZE)){
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
570 g_print("MP4: read error\n");
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
571 sampleBuffer = NULL;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
572 sampleID=0;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
573 playback->output->buffer_free();
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
574 playback->output->close_audio();
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
575
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
576 faacDecClose(decoder);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
577
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
578 return FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
579 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
580
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
581 /* g_print(" :: %d/%d\n", bufferSize, BUFFER_SIZE); */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
582
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
583 sampleBuffer= faacDecDecode(decoder,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
584 &frameInfo,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
585 buffer,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
586 bufferSize);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
587
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
588 /* If there was an error decoding, we're done. */
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
589 if(frameInfo.error > 0){
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
590 g_print("MP4: %s\n",
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
591 faacDecGetErrorMessage(frameInfo.error));
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
592 playback->output->close_audio();
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
593 faacDecClose(decoder);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
594
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
595 return FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
596 }
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
597 if(buffer){
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
598 g_free(buffer);
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
599 buffer=NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
600 bufferSize=0;
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
601 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
602 if (buffer_playing == FALSE)
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
603 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
604 playback->output->close_audio();
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
605 return FALSE;
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
606 }
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
607 produce_audio(playback->output->written_time(),
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
608 FMT_S16_NE,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
609 channels,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
610 frameInfo.samples<<1,
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
611 sampleBuffer, &buffer_playing);
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
612 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
613
584
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
614 playback->output->close_audio();
5e2b137a24fe [svn] - Cleaned up AAC plugin a bit more, but still couldn't fix the bug
mf0102
parents: 583
diff changeset
615 faacDecClose(decoder);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
616
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
617 return TRUE;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
618 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
619
561
914c96de3244 [svn] Convert plugins to use InputPlayback.output instead of InputPlugin.output
iabervon
parents: 559
diff changeset
620 static void my_decode_aac( InputPlayback *playback, char *filename )
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
621 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
622 // WE ARE READING AN AAC FILE
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
623 VFSFile *file = NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
624 faacDecHandle decoder = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
625 guchar *buffer = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
626 gulong bufferconsumed = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
627 gulong samplerate = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
628 guchar channels;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
629 gulong buffervalid = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
630 TitleInput* input;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
631 gchar *temp = g_strdup(filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
632 gchar *ext = strrchr(temp, '.');
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
633 gchar *xmmstitle = NULL;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
634 faacDecConfigurationPtr config;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
635
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
636 if((file = vfs_fopen(filename, "rb")) == 0){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
637 g_print("AAC: can't find file %s\n", filename);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
638 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
639 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
640 g_thread_exit(NULL);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
641 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
642 if((decoder = faacDecOpen()) == NULL){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
643 g_print("AAC: Open Decoder Error\n");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
644 vfs_fclose(file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
645 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
646 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
647 g_thread_exit(NULL);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
648 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
649 config = faacDecGetCurrentConfiguration(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
650 config->useOldADTSFormat = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
651 faacDecSetConfiguration(decoder, config);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
652 if((buffer = g_malloc(BUFFER_SIZE)) == NULL){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
653 g_print("AAC: error g_malloc\n");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
654 vfs_fclose(file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
655 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
656 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
657 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
658 g_thread_exit(NULL);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
659 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
660 if((buffervalid = vfs_fread(buffer, 1, BUFFER_SIZE, file))==0){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
661 g_print("AAC: Error reading file\n");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
662 g_free(buffer);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
663 vfs_fclose(file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
664 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
665 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
666 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
667 g_thread_exit(NULL);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
668 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
669 if(!strncmp((char*)buffer, "ID3", 3)){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
670 gint size = 0;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
671
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
672 vfs_fseek(file, 0, SEEK_SET);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
673 size = (buffer[6]<<21) | (buffer[7]<<14) | (buffer[8]<<7) | buffer[9];
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
674 size+=10;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
675 vfs_fread(buffer, 1, size, file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
676 buffervalid = vfs_fread(buffer, 1, BUFFER_SIZE, file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
677 }
682
de446ca64592 [svn] - i really hate this plugin
nenolod
parents: 680
diff changeset
678 xmmstitle = g_strdup(g_basename(temp));
679
c8dc00a58f0d [svn] - remove a bunch of pointless code. we don't do ID3 for raw AAC files at this time.
nenolod
parents: 678
diff changeset
679
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
680 bufferconsumed = faacDecInit(decoder,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
681 buffer,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
682 buffervalid,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
683 &samplerate,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
684 &channels);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
685 if(playback->output->open_audio(FMT_S16_NE,samplerate,channels) == FALSE){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
686 g_print("AAC: Output Error\n");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
687 g_free(buffer); buffer=0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
688 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
689 vfs_fclose(file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
690 playback->output->close_audio();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
691 g_free(xmmstitle);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
692 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
693 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
694 g_thread_exit(NULL);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
695 }
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
696
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
697 mp4_ip.set_info(xmmstitle, -1, -1, samplerate, channels);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
698 playback->output->flush(0);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
699
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
700 while(buffer_playing && buffervalid > 0){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
701 faacDecFrameInfo finfo;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
702 unsigned long samplesdecoded;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
703 char* sample_buffer = NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
704
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
705 if(bufferconsumed > 0){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
706 memmove(buffer, &buffer[bufferconsumed], buffervalid-bufferconsumed);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
707 buffervalid -= bufferconsumed;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
708 buffervalid += vfs_fread(&buffer[buffervalid], 1,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
709 BUFFER_SIZE-buffervalid, file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
710 bufferconsumed = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
711 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
712 sample_buffer = faacDecDecode(decoder, &finfo, buffer, buffervalid);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
713 if(finfo.error){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
714 config = faacDecGetCurrentConfiguration(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
715 if(config->useOldADTSFormat != 1){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
716 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
717 decoder = faacDecOpen();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
718 config = faacDecGetCurrentConfiguration(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
719 config->useOldADTSFormat = 1;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
720 faacDecSetConfiguration(decoder, config);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
721 finfo.bytesconsumed=0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
722 finfo.samples = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
723 faacDecInit(decoder,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
724 buffer,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
725 buffervalid,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
726 &samplerate,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
727 &channels);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
728 }else{
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
729 g_print("FAAD2 Warning %s\n", faacDecGetErrorMessage(finfo.error));
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
730 buffervalid = 0;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
731 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
732 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
733 bufferconsumed += finfo.bytesconsumed;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
734 samplesdecoded = finfo.samples;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
735 if((samplesdecoded<=0) && !sample_buffer){
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
736 g_print("AAC: error sample decoding\n");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
737 continue;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
738 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
739 produce_audio(playback->output->written_time(),
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
740 FMT_S16_LE, channels,
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
741 samplesdecoded<<1, sample_buffer, &buffer_playing);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
742 }
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
743 playback->output->buffer_free();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
744 playback->output->close_audio();
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
745 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
746 g_free(buffer);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
747 faacDecClose(decoder);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
748 g_free(xmmstitle);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
749 vfs_fclose(file);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
750 seekPosition = -1;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
751
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
752 buffer_playing = FALSE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
753 g_static_mutex_unlock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
754 g_thread_exit(NULL);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
755 }
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
756
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
757 static void *mp4_decode( void *args )
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
758 {
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
759 mp4ff_callback_t *mp4cb = g_malloc0(sizeof(mp4ff_callback_t));
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
760 VFSFile *mp4fh;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
761 mp4ff_t *mp4file;
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
762 gboolean ret;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
763
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
764 InputPlayback *playback = args;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
765 char *filename = playback->filename;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
766
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
767 mp4fh = vfs_fopen(filename, "rb");
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
768 mp4cb->read = mp4_read_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
769 mp4cb->seek = mp4_seek_callback;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
770 mp4cb->user_data = mp4fh;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
771
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
772 g_static_mutex_lock(&mutex);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
773 seekPosition= -1;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
774 buffer_playing= TRUE;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
775 g_static_mutex_unlock(&mutex);
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
776
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
777 ret = parse_aac_stream(mp4fh);
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
778 vfs_rewind(mp4fh);
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
779 mp4file= mp4ff_open_read(mp4cb);
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
780
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
781 if( ret == TRUE ) {
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
782 my_decode_aac( playback, filename );
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
783 mp4cfg.file_type = FILE_AAC;
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
784 vfs_fclose(mp4fh);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
785 g_free(mp4cb);
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
786 }
678
9e4145566248 [svn] - allow static AAC files to play. working on AACplus, but this brings us closer.
nenolod
parents: 595
diff changeset
787 else
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
788 my_decode_mp4( playback, filename, mp4file );
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
789
583
dad887da4642 [svn] - Fixed crash at opening AAC files
mf0102
parents: 561
diff changeset
790 return NULL;
0
13389e613d67 [svn] - initial import of audacious-plugins tree (lots to do)
nenolod
parents:
diff changeset
791 }