send videoInfo (from transcoder) to VDR

Author: Zabrimus

Diff for: mainapp.cpp

@@ -311,6 +311,13 @@ void startHttpServer(std::string browserIp, int browserPort, std::string vdrIp,
         }
     });
 
+    svr.Get("/StopVideo", [&transcoderRemoteClient](const httplib::Request &req, httplib::Response &res) {
+        transcoderRemoteClient.Stop();
+
+        res.status = 200;
+        res.set_content("ok", "text/plain");
+    });
+
     svr.set_exception_handler([](const auto& req, auto& res, std::exception_ptr ep) {
         auto fmt = "<h1>Error 500</h1><p>%s</p>";
         char buf[BUFSIZ];

Diff for: test-tools/ffmpeghandler.cpp

@@ -69,7 +69,7 @@ bool FFmpegHandler::streamVideo(std::string url) {
 
     // TODO: Evt. Transcoding durchführen. Die Commandline muss generischer werden.
     DEBUG("Start transcoder");
-    client->StartVideo();
+    client->StartVideo(std::string());
 
     std::string cmdLine = "ffmpeg -re -y -i " + url +  " -c copy -f mpegts " + fifoFilename;
     streamHandler = new TinyProcessLib::Process(cmdLine, "",

Diff for: transcoderremoteclient.cpp

@@ -10,7 +10,7 @@ TranscoderRemoteClient::~TranscoderRemoteClient() {
     delete client;
 }
 
-bool TranscoderRemoteClient::Probe(std::string url, std::string cookies, std::string referer, std::string userAgent, std::string postfix) {
+std::string TranscoderRemoteClient::Probe(std::string url, std::string cookies, std::string referer, std::string userAgent, std::string postfix) {
     httplib::Params params;
     params.emplace("url", url);
     params.emplace("cookies", cookies);
@@ -23,17 +23,16 @@ bool TranscoderRemoteClient::Probe(std::string url, std::string cookies, std::st
     if (auto res = client->Post("/Probe", params)) {
         if (res->status != 200) {
             TRACE("Http result: {}", res->status);
-            return false;
+            return "";
         } else {
             TRACE("Probe sent: {}", res->status);
+            return res->body;
         }
     } else {
         auto err = res.error();
         ERROR("Http error: {}", httplib::to_string(err));
-        return false;
+        return "";
     }
-
-    return true;
 }
 
 bool TranscoderRemoteClient::StreamUrl(std::string url, std::string cookies, std::string referer, std::string userAgent) {

Diff for: transcoderremoteclient.h

@@ -8,7 +8,8 @@ class TranscoderRemoteClient {
     explicit TranscoderRemoteClient(std::string transcoderIp, int transcoderPort, std::string browserIp, int browserPort);
     ~TranscoderRemoteClient();
 
-    bool Probe(std::string url, std::string cookies, std::string referer, std::string userAgent, std::string postfix);
+    std::string
+    Probe(std::string url, std::string cookies, std::string referer, std::string userAgent, std::string postfix);
     bool StreamUrl(std::string url, std::string cookies, std::string referer, std::string userAgent);
     bool Pause();
     bool Seek(std::string seekTo);

Diff for: v8handler.cpp

@@ -8,19 +8,22 @@
 bool startVideo;
 bool videoReset;
 
+std::string videoInfo;
+
 void V8Handler::stopVdrVideo() {
-    int waitTime = 50; // ms
-    int count = 1000 / waitTime;
+    int waitTime = 10; // ms
+    int count = 5000 / waitTime;
     startVideo = false;
 
     while (count-- > 0 && !startVideo) {
         std::this_thread::sleep_for(std::chrono::milliseconds(waitTime));
     }
 
     if (startVideo) {
-        vdrRemoteClient->ResetVideo();
+        vdrRemoteClient->ResetVideo(videoInfo);
         videoReset = true;
     } else {
+        videoInfo = "";
         vdrRemoteClient->StopVideo();
         videoReset = false;
     }
@@ -34,6 +37,8 @@ V8Handler::V8Handler(std::string bIp, int bPort, std::string tIp, int tPort, std
 
     lastVideoX = lastVideoY = lastVideoW = lastVideoH = 0;
     lastFullscreen = false;
+
+    videoInfo = "";
 }
 
 V8Handler::~V8Handler() {
@@ -80,8 +85,6 @@ bool V8Handler::Execute(const CefString &name, CefRefPtr<CefV8Value> object, con
 
     if (name == "StreamVideo") {
         if (!arguments.empty()) {
-            startVideo = true;
-
             const auto& urlParam = arguments.at(0);
             auto url = urlParam.get()->GetStringValue();
 
@@ -97,9 +100,14 @@ bool V8Handler::Execute(const CefString &name, CefRefPtr<CefV8Value> object, con
             TRACE("Video URL: {}", url.ToString());
 
             // 1. Step call Probe
-            if (!transcoderRemoteClient->Probe(url, cookies, referer, userAgent, std::to_string(now))) {
+            videoInfo = transcoderRemoteClient->Probe(url, cookies, referer, userAgent, std::to_string(now));
+            startVideo = true;
+
+            TRACE("Video Info:  {}", videoInfo);
+
+            if (videoInfo.empty()) {
                 // transcoder not available
-                ERROR("Probe failed: Encrypted stream or transcoder not available.");
+                ERROR("Probe failed: Transcoder not available, wrong video URL or another error.");
                 return false;
             }
 
@@ -111,7 +119,7 @@ bool V8Handler::Execute(const CefString &name, CefRefPtr<CefV8Value> object, con
             }
 
             if (!videoReset) {
-                vdrRemoteClient->StartVideo();
+                vdrRemoteClient->StartVideo(videoInfo);
             }
         }
 
@@ -188,6 +196,7 @@ bool V8Handler::Execute(const CefString &name, CefRefPtr<CefV8Value> object, con
             const auto w = arguments.at(2)->GetIntValue();
             const auto h = arguments.at(3)->GetIntValue();
 
+            // TODO: Ist das noch notwendig? Aufgrund der Änderungen auf mutation-summary sollte das nicht mehr passieren.
             if ((w <= 160 || h <= 100) || (w == 300 && h == 150 && x == 0)) {
                 // ignore these video sizes
                 retval = CefV8Value::CreateBool(true);

Diff for: vdrremoteclient.cpp

@@ -87,12 +87,15 @@ bool VdrRemoteClient::ProcessTSPacket(std::string packets) const {
     return true;
 }
 
-bool VdrRemoteClient::StartVideo() {
+bool VdrRemoteClient::StartVideo(std::string videoInfo) {
     const std::lock_guard<std::mutex> lock(httpMutex);
 
     TRACE("Call VdrRemoteClient::StartVideo");
 
-    if (auto res = client->Get("/StartVideo")) {
+    httplib::Params params;
+    params.emplace("videoInfo", videoInfo);
+
+    if (auto res = client->Post("/StartVideo", params)) {
         if (res->status != 200) {
             ERROR("Http result: {}", res->status);
             return false;
@@ -226,12 +229,15 @@ bool VdrRemoteClient::SendHello() {
     return true;
 }
 
-bool VdrRemoteClient::ResetVideo() {
+bool VdrRemoteClient::ResetVideo(std::string videoInfo) {
     const std::lock_guard<std::mutex> lock(httpMutex);
 
     TRACE("Call VdrRemoteClient::ResetVideo");
 
-    if (auto res = client->Get("/ResetVideo")) {
+    httplib::Params params;
+    params.emplace("videoInfo", videoInfo);
+
+    if (auto res = client->Post("/ResetVideo", params)) {
         if (res->status != 200) {
             ERROR("Http result: {}", res->status);
             return false;

Diff for: vdrremoteclient.h

@@ -12,11 +12,11 @@ class VdrRemoteClient {
     bool ProcessOsdUpdateQoi(int disp_width, int disp_height, int x, int y, const std::string& imageQoi);
     bool ProcessTSPacket(std::string packets) const;
 
-    bool StartVideo();
+    bool StartVideo(std::string videoInfo);
     bool StopVideo();
     bool Pause();
     bool Resume();
-    bool ResetVideo();
+    bool ResetVideo(std::string videoInfo);
 
     bool VideoSize(int x, int y, int w, int h);
     bool VideoFullscreen();