Remoção do componente MonitorPCR

Wesnydy Ribeiro
1 parent 9913eafb
Showing 13 changed files with 15 additions and 115 deletions Show diff stats
Makefile
extratorSRT/src/extratorSRT.cpp
extratorSRT/src/include/extratorSRT.h
recognize/src/include/recognize.h
recognize/src/recognize.cpp
servico/src/include/serviceWindowGeneration.h
servico/src/include/serviceWindowGenerationFromREC.h
servico/src/include/serviceWindowGenerationFromSRT.h
servico/src/serviceWindowGeneration.cpp
servico/src/serviceWindowGenerationFromREC.cpp
servico/src/serviceWindowGenerationFromSRT.cpp
synchronizer/src/include/synchronizer.h
synchronizer/src/synchronizer.cpp
@@ -10,7 +10,7 @@ LIBS= `pkg-config --cflags jlibcpp` \
 	`pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io
 INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include -I extratorSRT/src/include \
--I monitorPCR/src/include -I input/src/include -I servico/src/include -I synchronizer/src/include \
+-I input/src/include -I servico/src/include -I synchronizer/src/include \
 -I mixer/src/include -I recognize/src/include -I extratorTXT/src/include
 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall
@@ -20,7 +20,6 @@ logger.o
 tradutorObjs = \
 pyTradutor.o \
 tradutorPortGlosa.o \
-#ouvinteTradutor.o
 extratorSRTObjs = \
 extratorSRT.o \
@@ -31,9 +30,6 @@ extratorTXTObjs = \
 extratorTXT.o \
 extratorTXT_exception.o
-monitorPCRObjs = \
-monitor_pcr.o
-
 inputObjs = \
 inputFile.o \
 inputException.o \
@@ -62,11 +58,10 @@ servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) )
 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
 extratorSRTObjsPre = $(addprefix extratorSRT/src/,$(extratorSRTObjs) )
-monitorPCRObjsPre = $(addprefix monitorPCR/src/,$(monitorPCRObjs) )
 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
-OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(monitorPCRObjsPre) $(recognizeObjsPre) main.o
+OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(recognizeObjsPre) main.o
 all: user_config libras
@@ -4,9 +4,7 @@
 ExtratorSRT::ExtratorSRT(){
     listeners = new list<ListenerSRT*>();
-    pcr_base = 0;
     finish = false;
-    hasPCRBase = false;
     seek_pos = 0;
     hasNextSub = true;
     DPRINTF("Done!\n");
@@ -170,13 +168,6 @@ int64_t ExtratorSRT::str_to_time(std::string str_time) {
     }
-
-void ExtratorSRT::notifyPCRBase(uint64_t pcrbase){
-    //DDPRINTF("PCRBase = %ld\n", pcrbase);
-    this->pcr_base = pcrbase;
-    this->hasPCRBase = true;
-}
-
 uint64_t ExtratorSRT::calcula_pts(double msec) {
-    return (uint64_t)(pcr_base + ((msec/1000) * 90000.0));    
+    return (uint64_t)(1000 /*pcr_base*/ + ((msec/1000) * 90000.0));    
 }
 \ No newline at end of file
@@ -23,7 +23,6 @@
 #include "logger.h"
 #include "subtitle.h"
 #include "listenerSRT.h"
-#include "listenerMonitorPCRBase.h"
 #include "extratorSRT_exception.h"
 #define SIZE_CSCAPE 1
@@ -34,7 +33,7 @@ using namespace jthread;
 using namespace std;
 using namespace sndesc;
-class ExtratorSRT: public Thread, public ListenerMonitorPCRBase {
+class ExtratorSRT: public Thread {
 public:
@@ -53,8 +52,6 @@ public:
     Subtitle* next();
-    void notifyPCRBase(uint64_t pcrbase);
-    
 private:
     list<ListenerSRT*> *listeners;
@@ -65,9 +62,7 @@ private:
     BufferedReader *bff_reader;
     Subtitle *subtitle;
-    uint64_t pcr_base;
     int64_t seek_pos;
-    bool hasPCRBase;
     bool hasNextSub;
     uint64_t calcula_pts(double msec);
@@ -14,7 +14,6 @@
 #include <lavidlib/io/FileIO.h>
 #include "dprintf.h"
 #include "logger.h"
-#include "listenerMonitorPCRBase.h"
 #include "recognizeListener.h"
 #include "recognizeException.h"
@@ -44,7 +43,7 @@
 using namespace jthread;
 using namespace std;
-class Recognize: public Thread, public ListenerMonitorPCRBase {
+class Recognize: public Thread {
 public:	
@@ -70,8 +69,6 @@ public:
 	void addListener(RecognizeListener* listener);
-    void notifyPCRBase(uint64_t pcrbase);
-
 	bool isFinished();
     void Run();
@@ -79,8 +76,6 @@ public:
 private:
-    int64_t pcr_base;
-    bool hasPCRBase;
 	char* pathVideo;
 	string id;
 	float confidenceRate;
@@ -11,8 +11,6 @@ Recognize::Recognize(char* _pathVideo, char* _id) {
 	ss << _id;
 	ss >> id;
 	confidenceRate=CONFIDENCE_RATE;
-    pcr_base = 0;
-    hasPCRBase = false;
     DPRINTF("Done!\n");
 }
@@ -23,8 +21,6 @@ Recognize::Recognize(char* _pathVideo, char* _id, char* rate) {
 	inputType = INPUT_PATTERN;
 	frequency = FREQUENCY_PATTERN;
 	sizeBlocs = BLOCS_PATTERN;
-    pcr_base = 0;
-    hasPCRBase = false;
 	stringstream ss;
 	ss << _id;
 	ss >> id;
@@ -42,8 +38,6 @@ Recognize::Recognize(char* _pathVideo, int _inputType, char* _id) {
 	frequency = FREQUENCY_PATTERN;
 	sizeBlocs = BLOCS_PATTERN;
 	id = _id;
-    pcr_base = 0;
-    hasPCRBase = false;
     DPRINTF("Done!\n");
 }
@@ -365,14 +359,8 @@ void Recognize::notifyEndExtraction(int sentences_size) {
     }
 }
-void Recognize::notifyPCRBase(uint64_t pcrbase){
-    //DDPRINTF("PCRBase = %ld\n", pcrbase);
-    this->pcr_base = pcrbase;
-    this->hasPCRBase = true;
-}
-
 int64_t Recognize::calcula_pts(double msec) {
-    return (int64_t)(pcr_base + ((msec/1000) * 90000.0));    
+    return (int64_t)(1000 /*pcr_base*/ + ((msec/1000) * 90000.0));    
 }
 int64_t Recognize::convert_pts(string pts){
@@ -14,8 +14,6 @@
 #include "inputFile.h"
 #include "listenerTradutor.h"
 #include "tradutorPortGlosa.h"
-#include "monitor_pcr.h"
-#include "listenerMonitorPCRBase.h"
 //#include "httpstreamer.h"
 #include "synchronizer.h"
 #include "listenerSynchronizer.h"
@@ -47,7 +45,6 @@ protected:
     TradutorPortGlosa * tradutor;
     //HttpStreamer *sincronizador; 
     Synchronizer * sincronizador;
-    MonitorPCR * monitor_pcr_base;
     InputFile * inputfile;
     Mixer * mixer;
@@ -83,7 +80,6 @@ public:
     virtual void notifyTranslation(vector<string>* glosas);
     virtual void notifyEndOfSynchronization();
-    //virtual void notifyPCRBase(uint64_t pcr_base);
     void initialize();
     bool isRunning();
@@ -7,7 +7,6 @@
 #include "serviceWindowGeneration.h"
 #include "recognize.h"
 #include "inputFile.h"
-#include "monitor_pcr.h"
 using namespace std;
 using namespace jthread;
@@ -6,7 +6,6 @@
 #include "inputFile.h"
 #include "extratorSRT.h"
 #include "listenerSRT.h"
-#include "monitor_pcr.h"
 #include "stdint.h"
 #include <vector>
 #include "jthread.h"
@@ -13,10 +13,8 @@ ServiceWindowGeneration::ServiceWindowGeneration() {
 ServiceWindowGeneration::~ServiceWindowGeneration() {
     free(vetor_pts);
-    //free(path_input);
     free(path_libras);
     if (inputfile) delete inputfile;
-    if (monitor_pcr_base) delete monitor_pcr_base;
     if (mixer) delete mixer;
     if (tradutor) delete tradutor;
     if (sincronizador) delete sincronizador;
@@ -153,21 +151,10 @@ void ServiceWindowGeneration::initialize() {
             this->path_libras,this->transparency);
     	}
     }
-
-	/* Se for SERVICE_TYPE_REC (Recognized) não é necessário usar o monitor_pcr_base */
-	if (serviceType == SERVICE_TYPE_SRT) {
-
-		char* extensao = (char*) tokens[1].c_str();
-		this->monitor_pcr_base->extvideo =  new char[strlen(extensao)];
-		strcpy(this->monitor_pcr_base->extvideo, extensao);
-		monitor_pcr_base->addListenerPCRBase(sincronizador);
-
-	} else {
+    
+	if (serviceType != SERVICE_TYPE_SRT) {
 		uint64_t pcr_base = (uint64_t) 1000; //FIXME: macro
-		sincronizador->setPCRBase(pcr_base);
-		if (serviceType == SERVICE_TYPE_SRT_ONLY) {
-			monitor_pcr_base->addListenerPCRBase(sincronizador);
-		}
+        sincronizador->setPCRBase(pcr_base);
 	}
     sincronizador->addListener(this);
@@ -57,26 +57,6 @@ void ServiceWindowGenerationFromREC::initialize() {
     rec->addListener(this);
-    if (serviceType != SERVICE_TYPE_REC_ONLY_AUDIO){
-
-        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->addListener(monitor_pcr_base);
-        try{
-            inputfile->initialize();                                
-        } catch(InputException ex){
-            throw ServiceException(ex.getMessage());
-        }	
-    }
-
 	ServiceWindowGeneration::initialize();
     try{
@@ -63,32 +63,17 @@ void ServiceWindowGenerationFromSRT::initialize() {
     DDPRINTF("Service SRT Initialize.\n");
-    if(serviceType == 2){
-        /*Este serviço utiliza o arquivo de vídeo (em formato TS) do usuário para
-        capturar as informações referente ao relógio (PCR) para calcular as
-        etiquetas de apresentação (PTS) dos sinais em Libras.*/
+    //codigo abaixo sera arrumado apos a aplicação do factory pattern
-	    inputfile = new InputFile(this->path_input);	    
+    if(serviceType == 2){
+	    
 	    extratorSRT = new ExtratorSRT();
-        monitor_pcr_base = new MonitorPCR();
- 
-        /* [Temporário]: como o monitor do PCR não estava encontrando a extensão do
-        vídeo, este está sendo analisado e infomado no trecho de código a seguir.*/
-        if (strstr(path_input, "ts") != NULL) {
-            char* format_video = new char[3];
-            strcpy(format_video, "ts");
-            monitor_pcr_base->setFormatVideo(format_video);
-        }
-
-	    monitor_pcr_base->addListenerPCRBase(extratorSRT);
-	    inputfile->addListener(monitor_pcr_base);
 	    extratorSRT->addListener(this);
 	    extratorSRT->setFilePath((char*) path_srt);
 	    ServiceWindowGeneration::initialize();
-        try{
-            inputfile->initialize();                                
+        try{                               
             extratorSRT->initialize();  
         }catch(ExtratorSrtException ex){
             throw ServiceException(ex.getMessage());
@@ -101,15 +86,12 @@ void ServiceWindowGenerationFromSRT::initialize() {
         /*Este serviço utiliza apenas o arquivo de legendas (SRT) como entrada,
         portanto, não é preciso monitorar as informações do PCR a partir do
         objeto InputFile().*/
-	    extratorSRT = new ExtratorSRT();	    
-	    monitor_pcr_base = new MonitorPCR();
-	    monitor_pcr_base->addListenerPCRBase(extratorSRT);		
+	    extratorSRT = new ExtratorSRT();	    		
 	    extratorSRT->addListener(this);
 	    extratorSRT->setFilePath((char*) path_input);
 	    ServiceWindowGeneration::initialize();
-	    extratorSRT->notifyPCRBase((uint64_t) 1000);
 	    try{
             extratorSRT->initialize();            
         }catch(ExtratorSrtException ex){
@@ -20,7 +20,6 @@
 #include "jmutex.h"
 #include "jthread.h"
 #include "listenerSynchronizer.h"
-#include "listenerMonitorPCRBase.h"
 //#include "httpstreamer.h"
 #define VIDEO_PADRAO "vlibras_user/dicionario_libras/poseneutra.ts"
@@ -37,7 +36,7 @@
 using namespace jthread;
 using namespace std;
-class Synchronizer : public jthread::Thread, public ListenerMonitorPCRBase {
+class Synchronizer : public jthread::Thread {
 private:
 	bool hastext;
@@ -77,7 +76,6 @@ public:
     Synchronizer(/*int64_t pcr_inicial, */char*baseDir, char* extensao, char* path_libras, int transparency);
     virtual ~Synchronizer();
-    virtual void notifyPCRBase(uint64_t pcr_base);
     void setPCRBase(uint64_t pcr_base);
     void Run();
@@ -25,7 +25,6 @@ Synchronizer::Synchronizer(/*int64_t pcr_inicial, */char* baseDir, char* extensa
     count_tasks = 0; // Usado no teste de Eduardo!
     service_running = true;
-    this->pcr_inicial = pcr_inicial;
     this->pcr_inicial = -1;
     this->tempo_poseneutra = 120000;
@@ -68,10 +67,6 @@ Synchronizer::~Synchronizer() {
 }
-void Synchronizer::notifyPCRBase(uint64_t pcr_base){
-    this->pcr_inicial =  pcr_base;
-}
-
 string toLower(string strr) {
     char str[100];
     string ret;
	@@ -7,7 +7,6 @@		@@ -7,7 +7,6 @@
7	#include "serviceWindowGeneration.h"	7	#include "serviceWindowGeneration.h"
8	#include "recognize.h"	8	#include "recognize.h"
9	#include "inputFile.h"	9	#include "inputFile.h"
10	-#include "monitor_pcr.h"
11		10
12	using namespace std;	11	using namespace std;
13	using namespace jthread;	12	using namespace jthread;
	@@ -57,26 +57,6 @@ void ServiceWindowGenerationFromREC::initialize() {		@@ -57,26 +57,6 @@ void ServiceWindowGenerationFromREC::initialize() {
57		57
58	rec->addListener(this);	58	rec->addListener(this);
59		59
60	- if (serviceType != SERVICE_TYPE_REC_ONLY_AUDIO){
61	-
62	- inputfile = new InputFile(this->path_input);
63	- monitor_pcr_base = new MonitorPCR();
64	-
65	- if (strstr(this->path_input, "ts") != NULL) {
66	- char* format_video = new char[3];
67	- strcpy(format_video, "ts");
68	- monitor_pcr_base->setFormatVideo(format_video);
69	- }
70	-
71	- monitor_pcr_base->addListenerPCRBase(rec);
72	- inputfile->addListener(monitor_pcr_base);
73	- try{
74	- inputfile->initialize();
75	- } catch(InputException ex){
76	- throw ServiceException(ex.getMessage());
77	- }
78	- }
79	-
80	ServiceWindowGeneration::initialize();	60	ServiceWindowGeneration::initialize();
81		61
82	try{	62	try{