Skip to content

GStreamer_audioRecorder
GStreamer_audioRecorder
Commit b0b7b6bc authored by d.basulto's avatar d.basulto
Browse files
Options

change some debug messages

parent b8dc7be7
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 18 deletions
StreamRecorder.cpp
View file @ b0b7b6bc
...@@ -183,9 +183,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -183,9 +183,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
if(((StreamRecorder*)user_data)->isConnectionLost) //Enter only if the connection is lost if(((StreamRecorder*)user_data)->isConnectionLost) //Enter only if the connection is lost
{ {
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
long int actualRecordTime; long int actualRecordTime;
long int currentTime = time(NULL); long int currentTime = time(NULL);
long int addTime; long int addTime;
...@@ -195,7 +193,6 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -195,7 +193,6 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
//cout << "Actual time (timestamp): " << currentTime << endl; //cout << "Actual time (timestamp): " << currentTime << endl;
actualRecordTime = currentTime-((StreamRecorder*)user_data)->timestamp; actualRecordTime = currentTime-((StreamRecorder*)user_data)->timestamp;
cout << "Record time: " << actualRecordTime << endl; cout << "Record time: " << actualRecordTime << endl;
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
/** The calculated record time is greater? */ /** The calculated record time is greater? */
...@@ -229,7 +226,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -229,7 +226,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
((StreamRecorder*)user_data)->isConnectionLost = false; ((StreamRecorder*)user_data)->isConnectionLost = false;
/** Try reconnect with the radio stream*/ /** Try reconnect with the radio stream*/
g_timeout_add(1*1000, reconnectURIStream, user_data); g_timeout_add(RECONNECTION_DELAY*1000, reconnectURIStream, user_data);
} }
break; break;
...@@ -256,20 +253,19 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -256,20 +253,19 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
/** Not audio stream received */ /** Not audio stream received */
if(((StreamRecorder*)user_data)->timestamp == 0) if(((StreamRecorder*)user_data)->timestamp == 0)
{ {
g_timeout_add(1*1000, reconnectURIStream, user_data); g_timeout_add(RECONNECTION_DELAY*1000, reconnectURIStream, user_data);
} }
else else
{ {
// ----------------------------------------------------------------------------------------
long int actualRecordTime; long int actualRecordTime;
long int currentTime = time(NULL); long int currentTime = time(NULL);
long int addTime; //long int addTime;
long int bytesToAdd;
cout << "Actual time (timestamp): " << currentTime << endl;
actualRecordTime = currentTime - ((StreamRecorder *)user_data)->timestamp; actualRecordTime = currentTime - ((StreamRecorder *)user_data)->timestamp;
cout << "Record time: " << actualRecordTime << endl; cout << "Record time: " << actualRecordTime << endl;
// ----------------------------------------------------------------------------------------
/** Record time is greater than th required */ /** Record time is greater than th required */
if (actualRecordTime >= ((StreamRecorder *) user_data)->audioFileDuration) if (actualRecordTime >= ((StreamRecorder *) user_data)->audioFileDuration)
...@@ -279,12 +275,12 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -279,12 +275,12 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
} }
else else
{ {
/** Moves the pointer to the position corresponding to the difference of the timestamps */
addTime = currentTime - ((StreamRecorder *) user_data)->oldTmpTimestamp; /** Moves the pointer to the position corresponding to the difference of the timestamps */
//addTime = currentTime - ((StreamRecorder *) user_data)->oldTmpTimestamp;
cout << "Time to add: " << 1 << endl; cout << "Time to add: " << 1 << endl;
long int bytesToAdd = 1*READSIZE*STREAMRECORDER_BYTESPERSAMPLE*10; bytesToAdd = 1*READSIZE*STREAMRECORDER_BYTESPERSAMPLE*10;
cout << "-------------------------------------" << endl; cout << "-------------------------------------" << endl;
cout << "Actual Bytes number: " << "(" << ((StreamRecorder *) user_data)->nBytes << ") + "; cout << "Actual Bytes number: " << "(" << ((StreamRecorder *) user_data)->nBytes << ") + ";
...@@ -303,7 +299,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d ...@@ -303,7 +299,7 @@ int StreamRecorder::bus_callback (GstBus *bus, GstMessage *message, void *user_d
((StreamRecorder*)user_data)->isConnectionLost = false; ((StreamRecorder*)user_data)->isConnectionLost = false;
/** Try reconnect with the radio stream*/ /** Try reconnect with the radio stream*/
g_timeout_add(1*1000, reconnectURIStream, user_data); g_timeout_add(RECONNECTION_DELAY*1000, reconnectURIStream, user_data);
} }
} }
......
StreamRecorder.h
View file @ b0b7b6bc
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#define ERROR_MSG_SIZE 50 #define ERROR_MSG_SIZE 50
#define DST_URI_SIZE 80 #define DST_URI_SIZE 80
#define RECONNECTION_DELAY 1
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment