1 files changed, 76 insertions, 68 deletions

diff --git a/src/plugins/old/mkv_extractor.c b/src/plugins/old/mkv_extractor.c
index 9e2f1f9..ff052dc 100644
--- a/src/plugins/old/mkv_extractor.c
+++ b/src/plugins/old/mkv_extractor.c
@@ -18,17 +18,21 @@
      Boston, MA 02110-1301, USA.
  */
 
- /*
-  * Made by Gabriel Peixoto
-  * Using AVInfo 1.x code. Copyright (c) 2004 George Shuklin.
-  *
-  */
+/*
+ * Made by Gabriel Peixoto
+ * Using AVInfo 1.x code. Copyright (c) 2004 George Shuklin.
+ *
+ */
 
 #include "platform.h"
 #include "extractor.h"
 #include <stdint.h>
 
-#define ADD(s,t) do { if (0 != (ret = proc (proc_cls, "mkv", t, EXTRACTOR_METAFORMAT_UTF8, "text/plain", s, strlen(s)+1))) goto EXIT; } while (0)
+#define ADD(s,t) do { if (0 != (ret = proc (proc_cls, "mkv", t, \
+                                            EXTRACTOR_METAFORMAT_UTF8, \
+                                            "text/plain", s, strlen (s) \
+                                            + 1))) goto EXIT; \
+} while (0)
 
 /**
  * FIXME: document
@@ -98,27 +102,29 @@ enum
  */
 static size_t
 VINTparse (const unsigned char *buffer, size_t start, size_t end,
-           int64_t * result, int flag)
+           int64_t *result, int flag)
 {
-  static const unsigned char mask[8] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 };
-  static const unsigned char imask[8] = { 0x7F, 0x3F, 0x1F, 0xF, 0x7, 0x3, 0x1, 00 };
+  static const unsigned char mask[8] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2,
+                                         0x1 };
+  static const unsigned char imask[8] = { 0x7F, 0x3F, 0x1F, 0xF, 0x7, 0x3, 0x1,
+                                          00 };
   int vint_width;
   unsigned int c;
   int64_t temp;
   unsigned char tempc;
 
-  if (end - start < 2)  
-    return 0;                   /*ops */  
-  
+  if (end - start < 2)
+    return 0;                   /*ops */
+
   vint_width = 0;
   for (c = 0; c < 8; c++)
-    if (!(buffer[start] & mask[c]))
+    if (! (buffer[start] & mask[c]))
       vint_width++;
     else
       break;
   if ( (vint_width >= 8) || (vint_width + start + 1 >= end) )
     return 0;
