From 9c8dd613c8e5628a2773d5b87ac0cf049486d1d9 Mon Sep 17 00:00:00 2001 From: Wesnydy Ribeiro Date: Wed, 8 Jul 2015 11:16:32 -0300 Subject: [PATCH] ajustes para rodar o script de renderização --- renderer/src/include/renderer.h | 10 +++++----- renderer/src/renderer.cpp | 28 ++++++++++++++++++++++++---- servico/src/serviceWindowGenerationFromRec.cpp | 4 ++-- servico/src/serviceWindowGenerationFromSRT.cpp | 4 ++-- servico/src/serviceWindowGenerationFromText.cpp | 2 +- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/renderer/src/include/renderer.h b/renderer/src/include/renderer.h index e897f92..4601da1 100644 --- a/renderer/src/include/renderer.h +++ b/renderer/src/include/renderer.h @@ -16,11 +16,10 @@ #include #include +#define PATH_RENDERER "vlibras_user/unityVideo/" #define END_FLAG "FINALIZE" -// #define HOST "150.165.205.127" -// #define PORTNO 5555 #define HOST "127.0.0.1" -#define PORTNO 12345 +#define PORTNO 5555 using namespace lavidlib; using namespace jthread; @@ -28,13 +27,12 @@ using namespace std; class Renderer : public Thread { public: - Renderer(); + Renderer(char* filename); ~Renderer(); bool isSending(); void receiveGlosa(std::string glosa, int64_t pts); void addListener(ListenerRenderer* listener); - void finalize(); void Run(); @@ -46,12 +44,14 @@ private: int count_task; int glosa_processed; + char* output; string glosa_copy; void notifyListeners(); void sendGlosa(); void connectToUnity(); void waitScreenShots(); + void serverInitialize(); }; #endif /* RENDERER_H */ diff --git a/renderer/src/renderer.cpp b/renderer/src/renderer.cpp index 570c016..882f1bb 100644 --- a/renderer/src/renderer.cpp +++ b/renderer/src/renderer.cpp @@ -1,11 +1,13 @@ #include "renderer.h" -Renderer::Renderer() { - core_socket = new StreamSocket(); - listeners = new list(); - running = true; +Renderer::Renderer(char* filename) { + this->output = filename; + // serverInitialize(); + running = true; count_task = 0; glosa_processed = 0; + core_socket = new StreamSocket(); + listeners = new list(); DPRINTF("Done!\n"); } @@ -16,6 +18,24 @@ Renderer::~Renderer() { DDDPRINTF("Renderer finalized!\n"); } +void Renderer::serverInitialize(){ + string render = "./render.sh "; + render.append(output).append(" \"VLIBRAS\"").append(" 1920 1080").append(" 1").append(" 30"); + + string command = "cd "; + char* shPath; + shPath = getenv("RENDERER"); + if(shPath != NULL) + command.append(shPath); + else + command.append(PATH_RENDERER); + + command.append(" && ").append(render); + cout << command << endl; + system(command.c_str()); + // sleep(1); +} + void Renderer::addListener(ListenerRenderer* listener) { listeners->push_back(listener); } diff --git a/servico/src/serviceWindowGenerationFromRec.cpp b/servico/src/serviceWindowGenerationFromRec.cpp index eab0ad3..3e1db50 100644 --- a/servico/src/serviceWindowGenerationFromRec.cpp +++ b/servico/src/serviceWindowGenerationFromRec.cpp @@ -15,7 +15,7 @@ ServiceWindowGenerationFromRec::ServiceWindowGenerationFromRec( vetor_pts = new vector(); rec = new Recognize(pathVideo, id, rate); tradutor = new TradutorPortGlosa(); - renderer = new Renderer(); + renderer = new Renderer(this->user_id); running = true; finish = false; DPRINTF("Done!\n"); @@ -37,7 +37,7 @@ ServiceWindowGenerationFromRec::ServiceWindowGenerationFromRec( vetor_pts = new vector(); rec = new Recognize(path_input, id); tradutor = new TradutorPortGlosa(); - renderer = new Renderer(); + renderer = new Renderer(this->user_id); try{ setPathContents(); }catch(RuntimeException ex){ diff --git a/servico/src/serviceWindowGenerationFromSRT.cpp b/servico/src/serviceWindowGenerationFromSRT.cpp index 197e892..8133202 100644 --- a/servico/src/serviceWindowGenerationFromSRT.cpp +++ b/servico/src/serviceWindowGenerationFromSRT.cpp @@ -16,7 +16,7 @@ ServiceWindowGenerationFromSRT::ServiceWindowGenerationFromSRT(char* pathVideo, legendas_enviadas = 0; vetor_pts = new vector(); tradutor = new TradutorPortGlosa(); - renderer = new Renderer(); + renderer = new Renderer(this->user_id); extrator_factory = new ExtratorFactory(); try{ setPathContents(); @@ -39,7 +39,7 @@ ServiceWindowGenerationFromSRT::ServiceWindowGenerationFromSRT(char* pathSRT, in legendas_enviadas = 0; vetor_pts = new vector(); tradutor = new TradutorPortGlosa(); - renderer = new Renderer(); + renderer = new Renderer(this->user_id); extrator_factory = new ExtratorFactory(); try{ setPathContents(); diff --git a/servico/src/serviceWindowGenerationFromText.cpp b/servico/src/serviceWindowGenerationFromText.cpp index 1be8b9e..c999e99 100644 --- a/servico/src/serviceWindowGenerationFromText.cpp +++ b/servico/src/serviceWindowGenerationFromText.cpp @@ -11,7 +11,7 @@ ServiceWindowGenerationFromText::ServiceWindowGenerationFromText(char* pathFile, legendas_enviadas = 0; vetor_pts = new vector(); tradutor = new TradutorPortGlosa(); - renderer = new Renderer(); + renderer = new Renderer(this->user_id); extrator_factory = new ExtratorFactory(); try{ setPathContents(); -- libgit2 0.21.2