/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
-/** \file afh.h structures for audio format handling (para_server) */
+/** \file afh.h Structures for audio format handling (para_server). */
-/** \cond */
-#ifdef HAVE_OGGVORBIS
-#define OV_AUDIO_FORMAT " ogg"
-#else
-#define OV_AUDIO_FORMAT ""
-#endif
-
-#ifdef HAVE_FAAD
-#define AAC_AUDIO_FORMAT " aac"
-#else
-#define AAC_AUDIO_FORMAT ""
-#endif
-
-#define SUPPORTED_AUDIO_FORMATS "mp3" OV_AUDIO_FORMAT AAC_AUDIO_FORMAT
-
-/** \endcond */
+/**
+ * The tags used by all audio format handlers.
+ *
+ * Paraslash only uses the more common tags. These are recognized
+ * for all supported audio formats.
+ */
+struct taginfo {
+ /** TPE1 (id3v2) / ARTIST (vorbis) / ART (aac)/ author(spx) */
+ char *artist;
+ /** TIT2/TITLE/nam */
+ char *title;
+ /** TDRC/YEAR/day */
+ char *year;
+ /** TALB/ALBUM/alb */
+ char *album;
+ /** COMM/COMMENT/cmt */
+ char *comment;
+};
/** Audio format dependent information. */
struct afh_info {
long unsigned chunks_total;
/** The length of the audio file in seconds. */
long unsigned seconds_total;
- /** A string that gets filled in by the audio format handler. */
- char *info_string;
+ /** Audio handler specific info about the file. */
+ char *techinfo;
+ /** Id3 tags, vorbis comments, aac tags. */
+ struct taginfo tags;
/**
* The table that specifies the offset of the individual pieces in
* the current audio file.
uint32_t *chunk_table;
/** Period of time between sending data chunks. */
struct timeval chunk_tv;
- /** End of file timeout - Do not load new audio file until this time. */
- struct timeval eof_tv;
- /**
- * The position of the header within the audio file. Ignored if \a
- * header_len equals zero.
- */
- uint32_t header_offset;
/**
* The header is needed by senders in case a new client connects in the
* middle of the stream. The length of the header defaults to zero
uint16_t bitrate;
};
+/** Data about the current audio file, passed from afs to server. */
+struct audio_file_data {
+ /** The open file descriptor to the current audio file. */
+ int fd;
+ /** Vss needs this for streaming. */
+ struct afh_info afhi;
+ /** Size of the largest chunk. */
+ uint32_t max_chunk_size;
+ /** Needed to get the audio file header. */
+ uint8_t audio_format_id;
+};
+
/**
- * Structure for audio format handling.
+ * Structure for audio format handling.
*
- * There's one such struct for each supported audio format. Initially, only \a
- * name and \a init are defined. During the startup process, para_server calls
- * the \a init function of each audio format handler which is expected to fill
- * in the other part of this struct.
+ * There's one such struct for each supported audio format. Initially, only \a
+ * name and \a init are defined. During the startup process, para_server calls
+ * the \a init function of each audio format handler which is expected to fill
+ * in the other part of this struct.
*/
struct audio_format_handler {
/** Name of the audio format. */
/**
* Check if this audio format handler can handle the file.
*
- * This is a pointer to a function returning whether a given file is
+ * This is a pointer to a function returning whether a given file is
* valid for this audio format. A negative return value indicates that
* this audio format handler is unable to decode the given file. On
* success, the function must return a positive value and fill in the
*/
int (*get_file_info)(char *map, size_t numbytes, int fd,
struct afh_info *afi);
+ /** Optional, used for header-rewriting. See \ref afh_get_header(). */
+ void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
};
void afh_init(void);
const char *audio_format_name(int);
void afh_get_chunk(long unsigned chunk_num, struct afh_info *afhi,
void *map, const char **buf, size_t *len);
-void afh_get_header(struct afh_info *afhi, void *map, const char **buf, size_t *len);
+int32_t afh_get_start_chunk(int32_t approx_chunk_num,
+ const struct afh_info *afhi);
+void afh_get_header(struct afh_info *afhi, uint8_t audio_format_id,
+ void *map, size_t mapsize, char **buf, size_t *len);
+void afh_free_header(char *header_buf, uint8_t audio_format_id);
+void clear_afhi(struct afh_info *afhi);
+unsigned afh_get_afhi_txt(int audio_format_num, struct afh_info *afhi, char **result);