DVR: quickfix for previous patch, fixes #2904

tvheadend · Jun 1, 2015 · 164caf0 · 164caf0
1 parent bc6efcf
commit 164caf0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/api/api_dvr.c b/src/api/api_dvr.c
@@ -258,7 +258,7 @@ api_dvr_autorec_create
   htsmsg_t *conf;
   dvr_config_t *cfg;
   dvr_autorec_entry_t *dae;
-  const char *config_uuid;
+  const char *s1;
 
   if (!(conf  = htsmsg_get_map(args, "conf")))
     return EINVAL;
@@ -268,11 +268,14 @@ api_dvr_autorec_create
   if (perm->aa_representative)
     htsmsg_set_str(conf, "creator", perm->aa_representative);
 
-  config_uuid = htsmsg_get_str(conf, "config_uuid");
+  s1 = htsmsg_get_str(conf, "config_uuid");
+  if (s1 == NULL)
+    s1 = htsmsg_get_str(conf, "config_name");
 
   pthread_mutex_lock(&global_lock);
-  cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, config_uuid);
+  cfg = dvr_config_find_by_list(perm->aa_dvrcfgs, s1);
   if (cfg) {
+    htsmsg_set_str(conf, "config_name", idnode_uuid_as_str(&cfg->dvr_id));
     dae = dvr_autorec_create(NULL, conf);
     if (dae) {
       dvr_autorec_save(dae);

diff --git a/src/input/mpegts/tsdemux.c b/src/input/mpegts/tsdemux.c
@@ -94,6 +94,9 @@ ts_recv_packet0
       }
       st->es_cc = (cc + 1) & 0xf;
     }
+
+    if (st->es_type == SCT_DVBSUB)
+      tvhlog_hexdump("pmt", tsb, 188);
 
     off = tsb[3] & 0x20 ? tsb[4] + 5 : 4;
 

diff --git a/src/parsers/parser_teletext.c b/src/parsers/parser_teletext.c
@@ -708,6 +708,8 @@ extract_subtitle(mpegts_service_t *t, elementary_stream_t *st,
     if ((cset = get_cset(ttm->ttm_charset[0])) == NULL)
       cset = char_table[0]; /* fallback */
 
+  printf("extract subtitle: %i\n", st->es_pid);
+
   for (i = 0; i < 23; i++) {
     is_font_tag_open = 0;
     current_color = 7; /* white = default */
@@ -797,6 +799,7 @@ extract_subtitle(mpegts_service_t *t, elementary_stream_t *st,
   st->es_curpts = pts;
 
   sub[off++] = 0;
+  printf("sub = '%s'\n", sub);
 
   th_pkt_t *pkt = pkt_alloc(sub, off, pts, pts);
   pkt->pkt_componentindex = st->es_index;
@@ -879,6 +882,7 @@ tt_decode_line(mpegts_service_t *t, elementary_stream_t *st, uint8_t *buf)
 
   line = mpag >> 3;
 
+  printf("line = %d\n", line);
   switch(line) {
   case 0:
     if(ttm->ttm_curpage != 0) {
@@ -953,6 +957,8 @@ teletext_input(mpegts_service_t *t, elementary_stream_t *st, const uint8_t *tsb)
   uint8_t buf[42];
 
   x = tsb + 4;
+  printf("telext input!!! %i %02x:%02x:%02x:%02x\n", st->es_pid, tsb[0], tsb[1], tsb[2], tsb[3]);
+  tvhlog_hexdump("bat", tsb, 188);
   for(i = 0; i < 4; i++) {
     if(*x == 2 || *x == 3) {
       for(j = 0; j < 42; j++)

diff --git a/src/parsers/parsers.c b/src/parsers/parsers.c
@@ -166,6 +166,8 @@ parse_mpeg_ts(service_t *t, elementary_stream_t *st, const uint8_t *data,
     break;
 
   case SCT_DVBSUB:
+    if (len > 0)
+      printf("DVBSUB data!!! %i\n", len);
     parse_subtitles(t, st, data, len, start);
     break;
 
@@ -1361,6 +1363,8 @@ parse_subtitles(service_t *t, elementary_stream_t *st, const uint8_t *data,
   if(st->es_parser_state == 0)
     return;
 
+  printf("subtitles append: %i\n", len);
+
   sbuf_append(&st->es_buf, data, len);
 
   if(st->es_buf.sb_ptr < 6)
@@ -1397,6 +1401,7 @@ parse_subtitles(service_t *t, elementary_stream_t *st, const uint8_t *data,
 
     // end_of_PES_data_field_marker
     if(buf[psize - 1] == 0xff) {
+      printf("subtitles sent: %i\n", psize - 1);
       pkt = pkt_alloc(buf, psize - 1, st->es_curpts, st->es_curdts);
       pkt->pkt_commercial = t->s_tt_commercial_advice;
       pkt->pkt_err = st->es_buf.sb_err;