-  
+
   *result = 0;
   for (c = 0; c < vint_width; c++)
   {
@@ -139,7 +145,7 @@ VINTparse (const unsigned char *buffer, size_t start, size_t end,
  */
 static unsigned int
 elementRead (const unsigned char *buffer, size_t start, size_t end,
-             uint32_t *id, int64_t * size)
+             uint32_t *id, int64_t *size)
 {
   int64_t tempID;
   int64_t tempsize;
@@ -147,12 +153,12 @@ elementRead (const unsigned char *buffer, size_t start, size_t end,
   size_t size_offset;
 
   tempID = 0;
-  
+
   id_offset = VINTparse (buffer, start, end, &tempID, 0);
-  if (!id_offset)
+  if (! id_offset)
     return 0;
   size_offset = VINTparse (buffer, start + id_offset, end, &tempsize, 1);
-  if (!size_offset)
+  if (! size_offset)
     return 0;
   *id = (uint32_t) tempID;
   *size = tempsize;
@@ -172,10 +178,11 @@ getInt (const unsigned char *buffer, size_t start, size_t size)
 
   result = 0;
   for (c = 1; c <= size; c++)
-    result += ((uint64_t)buffer[start + c - 1]) << (8 * (size - c));  
+    result += ((uint64_t) buffer[start + c - 1]) << (8 * (size - c));
   return result;
 }
 
+
 static float
 getFloat (const unsigned char *buffer, size_t start, size_t size)
 {
@@ -194,7 +201,8 @@ getFloat (const unsigned char *buffer, size_t start, size_t size)
   return 0.0;
 }
 
-static const unsigned int MKV_Parse_list[] = { 
+
+static const unsigned int MKV_Parse_list[] = {
   /*Elements, containing requed information (sub-elements), see enum in mkv.h for values */
   MKVID_Segment,
   MKVID_Info,
@@ -244,14 +252,14 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
   if (NULL == start)
     return 0;
   p = start - data;
-  
+
 /*main loop*/
   ret = 0;
   do
   {
     offs = elementRead (data, p, size, &eID, &eSize);
     p += offs;
-    if (!offs || p >= size)
+    if (! offs || (p >= size))
       break;
     if (MKVID_EBML == eID)
     {
@@ -262,8 +270,8 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
     if (! is_mkv)
       return 0;
     for (c = 0; c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list); c++)
-      if (MKV_Parse_list[c] == eID)      
-        break;      
+      if (MKV_Parse_list[c] == eID)
+        break;
     if (c < sizeof (MKV_Parse_list) / sizeof (*MKV_Parse_list))
       continue;
 
@@ -272,7 +280,7 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
 
     if ( (eSize == 4) || (eSize == 8) || (eSize == 1) || (eSize == 2))
       value = getInt (data, p, eSize);
-    
+
     switch (eID)
     {
     case MKVID_TrackType:      /*detect a stream type (video/audio/text) */
@@ -286,9 +294,9 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
         have_audio = 1;
         break;
       case MKV_Track_subtitle:
-        break;       
+        break;
       case MKV_Track_subtitle_orig:
-        break;       
+        break;
       }
       break;
     case MKVID_DefaultDuration:
@@ -298,11 +306,11 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
         fps = 0;
       break;
     case MKVID_Language:
-      snprintf (buffer, 
-                sizeof (buffer),
-                "%.*s",
-                (int) eSize,
-                data + p);
+      snprintf (buffer,
+                sizeof (buffer),
+                "%.*s",
+                (int) eSize,
+                data + p);
       ADD (buffer, EXTRACTOR_METATYPE_LANGUAGE);
       break;
     case MKVID_CodecName:
@@ -340,10 +348,10 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
       if (eSize > MAX_STRING_SIZE)
         break;
       snprintf (buffer,
-                sizeof (buffer),
-                "%.*s", 
-                (int) eSize,
-                (const char*) data + p);
+                sizeof (buffer),
+                "%.*s",
+                (int) eSize,
+                (const char*) data + p);
       ADD (buffer, EXTRACTOR_METATYPE_TITLE);
       break;
     default:
@@ -354,20 +362,20 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
   while (1);
 
   snprintf (buffer,
-            sizeof (buffer),
-            "%u s (%s%s%s)",
-            (unsigned int) (duration / 1e+9 * (float) timescale),
-            (have_audio ? "audio" : ""),
-            ((have_audio && have_video) ? "/" : ""),
-            (have_video ? "video" : ""));
+            sizeof (buffer),
+            "%u s (%s%s%s)",
+            (unsigned int) (duration / 1e+9 * (float) timescale),
+            (have_audio ? "audio" : ""),
+            ((have_audio && have_video) ? "/" : ""),
+            (have_video ? "video" : ""));
   if ( (have_audio || have_video) && (duration >= 0.0) )
     ADD (buffer, EXTRACTOR_METATYPE_DURATION);
-  if ( (value_width != 0) && (value_height != 0) )    
+  if ( (value_width != 0) && (value_height != 0) )
   {
     snprintf (buffer,
-              sizeof(buffer),
-              "%ux%u", 
-              value_width, value_height);
+              sizeof(buffer),
+              "%ux%u",
+              value_width, value_height);
     ADD (buffer, EXTRACTOR_METATYPE_IMAGE_DIMENSIONS);
   }
 
@@ -375,34 +383,34 @@ EXTRACTOR_mkv_extract (const unsigned char *data, size_t size,
   {
     if ( (fps != 0) && (bit_depth != 0) )
       snprintf (buffer,
-                sizeof (buffer),
-                "%.*s (%u fps, %u bit)", 
-                codec_strlen,
-                codec,
-                fps,
-                bit_depth);
+                sizeof (buffer),
+                "%.*s (%u fps, %u bit)",
+                codec_strlen,
+                codec,
+                fps,
+                bit_depth);
     else if (fps != 0)
       snprintf (buffer,
-                sizeof (buffer),
-                "%.*s (%u fps)", 
-                codec_strlen,
-                codec,
-                fps);
+                sizeof (buffer),
+                "%.*s (%u fps)",
+                codec_strlen,
+                codec,
+                fps);
     else if (bit_depth != 0)
       snprintf (buffer,
-                sizeof (buffer),
-                "%.*s (%u bit)", 
-                codec_strlen,
-                codec,
-                bit_depth);
+                sizeof (buffer),
+                "%.*s (%u bit)",
+                codec_strlen,
+                codec,
+                bit_depth);
     else
       snprintf (buffer,
-                sizeof (buffer),
-                "%.*s",
-                codec_strlen,
-                codec);  
-    ADD (buffer, 
-         EXTRACTOR_METATYPE_FORMAT);    
+                sizeof (buffer),
+                "%.*s",
+                codec_strlen,
+                codec);
+    ADD (buffer,
+         EXTRACTOR_METATYPE_FORMAT);
   }
 EXIT:
   return ret;