profile, transcode: move transcode config to profiles, add new profil…

…e type
tvheadend · Oct 9, 2014 · 811191c · 811191c
1 parent 2481881
commit 811191c
Show file tree

Hide file tree

Showing 9 changed files with 382 additions and 154 deletions.
diff --git a/src/htsp_server.c b/src/htsp_server.c
@@ -34,9 +34,6 @@
 #if ENABLE_TIMESHIFT
 #include "timeshift.h"
 #endif
-#if ENABLE_LIBAV
-#include "plumbing/transcoding.h"
-#endif
 
 #include <pthread.h>
 #include <assert.h>
@@ -193,9 +190,8 @@ typedef struct htsp_subscription {
   streaming_target_t *hs_tshift;
 #endif
 
-#if ENABLE_LIBAV
-streaming_target_t *hs_transcoder;
-#endif
+  streaming_target_t *hs_work;
+  void (*hs_work_destroy)(streaming_target_t *);
 
   htsp_msg_q_t hs_q;
 
@@ -340,10 +336,8 @@ htsp_subscription_destroy(htsp_connection_t *htsp, htsp_subscription_t *hs)
   if(hs->hs_tsfix != NULL)
     tsfix_destroy(hs->hs_tsfix);
 
-#if ENABLE_LIBAV
-  if(hs->hs_transcoder != NULL)
-    transcoder_destroy(hs->hs_transcoder);
-#endif
+  if(hs->hs_work != NULL)
+    hs->hs_work_destroy(hs->hs_work);
 
 #if ENABLE_TIMESHIFT
   if(hs->hs_tshift)
@@ -1763,27 +1757,13 @@ htsp_method_subscribe(htsp_connection_t *htsp, htsmsg_t *in)
 #endif
 
 #if ENABLE_LIBAV
-  if (transcoding_enabled) {
-    transcoder_props_t props;
-
-    props.tp_vcodec = streaming_component_txt2type(htsmsg_get_str(in, "videoCodec"));
-    props.tp_acodec = streaming_component_txt2type(htsmsg_get_str(in, "audioCodec"));
-    props.tp_scodec = streaming_component_txt2type(htsmsg_get_str(in, "subtitleCodec"));
-
-    props.tp_resolution = htsmsg_get_u32_or_default(in, "maxResolution", 0);
-    props.tp_channels   = htsmsg_get_u32_or_default(in, "channels", 0);
-    props.tp_bandwidth  = htsmsg_get_u32_or_default(in, "bandwidth", 0);
-
-    if ((str = htsmsg_get_str(in, "language")))
-      strncpy(props.tp_language, str, 3);
-
-    if(props.tp_vcodec != SCT_UNKNOWN ||
-       props.tp_acodec != SCT_UNKNOWN ||
-       props.tp_scodec != SCT_UNKNOWN) {
-      st = hs->hs_transcoder = transcoder_create(st);
-      transcoder_set_properties(st, &props);
-      normts = 1;
-    }
+  const char *profile_id = htsmsg_get_str(in, "profile");
+  profile_t *pro = profile_find_by_uuid(profile_id) ?: profile_find_by_name(profile_id);
+
+  hs->hs_work = profile_work(pro, st, &hs->hs_work_destroy);
+  if (hs->hs_work) {
+    st = hs->hs_work;
+    normts = 1;
   }
 #endif
 
@@ -2142,27 +2122,23 @@ htsp_method_file_seek(htsp_connection_t *htsp, htsmsg_t *in)
   return rep;
 }
 
-
-#if ENABLE_LIBAV
 /**
  *
  */
 static htsmsg_t *
-htsp_method_getCodecs(htsp_connection_t *htsp, htsmsg_t *in)
+htsp_method_getProfiles(htsp_connection_t *htsp, htsmsg_t *in)
 {
   htsmsg_t *out, *l;
 
   l = htsmsg_create_list();
-  transcoder_get_capabilities(l);
+  profile_get_htsp_list(l);
 
   out = htsmsg_create_map();
 
-  htsmsg_add_msg(out, "encoders", l);
+  htsmsg_add_msg(out, "profiles", l);
 
   return out;
 }
-#endif
-
 
 /**
  * HTSP methods
@@ -2198,9 +2174,7 @@ struct {
   { "subscriptionSpeed",        htsp_method_speed,              ACCESS_STREAMING},
   { "subscriptionLive",         htsp_method_live,               ACCESS_STREAMING},
   { "subscriptionFilterStream", htsp_method_filter_stream,      ACCESS_STREAMING},
-#if ENABLE_LIBAV
-  { "getCodecs",                htsp_method_getCodecs,          ACCESS_STREAMING},
-#endif
+  { "getProfiles",              htsp_method_getProfiles,        ACCESS_STREAMING},
   { "fileOpen",                 htsp_method_file_open,          ACCESS_RECORDER},
   { "fileRead",                 htsp_method_file_read,          ACCESS_RECORDER},
   { "fileClose",                htsp_method_file_close,         ACCESS_RECORDER},

diff --git a/src/main.c b/src/main.c
@@ -147,9 +147,6 @@ const tvh_caps_t tvheadend_capabilities[] = {
 #if ENABLE_SATIP_CLIENT
   { "satip_client", NULL },
 #endif
-#if ENABLE_LIBAV
-  { "transcoding", &transcoding_enabled },
-#endif
 #if ENABLE_IMAGECACHE
   { "imagecache", (uint32_t*)&imagecache_conf.enabled },
 #endif

diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
@@ -1321,12 +1321,12 @@ transcoder_destroy(streaming_target_t *st)
 /**
  * 
  */ 
-void
-transcoder_get_capabilities(htsmsg_t *array)
+htsmsg_t *
+transcoder_get_capabilities(void)
 {
   AVCodec *p = NULL;
-  const char *name;
   streaming_component_type_t sct;
+  htsmsg_t *array = htsmsg_create_list();
 
   while ((p = av_codec_next(p))) {
 
@@ -1340,9 +1340,9 @@ transcoder_get_capabilities(htsmsg_t *array)
     if (sct == SCT_NONE)
       continue;
 
-    name = streaming_component_type2txt(sct);
-    htsmsg_add_str(array, NULL, name);
+    htsmsg_add_s32(array, NULL, sct);
   }
+  return array;
 }
 
 

diff --git a/src/plumbing/transcoding.h b/src/plumbing/transcoding.h
@@ -36,7 +36,7 @@ extern uint32_t transcoding_enabled;
 streaming_target_t *transcoder_create (streaming_target_t *output);
 void                transcoder_destroy(streaming_target_t *tr);
 
-void transcoder_get_capabilities(htsmsg_t *array);
+htsmsg_t *transcoder_get_capabilities(void);
 void transcoder_set_properties  (streaming_target_t *tr, 
 				 transcoder_props_t *prop);