/*
- * Copyright (C) 2005-2009 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) */
-
-/** \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 */
+/** \file afh.h Structures for audio format handling (para_server). */
/**
* The tags used by all audio format handlers.
* for all supported audio formats.
*/
struct taginfo {
- /** TPE1 (id3v2) / ARTIST (vorbis) / ©ART (aac) */
+ /** TPE1 (id3v2) / ARTIST (vorbis) / ART (aac)/ author(spx) */
char *artist;
- /** TIT2/TITLE/©nam */
+ /** TIT2/TITLE/nam */
char *title;
- /** TDRC/YEAR/©day */
+ /** TDRC/YEAR/day */
char *year;
- /** TALB/ALBUM/©alb */
+ /** TALB/ALBUM/alb */
char *album;
- /** COMM/COMMENT/©cmt */
+ /** COMM/COMMENT/cmt */
char *comment;
};
/** Audio format dependent information. */
struct afh_info {
/** The number of chunks this audio file contains. */
- long unsigned chunks_total;
+ uint32_t chunks_total;
/** The length of the audio file in seconds. */
- long unsigned seconds_total;
+ uint32_t seconds_total;
/** 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.
- */
+ * 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;
- /**
- * 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
* which means that this audio format does not need any special header
* treatment. The audio format handler does not need to set this to
* zero in this case.
- */
+ */
uint32_t header_len;
/** The number of channels. */
uint8_t channels;
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. */
*/
void (*init)(struct audio_format_handler*);
/** Typical file endings for files that can be handled by this afh. */
- const char **suffixes;
+ const char * const *suffixes;
/**
* 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
* \sa struct afh_info
*/
int (*get_file_info)(char *map, size_t numbytes, int fd,
- struct afh_info *afi);
+ struct afh_info *afhi);
+ /** Optional, used for header-rewriting. See \ref afh_get_header(). */
+ void (*get_header)(void *map, size_t mapsize, char **buf, size_t *len);
+ /**
+ * Write audio file with altered tags, optional.
+ *
+ * The output file descriptor has been opened by the caller and must not
+ * be closed in this function.
+ */
+ int (*rewrite_tags)(const char *map, size_t mapsize, struct taginfo *tags,
+ int output_fd, const char *filename);
};
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);
-uint32_t afh_get_largest_chunk_size(struct afh_info *afhi);
-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);
+int afh_rewrite_tags(int audio_format_id, void *map, size_t mapsize,
+ struct taginfo *tags, int output_fd, const char *filename);