aac audio format handler: fix end of file timeout

[paraslash.git] / error.h

diff --git a/error.h b/error.h
index 614390f282546a0f2ca7624db8c4964891376b5f..dabe82bff71380dca0fcb79d9c724f8b1b5ed3a6 100644 (file)
--- a/error.h
+++ b/error.h
@@ -48,8 +48,10 @@ enum para_subsystem {
        SS_DB,
        SS_OGG,
        SS_MP3,
        SS_DB,
        SS_OGG,
        SS_MP3,

+       SS_AAC_AFH,

        SS_MP3DEC,
        SS_AACDEC,
        SS_MP3DEC,
        SS_AACDEC,

+       SS_AAC_COMMON,

        SS_SERVER,
        SS_AFS,
        SS_MYSQL_SELECTOR,
        SS_SERVER,
        SS_AFS,
        SS_MYSQL_SELECTOR,


@@ -188,6 +190,19 @@ extern const char **para_errlist[];
        PARA_ERROR(HEADER_BITRATE, "invalid header bitrate"), \
 
 
        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?)"), \
 #define OGG_ERRORS \
        PARA_ERROR(OGG_READ, "ogg read error"), \
        PARA_ERROR(SYNC_PAGEOUT, "ogg sync page-out error (no ogg file?)"), \


@@ -338,9 +353,6 @@ extern const char **para_errlist[];
 
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \
 
 #define AACDEC_ERRORS \
        PARA_ERROR(AACDEC_INIT, "failed to init aac decoder"), \

-       PARA_ERROR(ESDS, "did not find esds atom"), \
-       PARA_ERROR(STSZ, "did not find stsz atom"), \
-       PARA_ERROR(STCO, "did not find stco atom"), \

        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */
        PARA_ERROR(AAC_DECODE, "aac decode error"), \
 
 /* these do not need error handling (yet) */


@@ -448,6 +460,8 @@ SS_ENUM(AACDEC);
 SS_ENUM(FILTER);
 SS_ENUM(MP3);
 SS_ENUM(OGG);
 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);
 SS_ENUM(SERVER);
 SS_ENUM(AFS);
 SS_ENUM(COMMAND);