Make aac work with any bitrate.

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 583d2ce510bc3b3a7f617e35daf2e44a5c972de1..dabe82bff71380dca0fcb79d9c724f8b1b5ed3a6 100644 (file)
--- a/error.h
+++ b/error.h
@@ -48,7 +48,10 @@ enum para_subsystem {
        SS_DB,
        SS_OGG,
        SS_MP3,
+       SS_AAC_AFH,
        SS_MP3DEC,
+       SS_AACDEC,
+       SS_AAC_COMMON,
        SS_SERVER,
        SS_AFS,
        SS_MYSQL_SELECTOR,
@@ -58,8 +61,10 @@ enum para_subsystem {
        SS_DCCP_SEND,
        SS_FD,
        SS_GUI,
-       SS_PLAY,
-       SS_ALSA,
+       SS_WRITE,
+       SS_WRITE_COMMON,
+       SS_ALSA_WRITER,
+       SS_FILE_WRITER,
        SS_RINGBUFFER};
 
 #define NUM_SS (SS_RINGBUFFER + 1)
@@ -185,6 +190,19 @@ extern const char **para_errlist[];
        PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 
 
+#define AAC_AFH_ERRORS \
+       PARA_ERROR(AAC_REPOS, "aac repositioning error"), \
+       PARA_ERROR(AAC_READ, "aac read error"), \
+       PARA_ERROR(STSZ, "did not find stcz atom"), \
+       PARA_ERROR(MP4ASC, "audio spec config error"), \
+
+
+#define AAC_COMMON_ERRORS \
+       PARA_ERROR(AAC_BUF, "invalid buffer"), \
+       PARA_ERROR(ESDS, "did not find esds atom"), \
+       PARA_ERROR(STCO, "did not find stco atom"), \
+
+
 #define OGG_ERRORS \
        PARA_ERROR(OGG_READ, "ogg read error"), \
        PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \
@@ -297,10 +315,15 @@ extern const char **para_errlist[];
        PARA_ERROR(F_SETFL, "failed to set fd flags"), \
 
 
-#define PLAY_ERRORS \
+#define WRITE_ERRORS \
        PARA_ERROR(READ_HDR, "failed to read audio file header"), \
        PARA_ERROR(READ_STDIN, "failed to read from stdin"), \
-       PARA_ERROR(PLAY_SYNTAX, "syntax error"), \
+       PARA_ERROR(WRITE_SYNTAX, "para_write syntax error"), \
+       PARA_ERROR(WRITE_OVERRUN, "buffer overrun"), \
+       PARA_ERROR(PREMATURE_END, "premature end of audio file"), \
+
+
+#define ALSA_WRITER_ERRORS \
        PARA_ERROR(BROKEN_CONF, "Broken alsa configuration"), \
        PARA_ERROR(ACCESS_TYPE, "alsa access type not available"), \
        PARA_ERROR(SAMPLE_FORMAT, "sample format not available"), \
@@ -321,9 +344,18 @@ extern const char **para_errlist[];
        PARA_ERROR(ALSA_LOG, "snd_output_stdio_attach() failed"), \
 
 
+#define FILE_WRITER_ERRORS \
+       PARA_ERROR(FW_WRITE, "file writer write error"), \
+       PARA_ERROR(FW_OPEN, "file writer: can not open output file"), \
+
+#define WRITE_COMMON_ERRORS \
+       PARA_ERROR(WRITE_COMMON_SYNTAX, "syntax error in write option"), \
+
+#define AACDEC_ERRORS \
+       PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
+       PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */
-#define ALSA_ERRORS
 #define SERVER_ERRORS
 #define WAV_ERRORS
 #define COMPRESS_ERRORS
@@ -424,9 +456,12 @@ SS_ENUM(WAV);
 SS_ENUM(COMPRESS);
 SS_ENUM(OGGDEC);
 SS_ENUM(MP3DEC);
+SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
 SS_ENUM(MP3);
 SS_ENUM(OGG);
+SS_ENUM(AAC_AFH);
+SS_ENUM(AAC_COMMON);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);
@@ -443,8 +478,10 @@ SS_ENUM(DCCP_RECV);
 SS_ENUM(DCCP_SEND);
 SS_ENUM(FD);
 SS_ENUM(GUI);
-SS_ENUM(PLAY);
-SS_ENUM(ALSA);
+SS_ENUM(WRITE);
+SS_ENUM(WRITE_COMMON);
+SS_ENUM(ALSA_WRITER);
+SS_ENUM(FILE_WRITER);
 SS_ENUM(RINGBUFFER);
 /** \endcond */
 #undef PARA_ERROR