Corrige geração de thumbnail e verifica. Serviço REC captura informações referentes ao PCR do .TS

Erickson Silva
1 parent 260bb19d
Showing 4 changed files with 14 additions and 6 deletions Show diff stats
extratorSRT/src/extratorSRT.cpp
servico/src/serviceWindowGeneration.cpp
servico/src/serviceWindowGenerationFromREC.cpp
servico/src/serviceWindowGenerationFromSRT.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());
 }
  
@@ -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());
@@ -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();
 }
  
@@ -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){
...	...	@@ -49,7 +49,7 @@ void ExtratorSRT::notifyEndExtraction(int sub_size) {
49	49	void ExtratorSRT::setFilePath(char* path){
50	50	filepath = (char*) path;
51	51	string command = "perl -p -e \'s/\n/ /\' ";
52		- command.append(filepath);
	52	+ command.append(filepath).append(" > /dev/null");
53	53	system(command.c_str());
54	54	}
55	55
...	...
...	...	@@ -273,7 +273,7 @@ void ServiceWindowGeneration::transcodeVideoToMp4() {
273	273	void ServiceWindowGeneration::createThumbnail(){
274	274
275	275	string command = "ffmpeg -ss 10 -i ";
276		- command.append(getPathInput())
	276	+ command.append(PATH_API).append(user_id).append(".mp4")
277	277	.append(" -vcodec png -vframes 1 -an -f rawvideo -y -vf scale=200:200 ")
278	278	.append(PATH_API).append(user_id).append(".png");
279	279	system(command.c_str());
...	...
...	...	@@ -42,17 +42,25 @@ void ServiceWindowGenerationFromREC::initialize() {
42	42	inputfile = new InputFile(this->path_input);
43	43	monitor_pcr_base = new MonitorPCR();
44	44
	45	+ if (strstr(this->path_input, "ts") != NULL) {
	46	+ char* format_video = new char[3];
	47	+ strcpy(format_video, "ts");
	48	+ monitor_pcr_base->setFormatVideo(format_video);
	49	+ }
	50	+
45	51	monitor_pcr_base->addListenerPCRBase(rec);
46	52	inputfile->registraOuvinte(monitor_pcr_base);
47	53
48	54	ServiceWindowGeneration::initialize();
49	55
50	56	try{
51		- rec->initialize();
52	57	inputfile->initialize();
53		- }catch(RecognizeException ex){
	58	+ rec->initialize();
	59	+ } catch(RecognizeException ex){
54	60	throw ServiceException(ex.getMessage());
55		- }
	61	+ } catch(InputException ex){
	62	+ throw ServiceException(ex.getMessage());
	63	+ }
56	64	this->Start();
57	65	}
58	66
...	...
...	...	@@ -110,8 +110,8 @@ void ServiceWindowGenerationFromSRT::initialize() {
110	110	ServiceWindowGeneration::initialize();
111	111
112	112	try{
113		- extratorSRT->initialize();
114	113	inputfile->initialize();
	114	+ extratorSRT->initialize();
115	115	}catch(ExtratorSrtException ex){
116	116	throw ServiceException(ex.getMessage());
117	117	}catch(InputException ex){
...	...