From 75901f5858695eff1fc79b9652749b94967ae57c Mon Sep 17 00:00:00 2001
From: Nathan Caldwell <saintdev@gmail.com>
Date: Fri, 13 Jul 2007 20:10:51 -0600
Subject: [PATCH] Move EBML functions out of matroska.c into their own file.

---
 src/ebml.c     | 322 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/matroska.c | 298 +---------------------------------------------------
 src/matroska.h |  40 +++++--
 3 files changed, 353 insertions(+), 307 deletions(-)
 create mode 100644 src/ebml.c

diff --git a/src/ebml.c b/src/ebml.c
new file mode 100644
index 0000000..642ef84
--- /dev/null
+++ b/src/ebml.c
@@ -0,0 +1,322 @@
+/*****************************************************************************
+ * matroska.c:
+ *****************************************************************************
+ * Copyright (C) 2005 x264 project
+ * $Id: $
+ *
+ * Authors: Mike Matsnev
+ *          Nathan Caldwell
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+#include "libmkv.h"
+#include "matroska.h"
+#include "config.h"
+
+mk_Context *mk_createContext(mk_Writer *w, mk_Context *parent, unsigned id) {
+  mk_Context  *c;
+
+  if (w->freelist) {
+    c = w->freelist;
+    w->freelist = w->freelist->next;
+  } else {
+    c = malloc(sizeof(*c));
+    memset(c, 0, sizeof(*c));
+  }
+
+  if (c == NULL)
+    return NULL;
+
+  c->parent = parent;
+  c->owner = w;
+  c->id = id;
+
+  if (c->owner->actlist)
+    c->owner->actlist->prev = &c->next;
+  c->next = c->owner->actlist;
+  c->prev = &c->owner->actlist;
+
+  return c;
+}
+
+int    mk_appendContextData(mk_Context *c, const void *data, unsigned size) {
+  unsigned  ns = c->d_cur + size;
+
+  if (ns > c->d_max) {
+    void      *dp;
+    unsigned  dn = c->d_max ? c->d_max << 1 : 16;
+    while (ns > dn)
+      dn <<= 1;
+
+    dp = realloc(c->data, dn);
+    if (dp == NULL)
+      return -1;
+
+    c->data = dp;
+    c->d_max = dn;
+  }
+
+  memcpy((char*)c->data + c->d_cur, data, size);
+
+  c->d_cur = ns;
+
+  return 0;
+}
+
+int    mk_writeID(mk_Context *c, unsigned id) {
+  unsigned char   c_id[4] = { id >> 24, id >> 16, id >> 8, id };
+
+  if (c_id[0])
+    return mk_appendContextData(c, c_id, 4);
+  if (c_id[1])
+    return mk_appendContextData(c, c_id+1, 3);
+  if (c_id[2])
+    return mk_appendContextData(c, c_id+2, 2);
+  return mk_appendContextData(c, c_id+3, 1);
+}
+
+int    mk_writeSize(mk_Context *c, uint64_t size) {
+  unsigned char   c_size[8] = { 0x01, size >> 48, size >> 40, size >> 32, size >> 24, size >> 16, size >> 8, size };
+
+  if (size < 0x7f) {
+    c_size[7] |= 0x80;
+    return mk_appendContextData(c, c_size+7, 1);
+  }
+  if (size < 0x3fff) {
+    c_size[6] |= 0x40;
+    return mk_appendContextData(c, c_size+6, 2);
+  }
+  if (size < 0x1fffff) {
+    c_size[5] |= 0x20;
+    return mk_appendContextData(c, c_size+5, 3);
+  }
+  if (size < 0x0fffffff) {
+    c_size[4] |= 0x10;
+    return mk_appendContextData(c, c_size+4, 4);
+  }
+  if (size < 0x07ffffffff) {
+    c_size[3] |= 0x08;
+    return mk_appendContextData(c, c_size+3, 5);
+  }
+  if (size < 0x03ffffffffff) {
+    c_size[2] |= 0x04;
+    return mk_appendContextData(c, c_size+2, 6);
+  }
+  if (size < 0x01ffffffffffff) {
+    c_size[1] |= 0x02;
+    return mk_appendContextData(c, c_size+1, 7);
+  }
+  return mk_appendContextData(c, c_size, 9);
+}
+
+int    mk_writeSSize(mk_Context *c, int64_t size) {
+  uint64_t    u_size = (uint64_t)llabs(size);
+  unsigned    size_size = mk_ebmlSizeSize( u_size << 1 ); // We need to shift by one to get the correct size here.
+
+  switch (size_size)
+  {
+    case 1:
+      size += 0x3f;
+      break;
+    case 2:
+      size += 0x1fff;
+      break;
+    case 3:
+      size += 0x0fffff;
+      break;
+    case 4:
+      size += 0x07ffffff;
+      break;
+    case 5:
+      size += 0x03ffffffff;
+      break;
+    case 6:
+      size += 0x01ffffffffff;
+      break;
+    case 7:
+      size += 0x00ffffffffffff;
+      break;
+      default:    // Matroska currently doesn't support any int > 56-bit.
+        return -1;
+  }
+
+  return mk_writeSize(c, size);
+}
+
+int    mk_flushContextID(mk_Context *c) {
+  unsigned char size_undf[8] = {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+  if (c->id == 0)
+    return 0;
+
+  CHECK(mk_writeID(c->parent, c->id));
+  CHECK(mk_appendContextData(c->parent, &size_undf, 8));
+
+  c->id = 0;
+
+  return 0;
+}
+
+int    mk_flushContextData(mk_Context *c) {
+  if (c->d_cur == 0)
+    return 0;
+
+  if (c->parent)
+    CHECK(mk_appendContextData(c->parent, c->data, c->d_cur));
+  else
+    if (fwrite(c->data, c->d_cur, 1, c->owner->fp) != 1)
+      return -1;
+
+  c->d_cur = 0;
+
+  return 0;
+}
+
+int    mk_closeContext(mk_Context *c, off_t *off) {
+  if (c->id) {
+    CHECK(mk_writeID(c->parent, c->id));
+    CHECK(mk_writeSize(c->parent, c->d_cur));
+  }
+
+  if (c->parent && off != NULL)
+    *off += c->parent->d_cur;
+
+  CHECK(mk_flushContextData(c));
+
+  if (c->next)
+    c->next->prev = c->prev;
+  *(c->prev) = c->next;
+  c->next = c->owner->freelist;
+  c->owner->freelist = c;
+
+  return 0;
+}
+
+void   mk_destroyContexts(mk_Writer *w) {
+  mk_Context  *cur, *next;
+
+  for (cur = w->freelist; cur; cur = next) {
+    next = cur->next;
+    free(cur->data);
+    free(cur);
+  }
+
+  for (cur = w->actlist; cur; cur = next) {
+    next = cur->next;
+    free(cur->data);
+    free(cur);
+  }
+
+  w->freelist = w->actlist = w->root = NULL;
+}
+
+int    mk_writeStr(mk_Context *c, unsigned id, const char *str) {
+  size_t  len = strlen(str);
+
+  CHECK(mk_writeID(c, id));
+  CHECK(mk_writeSize(c, len));
+  CHECK(mk_appendContextData(c, str, len));
+  return 0;
+}
+
+int    mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size) {
+  CHECK(mk_writeID(c, id));
+  CHECK(mk_writeSize(c, size));
+  CHECK(mk_appendContextData(c, data, size));
+  return 0;
+}
+
+int    mk_writeUInt(mk_Context *c, unsigned id, uint64_t ui) {
+  unsigned char   c_ui[8] = { ui >> 56, ui >> 48, ui >> 40, ui >> 32, ui >> 24, ui >> 16, ui >> 8, ui };
+  unsigned    i = 0;
+
+  CHECK(mk_writeID(c, id));
+  while (i < 7 && c_ui[i] == 0)
+    ++i;
+  CHECK(mk_writeSize(c, 8 - i));
+  CHECK(mk_appendContextData(c, c_ui+i, 8 - i));
+  return 0;
+}
+
+int    mk_writeSInt(mk_Context *c, unsigned id, int64_t si) {
+  unsigned char   c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
+  unsigned    i = 0;
+
+  CHECK(mk_writeID(c, id));
+  if (si < 0)
+    while (i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80)
+      ++i;
+  else
+    while (i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80))
+      ++i;
+  CHECK(mk_writeSize(c, 8 - i));
+  CHECK(mk_appendContextData(c, c_si+i, 8 - i));
+  return 0;
+}
+
+int    mk_writeFloatRaw(mk_Context *c, float f) {
+  union {
+    float f;
+    unsigned u;
+  } u;
+  unsigned char c_f[4];
+
+  u.f = f;
+  c_f[0] = u.u >> 24;
+  c_f[1] = u.u >> 16;
+  c_f[2] = u.u >> 8;
+  c_f[3] = u.u;
+
+  return mk_appendContextData(c, c_f, 4);
+}
+
+int    mk_writeFloat(mk_Context *c, unsigned id, float f) {
+  CHECK(mk_writeID(c, id));
+  CHECK(mk_writeSize(c, 4));
+  CHECK(mk_writeFloatRaw(c, f));
+  return 0;
+}
+
+unsigned   mk_ebmlSizeSize(uint64_t s) {
+  if (s < 0x7f)
+    return 1;
+  if (s < 0x3fff)
+    return 2;
+  if (s < 0x1fffff)
+    return 3;
+  if (s < 0x0fffffff)
+    return 4;
+  if (s < 0x07ffffffff)
+    return 5;
+  if (s < 0x03ffffffffff)
+    return 6;
+  if (s < 0x01ffffffffffff)
+    return 7;
+  return 8;
+}
+
+unsigned   mk_ebmlSIntSize(int64_t si) {
+  unsigned char   c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
+  unsigned    i = 0;
+
+  if (si < 0)
+    while (i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80)
+      ++i;
+  else
+    while (i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80))
+      ++i;
+
+  return 8 - i;
+}
diff --git a/src/matroska.c b/src/matroska.c
index 1fd5e3b..efc72e6 100644
--- a/src/matroska.c
+++ b/src/matroska.c
@@ -25,271 +25,7 @@
 #include "matroska.h"
 #include "config.h"
 
-mk_Context *mk_createContext(mk_Writer *w, mk_Context *parent, unsigned id) {
-  mk_Context  *c;
-
-  if (w->freelist) {
-    c = w->freelist;
-    w->freelist = w->freelist->next;
-  } else {
-    c = malloc(sizeof(*c));
-    memset(c, 0, sizeof(*c));
-  }
-
-  if (c == NULL)
-    return NULL;
-
-  c->parent = parent;
-  c->owner = w;
-  c->id = id;
-
-  if (c->owner->actlist)
-    c->owner->actlist->prev = &c->next;
-  c->next = c->owner->actlist;
-  c->prev = &c->owner->actlist;
-
-  return c;
-}
-
-static int    mk_appendContextData(mk_Context *c, const void *data, unsigned size) {
-  unsigned  ns = c->d_cur + size;
-
-  if (ns > c->d_max) {
-    void      *dp;
-    unsigned  dn = c->d_max ? c->d_max << 1 : 16;
-    while (ns > dn)
-      dn <<= 1;
-
-    dp = realloc(c->data, dn);
-    if (dp == NULL)
-      return -1;
-
-    c->data = dp;
-    c->d_max = dn;
-  }
-
-  memcpy((char*)c->data + c->d_cur, data, size);
-
-  c->d_cur = ns;
-
-  return 0;
-}
-
-static int    mk_writeID(mk_Context *c, unsigned id) {
-  unsigned char   c_id[4] = { id >> 24, id >> 16, id >> 8, id };
-
-  if (c_id[0])
-    return mk_appendContextData(c, c_id, 4);
-  if (c_id[1])
-    return mk_appendContextData(c, c_id+1, 3);
-  if (c_id[2])
-    return mk_appendContextData(c, c_id+2, 2);
-  return mk_appendContextData(c, c_id+3, 1);
-}
-
-static int    mk_writeSize(mk_Context *c, uint64_t size) {
-  unsigned char   c_size[8] = { 0x01, size >> 48, size >> 40, size >> 32, size >> 24, size >> 16, size >> 8, size };
-
-  if (size < 0x7f) {
-    c_size[7] |= 0x80;
-    return mk_appendContextData(c, c_size+7, 1);
-  }
-  if (size < 0x3fff) {
-    c_size[6] |= 0x40;
-    return mk_appendContextData(c, c_size+6, 2);
-  }
-  if (size < 0x1fffff) {
-    c_size[5] |= 0x20;
-    return mk_appendContextData(c, c_size+5, 3);
-  }
-  if (size < 0x0fffffff) {
-    c_size[4] |= 0x10;
-    return mk_appendContextData(c, c_size+4, 4);
-  }
-  if (size < 0x07ffffffff) {
-    c_size[3] |= 0x08;
-    return mk_appendContextData(c, c_size+3, 5);
-  }
-  if (size < 0x03ffffffffff) {
-    c_size[2] |= 0x04;
-    return mk_appendContextData(c, c_size+2, 6);
-  }
-  if (size < 0x01ffffffffffff) {
-    c_size[1] |= 0x02;
-    return mk_appendContextData(c, c_size+1, 7);
-  }
-  return mk_appendContextData(c, c_size, 9);
-}
-
-static int    mk_writeSSize(mk_Context *c, int64_t size) {
-  uint64_t    u_size = (uint64_t)llabs(size);
-  unsigned    size_size = mk_ebmlSizeSize( u_size << 1 ); // We need to shift by one to get the correct size here.
-
-  switch (size_size)
-  {
-    case 1:
-      size += 0x3f;
-      break;
-    case 2:
-      size += 0x1fff;
-      break;
-    case 3:
-      size += 0x0fffff;
-      break;
-    case 4:
-      size += 0x07ffffff;
-      break;
-    case 5:
-      size += 0x03ffffffff;
-      break;
-    case 6:
-      size += 0x01ffffffffff;
-      break;
-    case 7:
-      size += 0x00ffffffffffff;
-      break;
-    default:    // Matroska currently doesn't support any int > 56-bit.
-      return -1;
-  }
-
-  return mk_writeSize(c, size);
-}
-
-static int    mk_flushContextID(mk_Context *c) {
-  unsigned char size_undf[8] = {0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-
-  if (c->id == 0)
-    return 0;
-
-  CHECK(mk_writeID(c->parent, c->id));
-  CHECK(mk_appendContextData(c->parent, &size_undf, 8));
-
-  c->id = 0;
-
-  return 0;
-}
-
-int    mk_flushContextData(mk_Context *c) {
-  if (c->d_cur == 0)
-    return 0;
-
-  if (c->parent)
-    CHECK(mk_appendContextData(c->parent, c->data, c->d_cur));
-  else
-    if (fwrite(c->data, c->d_cur, 1, c->owner->fp) != 1)
-      return -1;
-
-  c->d_cur = 0;
-
-  return 0;
-}
-
-int    mk_closeContext(mk_Context *c, off_t *off) {
-  if (c->id) {
-    CHECK(mk_writeID(c->parent, c->id));
-    CHECK(mk_writeSize(c->parent, c->d_cur));
-  }
-
-  if (c->parent && off != NULL)
-    *off += c->parent->d_cur;
-
-  CHECK(mk_flushContextData(c));
-
-  if (c->next)
-    c->next->prev = c->prev;
-  *(c->prev) = c->next;
-  c->next = c->owner->freelist;
-  c->owner->freelist = c;
-
-  return 0;
-}
-
-static void   mk_destroyContexts(mk_Writer *w) {
-  mk_Context  *cur, *next;
-
-  for (cur = w->freelist; cur; cur = next) {
-    next = cur->next;
-    free(cur->data);
-    free(cur);
-  }
-
-  for (cur = w->actlist; cur; cur = next) {
-    next = cur->next;
-    free(cur->data);
-    free(cur);
-  }
-
-  w->freelist = w->actlist = w->root = NULL;
-}
-
-int    mk_writeStr(mk_Context *c, unsigned id, const char *str) {
-  size_t  len = strlen(str);
-
-  CHECK(mk_writeID(c, id));
-  CHECK(mk_writeSize(c, len));
-  CHECK(mk_appendContextData(c, str, len));
-  return 0;
-}
-
-int    mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size) {
-  CHECK(mk_writeID(c, id));
-  CHECK(mk_writeSize(c, size));
-  CHECK(mk_appendContextData(c, data, size));
-  return 0;
-}
-
-int    mk_writeUInt(mk_Context *c, unsigned id, uint64_t ui) {
-  unsigned char   c_ui[8] = { ui >> 56, ui >> 48, ui >> 40, ui >> 32, ui >> 24, ui >> 16, ui >> 8, ui };
-  unsigned    i = 0;
-
-  CHECK(mk_writeID(c, id));
-  while (i < 7 && c_ui[i] == 0)
-    ++i;
-  CHECK(mk_writeSize(c, 8 - i));
-  CHECK(mk_appendContextData(c, c_ui+i, 8 - i));
-  return 0;
-}
-
-static int    mk_writeSInt(mk_Context *c, unsigned id, int64_t si) {
-  unsigned char   c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
-  unsigned    i = 0;
-
-  CHECK(mk_writeID(c, id));
-  if (si < 0)
-    while (i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80)
-      ++i;
-  else
-    while (i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80))
-      ++i;
-  CHECK(mk_writeSize(c, 8 - i));
-  CHECK(mk_appendContextData(c, c_si+i, 8 - i));
-  return 0;
-}
-
-static int    mk_writeFloatRaw(mk_Context *c, float f) {
-  union {
-    float f;
-    unsigned u;
-  } u;
-  unsigned char c_f[4];
-
-  u.f = f;
-  c_f[0] = u.u >> 24;
-  c_f[1] = u.u >> 16;
-  c_f[2] = u.u >> 8;
-  c_f[3] = u.u;
-
-  return mk_appendContextData(c, c_f, 4);
-}
-
-int    mk_writeFloat(mk_Context *c, unsigned id, float f) {
-  CHECK(mk_writeID(c, id));
-  CHECK(mk_writeSize(c, 4));
-  CHECK(mk_writeFloatRaw(c, f));
-  return 0;
-}
-
-static int    mk_writeVoid(mk_Context *c, unsigned length) {
+int    mk_writeVoid(mk_Context *c, unsigned length) {
   char *c_void = calloc(length, sizeof(char));
 
   CHECK(mk_writeID(c, 0xec));
@@ -299,38 +35,6 @@ static int    mk_writeVoid(mk_Context *c, unsigned length) {
   return 0;
 }
 
-static unsigned   mk_ebmlSizeSize(uint64_t s) {
-  if (s < 0x7f)
-    return 1;
-  if (s < 0x3fff)
-    return 2;
-  if (s < 0x1fffff)
-    return 3;
-  if (s < 0x0fffffff)
-    return 4;
-  if (s < 0x07ffffffff)
-    return 5;
-  if (s < 0x03ffffffffff)
-    return 6;
-  if (s < 0x01ffffffffffff)
-    return 7;
-  return 8;
-}
-
-static unsigned   mk_ebmlSIntSize(int64_t si) {
-  unsigned char   c_si[8] = { si >> 56, si >> 48, si >> 40, si >> 32, si >> 24, si >> 16, si >> 8, si };
-  unsigned    i = 0;
-
-  if (si < 0)
-    while (i < 7 && c_si[i] == 0xff && c_si[i+1] & 0x80)
-      ++i;
-  else
-    while (i < 7 && c_si[i] == 0 && !(c_si[i+1] & 0x80))
-      ++i;
-
-  return 8 - i;
-}
-
 mk_Writer *mk_createWriter(const char *filename, int64_t timescale, uint8_t vlc_compat) {
   mk_Writer *w = malloc(sizeof(*w));
   if (w == NULL)
diff --git a/src/matroska.h b/src/matroska.h
index 4aa2a7f..c21d287 100644
--- a/src/matroska.h
+++ b/src/matroska.h
@@ -115,16 +115,36 @@ struct mk_Track_s {
   } frame;
 };
 
+/* EBML */
 mk_Context *mk_createContext(mk_Writer *w, mk_Context *parent, unsigned id);
