From 5f361ee28b9658b2cb77f0c22cfe2db8507f00df Mon Sep 17 00:00:00 2001 From: Wesnydy Ribeiro Date: Sun, 26 Apr 2015 16:24:51 -0300 Subject: [PATCH] Remoção do componente MonitorPCR --- Makefile | 9 ++------- extratorSRT/src/extratorSRT.cpp | 11 +---------- extratorSRT/src/include/extratorSRT.h | 7 +------ recognize/src/include/recognize.h | 7 +------ recognize/src/recognize.cpp | 14 +------------- servico/src/include/serviceWindowGeneration.h | 4 ---- servico/src/include/serviceWindowGenerationFromREC.h | 1 - servico/src/include/serviceWindowGenerationFromSRT.h | 1 - servico/src/serviceWindowGeneration.cpp | 19 +++---------------- servico/src/serviceWindowGenerationFromREC.cpp | 20 -------------------- servico/src/serviceWindowGenerationFromSRT.cpp | 28 +++++----------------------- synchronizer/src/include/synchronizer.h | 4 +--- synchronizer/src/synchronizer.cpp | 5 ----- 13 files changed, 15 insertions(+), 115 deletions(-) diff --git a/Makefile b/Makefile index da5a40d..d4eb9b1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/extratorSRT/src/extratorSRT.cpp b/extratorSRT/src/extratorSRT.cpp index 4ca4490..df2467b 100644 --- a/extratorSRT/src/extratorSRT.cpp +++ b/extratorSRT/src/extratorSRT.cpp @@ -4,9 +4,7 @@ ExtratorSRT::ExtratorSRT(){ listeners = new list(); - 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 diff --git a/extratorSRT/src/include/extratorSRT.h b/extratorSRT/src/include/extratorSRT.h index 2c13351..6cff7d5 100644 --- a/extratorSRT/src/include/extratorSRT.h +++ b/extratorSRT/src/include/extratorSRT.h @@ -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 *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); diff --git a/recognize/src/include/recognize.h b/recognize/src/include/recognize.h index f4b8352..7908590 100644 --- a/recognize/src/include/recognize.h +++ b/recognize/src/include/recognize.h @@ -14,7 +14,6 @@ #include #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; diff --git a/recognize/src/recognize.cpp b/recognize/src/recognize.cpp index 140ff06..9ce6488 100644 --- a/recognize/src/recognize.cpp +++ b/recognize/src/recognize.cpp @@ -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){ diff --git a/servico/src/include/serviceWindowGeneration.h b/servico/src/include/serviceWindowGeneration.h index 4b7c6bb..e6da100 100644 --- a/servico/src/include/serviceWindowGeneration.h +++ b/servico/src/include/serviceWindowGeneration.h @@ -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* glosas); virtual void notifyEndOfSynchronization(); - //virtual void notifyPCRBase(uint64_t pcr_base); void initialize(); bool isRunning(); diff --git a/servico/src/include/serviceWindowGenerationFromREC.h b/servico/src/include/serviceWindowGenerationFromREC.h index 8fa1555..88b0b07 100644 --- a/servico/src/include/serviceWindowGenerationFromREC.h +++ b/servico/src/include/serviceWindowGenerationFromREC.h @@ -7,7 +7,6 @@ #include "serviceWindowGeneration.h" #include "recognize.h" #include "inputFile.h" -#include "monitor_pcr.h" using namespace std; using namespace jthread; diff --git a/servico/src/include/serviceWindowGenerationFromSRT.h b/servico/src/include/serviceWindowGenerationFromSRT.h index 7168566..1143b82 100644 --- a/servico/src/include/serviceWindowGenerationFromSRT.h +++ b/servico/src/include/serviceWindowGenerationFromSRT.h @@ -6,7 +6,6 @@ #include "inputFile.h" #include "extratorSRT.h" #include "listenerSRT.h" -#include "monitor_pcr.h" #include "stdint.h" #include #include "jthread.h" diff --git a/servico/src/serviceWindowGeneration.cpp b/servico/src/serviceWindowGeneration.cpp index 806d3e2..de40c25 100644 --- a/servico/src/serviceWindowGeneration.cpp +++ b/servico/src/serviceWindowGeneration.cpp @@ -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); diff --git a/servico/src/serviceWindowGenerationFromREC.cpp b/servico/src/serviceWindowGenerationFromREC.cpp index 2533855..89bdaad 100644 --- a/servico/src/serviceWindowGenerationFromREC.cpp +++ b/servico/src/serviceWindowGenerationFromREC.cpp @@ -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{ diff --git a/servico/src/serviceWindowGenerationFromSRT.cpp b/servico/src/serviceWindowGenerationFromSRT.cpp index 2bc6e7a..51496d1 100644 --- a/servico/src/serviceWindowGenerationFromSRT.cpp +++ b/servico/src/serviceWindowGenerationFromSRT.cpp @@ -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){ diff --git a/synchronizer/src/include/synchronizer.h b/synchronizer/src/include/synchronizer.h index 2e0ffe0..e40eec3 100644 --- a/synchronizer/src/include/synchronizer.h +++ b/synchronizer/src/include/synchronizer.h @@ -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(); diff --git a/synchronizer/src/synchronizer.cpp b/synchronizer/src/synchronizer.cpp index de447ba..04a8d9a 100644 --- a/synchronizer/src/synchronizer.cpp +++ b/synchronizer/src/synchronizer.cpp @@ -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; -- libgit2 0.21.2