From 7c68d56f24349e711ea00b80b340ea02c4c7ea98 Mon Sep 17 00:00:00 2001
From: Erickson Silva <erickson.silva@lavid.ufpb.br>
Date: Tue, 3 Jun 2014 17:30:35 -0300
Subject: [PATCH] Corrige geração de thumbnail e verifica. Serviço REC captura informações referentes ao PCR do .TS

---
 extratorSRT/src/extratorSRT.cpp                |  2 +-
 servico/src/serviceWindowGeneration.cpp        |  2 +-
 servico/src/serviceWindowGenerationFromREC.cpp | 14 +++++++++++---
 servico/src/serviceWindowGenerationFromSRT.cpp |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/extratorSRT/src/extratorSRT.cpp b/extratorSRT/src/extratorSRT.cpp
index 0040fca..55c5226 100644
--- a/extratorSRT/src/extratorSRT.cpp
+++ b/extratorSRT/src/extratorSRT.cpp
@@ -49,7 +49,7 @@ void ExtratorSRT::notifyEndExtraction(int sub_size) {
 void ExtratorSRT::setFilePath(char* path){
     filepath = (char*) path; 
     string command = "perl -p -e \'s/\n/ /\' ";
-    command.append(filepath);
+    command.append(filepath).append(" > /dev/null");
     system(command.c_str());
 }
 
diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp
index 5b29a70..bd69910 100644
--- a/servico/src/serviceWindowGeneration.cpp
+++ b/servico/src/serviceWindowGeneration.cpp
@@ -273,7 +273,7 @@ void ServiceWindowGeneration::transcodeVideoToMp4() {
 void ServiceWindowGeneration::createThumbnail(){
 
     string command = "ffmpeg -ss 10 -i ";
-    command.append(getPathInput())
+    command.append(PATH_API).append(user_id).append(".mp4")
     .append(" -vcodec png -vframes 1 -an -f rawvideo -y -vf scale=200:200 ")
     .append(PATH_API).append(user_id).append(".png");
     system(command.c_str());
diff --git a/servico/src/serviceWindowGenerationFromREC.cpp b/servico/src/serviceWindowGenerationFromREC.cpp
index 99ad487..bbd2889 100644
--- a/servico/src/serviceWindowGenerationFromREC.cpp
+++ b/servico/src/serviceWindowGenerationFromREC.cpp
@@ -42,17 +42,25 @@ void ServiceWindowGenerationFromREC::initialize() {
     inputfile = new InputFile(this->path_input);        
     monitor_pcr_base = new MonitorPCR();
 
+    if (strstr(this->path_input, "ts") != NULL) {
+        char* format_video = new char[3];
+        strcpy(format_video, "ts");
+        monitor_pcr_base->setFormatVideo(format_video);
+    }
+
     monitor_pcr_base->addListenerPCRBase(rec);
     inputfile->registraOuvinte(monitor_pcr_base);
 		
 	ServiceWindowGeneration::initialize();
 
     try{
-        rec->initialize();
         inputfile->initialize();                                
-    }catch(RecognizeException ex){
+        rec->initialize();
+    } catch(RecognizeException ex){
         throw ServiceException(ex.getMessage());
-    }
+    } catch(InputException ex){
+        throw ServiceException(ex.getMessage());
+    }  
 	this->Start();
 }
 
diff --git a/servico/src/serviceWindowGenerationFromSRT.cpp b/servico/src/serviceWindowGenerationFromSRT.cpp
index 3204920..685fb89 100644
--- a/servico/src/serviceWindowGenerationFromSRT.cpp
+++ b/servico/src/serviceWindowGenerationFromSRT.cpp
@@ -110,8 +110,8 @@ void ServiceWindowGenerationFromSRT::initialize() {
 	    ServiceWindowGeneration::initialize();
 	    
         try{
-            extratorSRT->initialize();  
             inputfile->initialize();                                
+            extratorSRT->initialize();  
         }catch(ExtratorSrtException ex){
             throw ServiceException(ex.getMessage());
         }catch(InputException ex){
--
libgit2 0.21.2