[UPDATE] Analisar PCR do vídeo quando for TS.

Erickson Silva
1 parent fc440c2c
Showing 7 changed files with 66 additions and 54 deletions Show diff stats
Makefile
extratorSRT/src/extratorSRT.cpp
input/src/include/inputFile.h
input/src/inputFile.cpp
monitorPCR/src/include/monitor_pcr.h
monitorPCR/src/monitor_pcr.cpp
servico/src/serviceWindowGenerationFromSRT.cpp
@@ -171,4 +171,4 @@ svn:
 	@find -iname "*.swp" -exec rm {} \;
 	@find -iname "*.tmp" -exec rm {} \;
 	@find -iname "*.svn-base" -exec rm -r {} \;
-	@find -iname "*.svn" -exec rm -r {} \;
 \ No newline at end of file
+	@find -iname "*.svn" -exec rm -r {} ;\
 \ No newline at end of file
@@ -76,11 +76,11 @@ void ExtratorSRT::Run(){
 void ExtratorSRT::notifyPCRBase(uint64_t pcrbase){
-    DDPRINTF("PCRBase = %ld\n", 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) * 100000.0));    
-}
 \ No newline at end of file
+}
@@ -9,6 +9,7 @@
 #define	INPUTFILE_H
 #include <fstream>
+#include <string.h>
 #include "logger.h"
 #include "ouvinteInput.h"
 #include "inputException.h"
