muxer: matroska - merge code to one file

tvheadend · Sep 30, 2015 · ec10b49 · ec10b49
1 parent 97a215f
commit ec10b49
Show file tree

Hide file tree

Showing 8 changed files with 468 additions and 656 deletions.
diff --git a/Makefile b/Makefile
@@ -267,9 +267,8 @@ SRCS-2 += \
 SRCS-2 += \
 	src/muxer.c \
 	src/muxer/muxer_pass.c \
-	src/muxer/muxer_tvh.c \
-	src/muxer/tvh/ebml.c \
-	src/muxer/tvh/mkmux.c \
+	src/muxer/ebml.c \
+	src/muxer/muxer_mkv.c
 
 SRCS += $(SRCS-2)
 I18N-C += $(SRCS-2)

diff --git a/src/muxer.c b/src/muxer.c
@@ -22,7 +22,7 @@
 #include "tvheadend.h"
 #include "service.h"
 #include "muxer.h"
-#include "muxer/muxer_tvh.h"
+#include "muxer/muxer_mkv.h"
 #include "muxer/muxer_pass.h"
 #if CONFIG_LIBAV
 #include "muxer/muxer_libav.h"
@@ -223,7 +223,7 @@ muxer_create(const muxer_config_t *m_cfg)
   m = pass_muxer_create(m_cfg);
 
   if(!m)
-    m = tvh_muxer_create(m_cfg);
+    m = mkv_muxer_create(m_cfg);
 
 #if CONFIG_LIBAV
   if(!m)

diff --git a/src/muxer/tvh/ebml.c → src/muxer/ebml.c b/src/muxer/tvh/ebml.c → src/muxer/ebml.c
@@ -65,7 +65,7 @@ ebml_append_size(htsbuf_queue_t *q, uint32_t size)
 }
 
 
-void 
+void
 ebml_append_xiph_size(htsbuf_queue_t *q, int size)
 {
   int i;
@@ -95,7 +95,7 @@ ebml_append_string(htsbuf_queue_t *q, unsigned id, const char *str)
 void
 ebml_append_uint(htsbuf_queue_t *q, unsigned id, int64_t ui)
 {
-  uint8_t u8[8] = {ui >> 56, ui >> 48, ui >> 40, ui >> 32, 
+  uint8_t u8[8] = {ui >> 56, ui >> 48, ui >> 40, ui >> 32,
 		   ui >> 24, ui >> 16, ui >>  8, ui };
   int i = 0;
   while( i < 7 && !u8[i] )

diff --git a/src/muxer/tvh/ebml.h → src/muxer/ebml.h b/src/muxer/tvh/ebml.h → src/muxer/ebml.h
@@ -9,7 +9,7 @@ void ebml_append_size(htsbuf_queue_t *q, uint32_t size);
 
 void ebml_append_xiph_size(htsbuf_queue_t *q, int size);
 
-void ebml_append_bin(htsbuf_queue_t *q, unsigned id, 
+void ebml_append_bin(htsbuf_queue_t *q, unsigned id,
 		    const void *data, size_t len);
 
 void ebml_append_string(htsbuf_queue_t *q, unsigned id, const char *str);