-int  mk_writeUInt(mk_Context *c, unsigned id, uint64_t ui);
-int  mk_writeFloat(mk_Context *c, unsigned id, float f);
-int  mk_writeStr(mk_Context *c, unsigned id, const char *str);
-int  mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size);
-int  mk_flushContextData(mk_Context *c);
-int  mk_closeContext(mk_Context *c, off_t *off);
-int  mk_writeSeek(mk_Writer *w, off_t *pointer);
-int  mk_writeTracks(mk_Writer *w, mk_Context *tracks);
-int  mk_writeChapters(mk_Writer *w);
-static unsigned   mk_ebmlSizeSize(uint64_t s);
+int         mk_appendContextData(mk_Context *c, const void *data, unsigned size);
+int         mk_writeID(mk_Context *c, unsigned id);
+int         mk_writeSize(mk_Context *c, uint64_t size);
+int         mk_writeSSize(mk_Context *c, int64_t size);
+int         mk_flushContextID(mk_Context *c);
+int         mk_flushContextData(mk_Context *c);
+int         mk_closeContext(mk_Context *c, off_t *off);
+void        mk_destroyContexts(mk_Writer *w);
+int         mk_writeStr(mk_Context *c, unsigned id, const char *str);
+int         mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size);
+int         mk_writeUInt(mk_Context *c, unsigned id, uint64_t ui);
+int         mk_writeSInt(mk_Context *c, unsigned id, int64_t si);
+int         mk_writeFloatRaw(mk_Context *c, float f);
+int         mk_writeFloat(mk_Context *c, unsigned id, float f);
+unsigned    mk_ebmlSizeSize(uint64_t s);
+unsigned    mk_ebmlSIntSize(int64_t si);
+/* EBML */
+
+int         mk_writeVoid(mk_Context *c, unsigned length);
+mk_Context *mk_createContext(mk_Writer *w, mk_Context *parent, unsigned id);
+int         mk_writeUInt(mk_Context *c, unsigned id, uint64_t ui);
+int         mk_writeFloat(mk_Context *c, unsigned id, float f);
+int         mk_writeStr(mk_Context *c, unsigned id, const char *str);
+int         mk_writeBin(mk_Context *c, unsigned id, const void *data, unsigned size);
+int         mk_flushContextData(mk_Context *c);
+int         mk_closeContext(mk_Context *c, off_t *off);
+int         mk_writeSeek(mk_Writer *w, off_t *pointer);
+int         mk_writeTracks(mk_Writer *w, mk_Context *tracks);
+int         mk_writeChapters(mk_Writer *w);
 
 #endif
-- 
2.11.4.GIT