Melhorias no componente extrator

Wesnydy Ribeiro
1 parent a694fed4
Showing 5 changed files with 28 additions and 6 deletions Show diff stats
extrator/src/extratorSRT.cpp
extrator/src/extratorTXT.cpp
extrator/src/include/extratorSRT.h
extrator/src/include/extratorTXT.h
servico/src/serviceWindowGeneration.cpp
@@ -51,9 +51,16 @@ void ExtratorSRT::notifyEndExtraction(int size) {
 void ExtratorSRT::setFilePath(char* path){
     filePath = (char*) path; 
-    string command = "perl -p -e \'s/\n/ /\' ";
-    command.append(filePath).append(" > /dev/null");
-    system(command.c_str());
+    string command1 = "perl -p -e 's/\r$//' < ";
+    command1.append(filePath).append(" > ").append(INPUT_SRT);
+    system(command1.c_str());
+
+    string command2 = "iconv -f";
+    command2.append(" $(file --mime-encoding -b ")
+    .append(INPUT_SRT).append(")")
+    .append(" -t utf-8 ").append(INPUT_SRT).append(" > ").append(filePath)
+    .append(" && rm -f ").append(INPUT_SRT);
+    system(command2.c_str());
 }
 bool ExtratorSRT::isFinished(){
@@ -75,7 +82,7 @@ void ExtratorSRT::Run(){
         subtitle = next();
         sub_text = subtitle->getSubtitleText();
         notifyListeners((unsigned char*)sub_text.c_str(), calcula_pts((double) subtitle->getTimeIn()));
-        cout << " . ";
+        //cout << " . ";
         sub_index++;
         free(subtitle);
     }
@@ -57,7 +57,17 @@ void ExtratorTXT::notifyEndExtraction(int size) {
 }
 void ExtratorTXT::setFilePath(char* path){
-    filePath = (char*) path;
+    filePath = (char*) path; 
+    string command1 = "perl -p -e 's/\r$//' < ";
+    command1.append(filePath).append(" > ").append(INPUT_TXT);
+    system(command1.c_str());
+
+    string command2 = "iconv -f";
+    command2.append(" $(file --mime-encoding -b ")
+    .append(INPUT_TXT).append(")")
+    .append(" -t utf-8 ").append(INPUT_TXT).append(" > ").append(filePath)
+    .append(" && rm -f ").append(INPUT_TXT);
+    system(command2.c_str());
 }
 bool ExtratorTXT::isFinished(){
@@ -77,7 +87,7 @@ void ExtratorTXT::Run(){
         line = bff_reader->readLine();
         if (line.length() > 0){ 
             notifyListeners((unsigned char*) line.c_str());
-            cout << " . ";        
+            //cout << " . ";        
             line_index++;
         }
         }catch (EOFException &ex){
@@ -22,6 +22,7 @@
 #define SIZE_CSCAPE 1
 #define TARGET_TIME "-->"
+#define INPUT_SRT "vlibras_user/inputSRT.srt"
 //#define MAX_LINE 1024
 using namespace jthread;
@@ -20,6 +20,8 @@
 #include "listenerTXT.h"
 #include "extratorException.h"
+#define INPUT_TXT "vlibras_user/inputTXT.txt"
+
 using namespace jthread;
 using namespace std;
@@ -200,6 +200,7 @@ void ServiceWindowGeneration::notifyTranslation(vector&lt;string&gt; * glosas) {
 void ServiceWindowGeneration::transcodeVideoToWebm() {
     //printf("[INFO]: A transcodificação para .webm está ativada!\n");
+    DDDPRINTF("[AGUARDE] Transcodificando o vídeo de Libras...\n");
     string command = "ffmpeg -i ";
     command.append(path_libras)
     .append(" -vcodec libvpx -acodec libvorbis ")
@@ -216,6 +217,7 @@ void ServiceWindowGeneration::transcodeVideoToMp4() {
             transcodeVideoToWebm();
     else{
          //printf("[INFO]: A transcodificação para .mp4 está ativada!\n");
+        DDDPRINTF("[AGUARDE] Transcodificando o vídeo de Libras...\n");
         string command = "ffmpeg -i ";
         command.append(path_libras)
         .append(" -qscale 0 -strict experimental -vcodec libx264 -preset fast -r 30 ")
	@@ -22,6 +22,7 @@		@@ -22,6 +22,7 @@
22		22
23	#define SIZE_CSCAPE 1	23	#define SIZE_CSCAPE 1
24	#define TARGET_TIME "-->"	24	#define TARGET_TIME "-->"
		25	+#define INPUT_SRT "vlibras_user/inputSRT.srt"
25	//#define MAX_LINE 1024	26	//#define MAX_LINE 1024
26		27
27	using namespace jthread;	28	using namespace jthread;
	@@ -20,6 +20,8 @@		@@ -20,6 +20,8 @@
20	#include "listenerTXT.h"	20	#include "listenerTXT.h"
21	#include "extratorException.h"	21	#include "extratorException.h"
22		22
		23	+#define INPUT_TXT "vlibras_user/inputTXT.txt"
		24	+
23	using namespace jthread;	25	using namespace jthread;
24	using namespace std;	26	using namespace std;
25		27