From 4335ba724b9eb7fff0af57e2caf46016808594a2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 7 Aug 2016 20:48:23 +0200
Subject: [PATCH] Detect raw AC3 and Dirac

---
 signature.cpp | 22 +++++++++++++++++-----
 signature.h   | 20 +++++++++++---------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/signature.cpp b/signature.cpp
index 91a6063..60a466b 100644
--- a/signature.cpp
+++ b/signature.cpp
@@ -42,6 +42,7 @@ enum Sig48 : uint64
  */
 enum Sig32 : uint32
 {
+    Dirac = 0x42424344u,
     Elf = 0x7F454C46u,
     Flac = 0x664C6143u,
     JavaClassFile = 0xCAFEBABEu,
@@ -79,6 +80,7 @@ enum Sig24 : uint32
  */
 enum Sig16 : uint16
 {
+    Ac3 = 0x0B77u,
     Adts = 0xFFF0u,
     AdtsMask = 0xFFF6u,
     Jpeg = 0xffd8u,
@@ -150,6 +152,8 @@ ContainerFormat parseSignature(const char *buffer, int bufferSize)
         ;
     }
     switch(sig >> 32) { // check 32-bit signatures
+    case Dirac:
+        return ContainerFormat::Dirac;
     case Elf:
         return ContainerFormat::Elf;
     case Flac:
@@ -200,6 +204,8 @@ ContainerFormat parseSignature(const char *buffer, int bufferSize)
         return ContainerFormat::Utf8Text;
     }
     switch(sig >> 48) { // check 16-bit signatures
+    case Ac3:
+        return ContainerFormat::Ac3Frames;
     case Jpeg:
         return ContainerFormat::Jpeg;
     case Lha:
@@ -227,17 +233,17 @@ ContainerFormat parseSignature(const char *buffer, int bufferSize)
 
 /*!
  * \brief Returns the abbreviation of the container format as C-style string considering
- * the specified media type and version.
- *
- * This abbreviation might be used as file extension.
- *
- * Returns an empty string if no abbreviation is available.
+ *        the specified media type and version.
+ * \remarks The abbreviation might be used as file extension.
+ * \returns Returns an empty string if no abbreviation is available.
  */
 const char *containerFormatAbbreviation(ContainerFormat containerFormat, MediaType mediaType, unsigned int version)
 {
     switch(containerFormat) {
+    case ContainerFormat::Ac3Frames: return "ac3";
     case ContainerFormat::Ar: return "a";
     case ContainerFormat::Asf: return "asf";
+    case ContainerFormat::Dirac: return "drc";
     case ContainerFormat::Elf: return "elf";
     case ContainerFormat::Flac: return "flac";
     case ContainerFormat::FlashVideo: return "flv";
@@ -312,12 +318,16 @@ const char *containerFormatAbbreviation(ContainerFormat containerFormat, MediaTy
 const char *containerFormatName(ContainerFormat containerFormat)
 {
     switch(containerFormat) {
+    case ContainerFormat::Ac3Frames:
+        return "raw Dolby Digital";
     case ContainerFormat::Adts:
         return "Audio Data Transport Stream";
     case ContainerFormat::Ar:
         return "Archive (GNU ar)";
     case ContainerFormat::Asf:
         return "Advanced Systems Format";
+    case ContainerFormat::Dirac:
+        return "raw Dirac";
     case ContainerFormat::Elf:
         return "Executable and Linkable Format";
     case ContainerFormat::Flac:
@@ -422,6 +432,8 @@ const char *containerFormatSubversion(ContainerFormat containerFormat)
 const char *containerMimeType(ContainerFormat containerFormat, MediaType mediaType)
 {
     switch(containerFormat) {
+    case ContainerFormat::Ac3Frames:
+        return "audio/ac3";
     case ContainerFormat::Asf:
         return "video/x-ms-asf";
     case ContainerFormat::Flac:
diff --git a/signature.h b/signature.h
index c1989ed..a8b7959 100644
--- a/signature.h
+++ b/signature.h
@@ -18,12 +18,15 @@ DECLARE_ENUM_CLASS(TagTargetLevel, byte);
 enum class ContainerFormat
 {
     Unknown, /**< unknown container format */
+    Ac3Frames, /**< raw AC-3/Dolby Digital frames */
     Adts, /**< Audio Data Transport Stream */
     Ar, /**< "GNU ar" archive */
     Asf, /**< Advanced Systems Format */
     Bzip2, /**< bzip2 compressed file */
+    Dirac, /**< raw Dirac */
+    Ebml, /**< EBML */
     Elf, /**< Executable and Linkable Format */
-    Flac, /**< Free Lossless Audio Codec (raw stream) */
+    Flac, /**< raw Free Lossless Audio Codec */
     FlashVideo, /**< Flash (FLV) */
     Gif87a, /**< Graphics Interchange Format (1987) */
     Gif89a, /**< Graphics Interchange Format (1989) */
@@ -32,31 +35,30 @@ enum class ContainerFormat
     JavaClassFile, /**< Java class file */
     Jpeg, /**< JPEG File Interchange Format */
     Lha, /**< LHA */
+    Lzip, /**< lz compressed file */
     Lzw, /**< LZW */
+    Matroska, /**< Matroska (subset of EBML) */
     Mp4, /**< MPEG-4 Part 14 (subset of QuickTime container) */
+    MpegAudioFrames, /**< MPEG-1 Layer 1/2/3 frames */
     Ogg, /**< Ogg */
     PhotoshopDocument, /**< Photoshop document */
     Png, /**< Portable Network Graphics */
     PortableExecutable, /**< Portable Executable */
+    QuickTime, /**< QuickTime container */
     Rar, /**< RAR Archive */
-    Ebml, /**< EBML */
-    Matroska, /**< Matroska (subset of EBML) */
-    Webm, /**< WebM (subset of Matroska) */
-    MpegAudioFrames, /**< MPEG-1 Layer 1/2/3 frames */
     Riff, /**< Resource Interchange File Format */
-    RiffWave, /**< WAVE (subset of RIFF) */
     RiffAvi, /**< Audio Video Interleave (subset of RIFF) */
+    RiffWave, /**< WAVE (subset of RIFF) */
+    SevenZ, /**< 7z archive */
     Tar, /**< Tar archive */
     TiffBigEndian, /**< Tagged Image File Format (big endian) */
     TiffLittleEndian, /**< Tagged Image File Format (little endian) */
     Utf16Text, /**< UTF-16 text */
     Utf32Text, /**< UTF-32 text */
     Utf8Text, /**< UTF-8 text */
+    Webm, /**< WebM (subset of Matroska) */
     WindowsBitmap, /**< Microsoft Windows Bitmap */
     WindowsIcon, /**< Microsoft Windows Icon */
-    SevenZ, /**< 7z archive */
-    Lzip, /**< lz compressed file */
-    QuickTime, /**< QuickTime container */
     Zip /**< ZIP archive */
 };