Correção na transcodificação WEBM do Service Text.

Erickson Silva
1 parent 8123bb94
Showing 5 changed files with 39 additions and 26 deletions Show diff stats
recognize/src/recognize.cpp
servico/src/include/serviceWindowGeneration.h
servico/src/include/serviceWindowGenerationFromText.h
servico/src/serviceWindowGeneration.cpp
servico/src/serviceWindowGenerationFromText.cpp
@@ -18,7 +18,7 @@
 #define INPUT_PATTERN 1 /* 1 = Raw file, 2 = Mic */
 #define BLOCS_PATTERN 10
 #define SIZE_BUFFER 256
-#define CONFIDENCE_RATE 0.40
+#define CONFIDENCE_RATE 0.50
 #define PATH_GTAAAS_WEB "gtaaas_user/gtaaas_web/public/uploads/videos/"
 #define PATH_AUDIO_ORIGIN "/audio/origin/audio_origin.wav"
@@ -284,15 +284,27 @@ void Recognize::generateConfidence() {
 			if (line.length() > 0) {
 	    		istream_iterator<std::string> beg(buf), end;
 	    		vector<string> tokens(beg, end);
-	    		float sizeScores = 0;
+	    		float sizeAvgScores = 0;
+	    		float sizeLowScores = 0;
 				float avgScores = 0;
+				float lowScores = 0;
     			int i;
          		for(i=2; i < tokens.size()-1; i++){
          			istringstream(tokens[i]) >> tmp;
-         			avgScores += tmp;
-         			sizeScores++;
+         			if (tmp > confidenceRate){
+         				avgScores += tmp;
+         				sizeAvgScores++;
+         			}
+         			else{
+         				lowScores += tmp;
+         				sizeLowScores++;
+         			}
          		}
-         		scores.push_back(avgScores/sizeScores);
+         		if (lowScores > 0){
+         			lowScores /= sizeLowScores;
+         			sizeAvgScores++;
+         		}
+         		scores.push_back((avgScores+lowScores)/sizeAvgScores);
 			}
 		} while (!in.eof());
 		in.close();
@@ -300,6 +312,7 @@ void Recognize::generateConfidence() {
 }
 bool Recognize::getConfidence(int i){
+	//cout << "CONFIDENCE: " << scores[i] << endl;
  	if (scores[i] < confidenceRate)
 		return false;
 	return true;
@@ -355,6 +368,7 @@ void Recognize::filterOutputJulius() {
 void Recognize::notifyListeners(char* text) {
+	//cout << "NOTIFY: " << text << endl;
 	int64_t pts = PTS_PATTERN;
 	for(list<RecognizeListener*>::iterator it = listeners->begin(); it != listeners->end(); it++){
@@ -79,6 +79,7 @@ public:
     bool isRunning();
     char getRunningOption();
+    char* getPathLibras();
     void setPathLibras(char* _path_libras);
     void setSizeOfSubtitles(int sub_size);
 };
@@ -16,6 +16,7 @@ private:
 	char* path_file;
 	bool alive;
 	char* client_type;
+	char* id;
 public:
 	ServiceWindowGenerationFromText (char* _path_file, char* _video_path_file,
@@ -73,6 +73,11 @@ void ServiceWindowGeneration::setPathLibras(char* _path_libras) {
     DDPRINTF("Path TS File: %s\n", _path_libras);
 }
+char* ServiceWindowGeneration::getPathLibras() {
+    return path_libras;
+}
+
+
 void ServiceWindowGeneration::setServiceType(int type) {
 	serviceType = type;
 }
@@ -3,13 +3,14 @@
 #define PATH_LIBRAS "libras/video/"
-#define OUTPUT_VIDEO_WEB "gtaaas_user/gtaaas-plugin-server/videos/libras.webm"
+#define OUTPUT_VIDEO_WEB "gtaaas_user/gtaaas-plugin-server/videos/"
 #define MAX_SIZE_PATH 256
 ServiceWindowGenerationFromText::ServiceWindowGenerationFromText (char* _path_file, char* _username, int _transp, int _serviceType, char* _client_type) {
 	path_file = _path_file;
 	client_type = _client_type;
+	id = _username;
     setTransparency(_transp);
     setServiceType(_serviceType);
 	char* final_path = new char[MAX_SIZE_PATH];
@@ -72,23 +73,14 @@ void ServiceWindowGenerationFromText::Run() {
 void ServiceWindowGenerationFromText::transcodeVideoToWebm() {
-	FILE *video_webm;
-	video_webm = fopen(OUTPUT_VIDEO_WEB, "r");
-	if (video_webm != NULL) {
-		string cmd = "rm ";
-		cmd.append(OUTPUT_VIDEO_WEB);
-		printf("[INFO]: Remove video libras.webm: %s\n", cmd.c_str());
-		system(cmd.c_str());
-		fclose(video_webm);
-	}
-	
-	char* command = (char*) malloc (INT_MAX);
-	strcpy(command, "ffmpeg -i ");
-	strcat(command, PATH_LIBRAS);
-	strcat(command, " -vcodec libvpx -acodec libvorbis ");
-	strcat(command, OUTPUT_VIDEO_WEB);
-	printf("[INFO]: Transcodification command -> %s\n", command);
-	system(command);
-	free(video_webm);
-	free(command);	
-}
+	string command = "ffmpeg -i ";
+	command.append(getPathLibras())
+	.append(" -vcodec libvpx -acodec libvorbis ")
+	.append(OUTPUT_VIDEO_WEB)
+	.append(id)
+	.append(".webm")
+	.append(" && rm ")
+	.append(getPathLibras());
+	printf("[INFO]: Transcodification command -> %s\n", command.c_str());
+	system(command.c_str());
+}
 \ No newline at end of file
	@@ -79,6 +79,7 @@ public:		@@ -79,6 +79,7 @@ public:
79	bool isRunning();	79	bool isRunning();
80	char getRunningOption();	80	char getRunningOption();
81		81
		82	+ char* getPathLibras();
82	void setPathLibras(char* _path_libras);	83	void setPathLibras(char* _path_libras);
83	void setSizeOfSubtitles(int sub_size);	84	void setSizeOfSubtitles(int sub_size);
84	};	85	};
	@@ -16,6 +16,7 @@ private:		@@ -16,6 +16,7 @@ private:
16	char* path_file;	16	char* path_file;
17	bool alive;	17	bool alive;
18	char* client_type;	18	char* client_type;
		19	+ char* id;
19		20
20	public:	21	public:
21	ServiceWindowGenerationFromText (char* _path_file, char* _video_path_file,	22	ServiceWindowGenerationFromText (char* _path_file, char* _video_path_file,