decoupled the muxer from the service link.

diff --git a/src/dvr/dvr_rec.c b/src/dvr/dvr_rec.c
index ee0d906b128247e344113329f760c194626e2eb4..ffe430113274f5c540a152376dd377298e3f5019 100755 (executable)
--- a/src/dvr/dvr_rec.c
+++ b/src/dvr/dvr_rec.c
@@ -327,7 +327,7 @@ dvr_rec_start(dvr_entry_t *de, const streaming_start_t *ss)
   int i;
   dvr_config_t *cfg = dvr_config_find_by_name_default(de->de_config_name);
 
-  de->de_mux = muxer_create(de->de_s->ths_service, de->de_mc);
+  de->de_mux = muxer_create(de->de_mc);
   if(!de->de_mux) {
     dvr_rec_fatal_error(de, "Unable to create muxer");
     return;

diff --git a/src/muxer.c b/src/muxer.c
index 2afdf08aa00be5d9557869709537445fe1954b6e..763219f4f0fd2f69daa48f6436944fe0b8cbc15b 100644 (file)
--- a/src/muxer.c
+++ b/src/muxer.c
@@ -163,11 +163,11 @@ muxer_container_txt2type(const char *str)
  * Create a new muxer
  */
 muxer_t* 
-muxer_create(service_t *s, muxer_container_type_t mc)
+muxer_create(muxer_container_type_t mc)
 {
   muxer_t *m;
 
-  m = pass_muxer_create(s, mc);
+  m = pass_muxer_create(mc);
 
   if(!m)
     m = tvh_muxer_create(mc);

diff --git a/src/muxer.h b/src/muxer.h
index f6bf2116b5b4ff40b43d9707222d5f75bcb083d5..77767f3e258492c7edca010cc4827b939504f92e 100644 (file)
--- a/src/muxer.h
+++ b/src/muxer.h
@@ -63,7 +63,7 @@ const char*            muxer_container_mimetype(muxer_container_type_t mc, int v
 const char*            muxer_container_suffix  (muxer_container_type_t mc, int video);
 
 // Muxer factory
-muxer_t *muxer_create(struct service *s, muxer_container_type_t mc);
+muxer_t *muxer_create(muxer_container_type_t mc);
 
 // Wrapper functions
 int         muxer_open_file   (muxer_t *m, const char *filename);

diff --git a/src/muxer_pass.c b/src/muxer_pass.c
index 2a1804e3ee5142913ad08b6f15a500ba99102299..7305343838b7b6d6034ee5078dc71aa11f5d0399 100644 (file)
--- a/src/muxer_pass.c
+++ b/src/muxer_pass.c
@@ -51,7 +51,6 @@ typedef struct pass_muxer {
   /* TS muxing */
   uint8_t  *pm_pat;
   uint8_t  *pm_pmt;
-  uint16_t pm_pmt_pid;
   uint32_t pm_ic; // Injection counter
   uint32_t pm_pc; // Packet counter
 } pass_muxer_t;
@@ -66,8 +65,10 @@ pass_muxer_mime(muxer_t* m, const struct streaming_start *ss)
   int i;
   int has_audio;
   int has_video;
+  muxer_container_type_t mc;
   const streaming_start_component_t *ssc;
-  
+  const source_info_t *si = &ss->ss_si;
+
   has_audio = 0;
   has_video = 0;
 
@@ -81,10 +82,17 @@ pass_muxer_mime(muxer_t* m, const struct streaming_start *ss)
     has_audio |= SCT_ISAUDIO(ssc->ssc_type);
   }
 
+  if(si->si_type == S_MPEG_TS)
+    mc = MC_MPEGTS;
+  else if(si->si_type == S_MPEG_PS)
+    mc = MC_MPEGPS;
+  else
+    mc = MC_UNKNOWN;
+
   if(has_video)
-    return muxer_container_mimetype(m->m_container, 1);
+    return muxer_container_mimetype(mc, 1);
   else if(has_audio)
-    return muxer_container_mimetype(m->m_container, 0);
+    return muxer_container_mimetype(mc, 0);
   else
     return muxer_container_mimetype(MC_UNKNOWN, 0);
 }
@@ -97,16 +105,16 @@ static int
 pass_muxer_reconfigure(muxer_t* m, const struct streaming_start *ss)
 {
   pass_muxer_t *pm = (pass_muxer_t*)m;
+  const source_info_t *si = &ss->ss_si;
 
-  if(pm->m_container == MC_MPEGTS) {
-    
+  if(si->si_type == S_MPEG_TS) {
     memset(pm->pm_pat, 0xff, 188);
     pm->pm_pat[0] = 0x47;
     pm->pm_pat[1] = 0x40;
     pm->pm_pat[2] = 0x00;
     pm->pm_pat[3] = 0x10;
     pm->pm_pat[4] = 0x00;
-    if(psi_build_pat(NULL, pm->pm_pat+5, 183, pm->pm_pmt_pid) < 0) {
+    if(psi_build_pat(NULL, pm->pm_pat+5, 183, ss->ss_pmt_pid) < 0) {
       pm->m_errors++;
       tvhlog(LOG_ERR, "pass", "%s: Unable to build pat", pm->pm_filename);
       return -1;
@@ -114,8 +122,8 @@ pass_muxer_reconfigure(muxer_t* m, const struct streaming_start *ss)
 
     memset(pm->pm_pmt, 0xff, 188);
     pm->pm_pmt[0] = 0x47;
-    pm->pm_pmt[1] = 0x40 | (pm->pm_pmt_pid >> 8);
-    pm->pm_pmt[2] = 0x00 | (pm->pm_pmt_pid >> 0);
+    pm->pm_pmt[1] = 0x40 | (ss->ss_pmt_pid >> 8);
+    pm->pm_pmt[2] = 0x00 | (ss->ss_pmt_pid >> 0);
     pm->pm_pmt[3] = 0x10;
     pm->pm_pmt[4] = 0x00;
     if(psi_build_pmt(ss, pm->pm_pmt+5, 183, ss->ss_pcr_pid) < 0) {
@@ -305,7 +313,7 @@ pass_muxer_destroy(muxer_t *m)
  * Create a new passthrough muxer
  */
 muxer_t*
-pass_muxer_create(service_t *s, muxer_container_type_t mc)
+pass_muxer_create(muxer_container_type_t mc)
 {
   pass_muxer_t *pm;
 
@@ -323,14 +331,8 @@ pass_muxer_create(service_t *s, muxer_container_type_t mc)
   pm->m_close        = pass_muxer_close;
   pm->m_destroy      = pass_muxer_destroy;
 
-  if(s->s_type == SERVICE_TYPE_V4L) {
-    pm->m_container = MC_MPEGPS;
-  } else {
-    pm->m_container = MC_MPEGTS;
-    pm->pm_pmt_pid = s->s_pmt_pid;
-    pm->pm_pat = malloc(188);
-    pm->pm_pmt = malloc(188);
-  }
+  pm->pm_pat = malloc(188);
+  pm->pm_pmt = malloc(188);
 
   return (muxer_t *)pm;
 }

diff --git a/src/muxer_pass.h b/src/muxer_pass.h
index b3dc9c88dd5009bbc6cbb496471579ab5357b53e..919c2104293a5ad86e4fb1f270e29378bde78a71 100644 (file)
--- a/src/muxer_pass.h
+++ b/src/muxer_pass.h
@@ -21,6 +21,6 @@
 
 #include "muxer.h"
 
-muxer_t* pass_muxer_create(struct service *s, muxer_container_type_t mc);
+muxer_t* pass_muxer_create(muxer_container_type_t mc);
 
 #endif

diff --git a/src/webui/webui.c b/src/webui/webui.c
index e00b517f805663d6694bf254fd86fda01e583f27..a4c084b3b5de7a34ee11feb523710bcb98927470 100644 (file)
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -153,7 +153,7 @@ http_stream_run(http_connection_t *hc, streaming_queue_t *sq,
   socklen_t errlen = sizeof(err);
   const char *name;
 
-  mux = muxer_create(s->ths_service, mc);
+  mux = muxer_create(mc);
   if(muxer_open_stream(mux, hc->hc_fd))
     run = 0;