@@ -20,26 +20,26 @@ InputFile::~InputFile(){
 void InputFile::initialize(){
     ifstream filein(path, ifstream::binary);
-    
-    if (filein.is_open()) {
-        
-        char buffer [MAX_SIZE_PACKET];
-        DPRINTF("[AGUARDE] Lendo arquivo...\n")
-        while (!filein.eof()) {
-            filein.read(buffer, MAX_SIZE_PACKET);
-            unsigned char* packet = (unsigned char*) buffer;
-            notificaOuvintes(packet);
+
+    if (strstr(path, ".ts") != NULL) {    
+        if (filein.is_open()) {        
+            char buffer [MAX_SIZE_PACKET];
+            DPRINTF("[AGUARDE] Lendo arquivo...\n")
+            while (!filein.eof()) {
+                filein.read(buffer, MAX_SIZE_PACKET);
+                unsigned char* packet = (unsigned char*) buffer;
+                notificaOuvintes(packet);
+            }        
+            printf("\n");
+            filein.close();
+            //finished = true;        
+        } else {
+	    finished = true;
+            Util::Logger::Instance()->writeLog((char*) "[ERRO: inputFile.cpp] Arquivo de vídeo não encontrado.");
+            throw InputException("Falha ao abrir o arquivo de vídeo! Verifique se o mesmo existe.");
         }
-        
-        printf("\n");
-        filein.close();
-        finished = true;
-        
-    } else {
-		finished = true;
-        Util::Logger::Instance()->writeLog((char*) "[ERRO: inputFile.cpp] Arquivo de vídeo não encontrado.");
-        throw InputException("Falha ao abrir o arquivo de vídeo! Verifique se o mesmo existe.");
     }
+    finished = true;
 }
@@ -30,6 +30,13 @@ class MonitorPCR: public OuvinteInput {
     void notifyListenersWithPCRBase(uint64_t pcrbase);
     uint64_t getPCRBase();
     void chegouInput(unsigned char* packet);
+
+    /**
+     *  Informa para o monitor o formato do vídeo que está sendo manipulado.
+     *  Caso seja qualquer outro diferente de Transport Stream (TS), os componentes
+     *  observadores devem receber a notificação de um valor de PCR padrão.
+     */
+    void setFormatVideo(char* format);
   private:
 #include <stdio.h>
 #include <string.h>
+#include <locale>
 #include "monitor_pcr.h"
 #define PCRBASE_PADRAO 1000000
 using namespace std;
@@ -17,52 +18,45 @@ MonitorPCR::~MonitorPCR(){
     DDDPRINTF("Monitor PCR finalized!\n");	
 }
+
 uint64_t MonitorPCR::getPCRBase(){
     return pcr_base;
 }
-void MonitorPCR::chegouInput(unsigned char* packet) {
-
-    //printf("\n\n\n\n\n\nEXTENSAOOO---2: %s\n\n\n\n\n\n", extvideo);
-    if (!find) { // verifica se o PCRBase já foi encontrado
-        //printf("\n>>> 2\n");
+void MonitorPCR::setFormatVideo(char* format) {
+    extvideo = format;
+}
-        if (strcmp(extvideo, (char*) "ts") == 0) { // se for TS procura nos pacotes
-            readPCRBase(packet);
-	                //printf("\n>>> 3\n");
+void MonitorPCR::chegouInput(unsigned char* packet) {
-	}
-        else // outros formatos de vídeo, define o PCR padrão = 1000000
+    if (!find) { // verifica se o PCRBase já foi encontrado
+        *extvideo = tolower(*extvideo);
+        if (strcmp(extvideo, (char*) "ts") == 0) { // se for TS procura nos pacotes
+            readPCRBase(packet);	
+        } else { // outros formatos de vídeo, define o PCR padrão = 1000000
             notifyListenersWithPCRBase((uint64_t) PCRBASE_PADRAO);
-    } 
+            find = true;
+        }
+    }
+
 }
+
 void MonitorPCR::readPCRBase(unsigned char* packet){
-   // printf("\n>>> 0\n");
-
     if (packet[0] == 0x47 && !find){
-        //printf("\n>>> 1\n");
-        if((((packet[1] & 0x1F) << 8) | packet[2]) != 0xFF){
-            
-            int adaptation_field_control = ((packet[3] & 0x30) >> 4);
-            
-            if (adaptation_field_control == 2 || adaptation_field_control == 3) {
-                
-                int adaptation_field_length = packet[4];
-                
-                if (adaptation_field_length > 0) {
-                    
-                    if (((packet[5] & 0x10) >> 4) == 1) {
-                        
+        if((((packet[1] & 0x1F) << 8) | packet[2]) != 0xFF) {            
+            int adaptation_field_control = ((packet[3] & 0x30) >> 4);            
+            if (adaptation_field_control == 2 || adaptation_field_control == 3) {                
+                int adaptation_field_length = packet[4];                
+                if (adaptation_field_length > 0) {                    
+                    if (((packet[5] & 0x10) >> 4) == 1) {                        
                         uint64_t program_clock_reference_base = (uint64_t) packet[6] << 25 | packet[7] << 17 | packet[8] << 9
-                                | packet[9] << 1 | (packet[10] & 0x80) >> 7;
-                        
+                                | packet[9] << 1 | (packet[10] & 0x80) >> 7;                        
                         notifyListenersWithPCRBase(program_clock_reference_base);
-                        find = true;
-                        
+                        find = true;                        
                     }
                 }                
             }            
@@ -79,4 +73,4 @@ void MonitorPCR::notifyListenersWithPCRBase(uint64_t pcrbase){
     for(list<ListenerMonitorPCRBase*>::iterator it = this->listeners->begin(); it != this->listeners->end(); it++){
         (*it)->notifyPCRBase(pcrbase);
     }
-}
 \ No newline at end of file
+}
@@ -100,8 +100,18 @@ void ServiceWindowGenerationFromSRT::initialize() {
         */
 	    inputfile = new InputFile(this->path_input);	    
-	    extratorSRT = new ExtratorSRT();	    
-	    monitor_pcr_base = new MonitorPCR();
+	    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);
	@@ -171,4 +171,4 @@ svn:		@@ -171,4 +171,4 @@ svn:
171	@find -iname "*.swp" -exec rm {} \;	171	@find -iname "*.swp" -exec rm {} \;
172	@find -iname "*.tmp" -exec rm {} \;	172	@find -iname "*.tmp" -exec rm {} \;
173	@find -iname "*.svn-base" -exec rm -r {} \;	173	@find -iname "*.svn-base" -exec rm -r {} \;
174	- @find -iname "*.svn" -exec rm -r {} \;
175	\ No newline at end of file	174	\ No newline at end of file
		175	+ @find -iname "*.svn" -exec rm -r {} ;\
176	\ No newline at end of file	176	\ No newline at end of file
	@@ -9,6 +9,7 @@		@@ -9,6 +9,7 @@
9	#define INPUTFILE_H	9	#define INPUTFILE_H
10		10
11	#include <fstream>	11	#include <fstream>
		12	+#include <string.h>
12	#include "logger.h"	13	#include "logger.h"
13	#include "ouvinteInput.h"	14	#include "ouvinteInput.h"
14	#include "inputException.h"	15	#include "inputException.h"
	@@ -30,6 +30,13 @@ class MonitorPCR: public OuvinteInput {		@@ -30,6 +30,13 @@ class MonitorPCR: public OuvinteInput {
30	void notifyListenersWithPCRBase(uint64_t pcrbase);	30	void notifyListenersWithPCRBase(uint64_t pcrbase);
31	uint64_t getPCRBase();	31	uint64_t getPCRBase();
32	void chegouInput(unsigned char* packet);	32	void chegouInput(unsigned char* packet);
		33	+
		34	+ /**
		35	+ * Informa para o monitor o formato do vídeo que está sendo manipulado.
		36	+ * Caso seja qualquer outro diferente de Transport Stream (TS), os componentes
		37	+ * observadores devem receber a notificação de um valor de PCR padrão.
		38	+ */
		39	+ void setFormatVideo(char* format);
33		40
34	private:	41	private:
35		42
	@@ -100,8 +100,18 @@ void ServiceWindowGenerationFromSRT::initialize() {		@@ -100,8 +100,18 @@ void ServiceWindowGenerationFromSRT::initialize() {
100	*/	100	*/
101		101
102	inputfile = new InputFile(this->path_input);	102	inputfile = new InputFile(this->path_input);
103	- extratorSRT = new ExtratorSRT();
104	- monitor_pcr_base = new MonitorPCR();	103	+ extratorSRT = new ExtratorSRT();
		104	+
		105	+ monitor_pcr_base = new MonitorPCR();
		106	+
		107	+ /* [Temporário]: como o monitor do PCR não estava encontrando a extensão do
		108	+ vídeo, este está sendo analisado e infomado no trecho de código a seguir.
		109	+ */
		110	+ if (strstr(path_input, "ts") != NULL) {
		111	+ char* format_video = new char[3];
		112	+ strcpy(format_video, "ts");
		113	+ monitor_pcr_base->setFormatVideo(format_video);
		114	+ }
105		115
106	monitor_pcr_base->addListenerPCRBase(extratorSRT);	116	monitor_pcr_base->addListenerPCRBase(extratorSRT);
107		117