Merge pull request #4 from giuliocarot0/mthread_video

check if threads are joinable

Author: giuliocarot0

include/SRRecorder.h

@@ -18,12 +18,12 @@
 #ifdef __APPLE__
     #define VIDEO_SRC "avfoundation"
     #define VIDEO_URL "1:none"
-    #define VIDEO_FPS 30
+    #define VIDEO_FPS -1 //automagical detection
     #define VIDEO_CODEC AV_CODEC_ID_MPEG4
     #define CODEC_NULL AV_CODEC_ID_NONE
 
     #define AUDIO_SRC "avfoundation"
-    #define AUDIO_URL "none:1"
+    #define AUDIO_URL "none:0"
     #define AUDIO_CODEC AV_CODEC_ID_AAC
 #endif
 

lib/SRRecorder.cpp

@@ -237,7 +237,7 @@ void SRRecorder::stopCaputure() {
 
 
 SRRecorder::~SRRecorder() {
-    if(configuration.enable_video) videoThread.join();
-    if(configuration.enable_audio) audioThread.join();
+    if(configuration.enable_video && videoThread.joinable()) videoThread.join();
+    if(configuration.enable_audio && audioThread.joinable()) audioThread.join();
 
 }

lib/SRVideoInput.cpp

@@ -40,9 +40,11 @@ void SRVideoInput::set(char *video_src, char *video_url, SRResolution _res,int _
         throw openSourceParameterException("Found capture_cursor value wrong while opening video input");
     }
 #endif
-    value = av_dict_set(&options, "framerate", s, 0);
-    if (value < 0) {
-        throw openSourceParameterException("Found framerate value wrong while opening video input");
+    if(fps > 0) {
+        value = av_dict_set(&options, "framerate", s, 0);
+        if (value < 0) {
+            throw openSourceParameterException("Found framerate value wrong while opening video input");
+        }
     }
     if(_res.width != 0 && _res.height != 0 ) {
         s[0] = '\0';
@@ -118,8 +120,11 @@ AVFormatContext* SRVideoInput::open(){
     inCodecContext = avcodec_alloc_context3(inVCodec);
 
     avcodec_parameters_to_context(inCodecContext, params);
-    inCodecContext->time_base = AVRational{1, fps};
-    inCodecContext->framerate = AVRational{fps,1};
+    AVRational r_fps;
+    if(fps>0) r_fps = {fps, 1};
+    else r_fps = AVRational{inFormatContext->streams[streamIndex]->r_frame_rate};
+    inCodecContext->framerate = AVRational{r_fps};
+    inCodecContext->time_base = AVRational{r_fps.den, r_fps.num};
     value = avcodec_open2(inCodecContext, inVCodec, nullptr);
     if (value < 0) {
         throw openAVCodecException("Cannot instantiate a codec for the device stream");

main.cpp

@@ -15,11 +15,11 @@ int main(){
         SRRecorder recorder(configuration);
         /*before setting crop the recorder must be initialized to retrieve capabilities from the devices*/
         recorder.initCapture();
-        lock_thread_for(8);
+        lock_thread_for(2);
         recorder.startCapture();
-        lock_thread_for(4);
+        lock_thread_for(10);
         recorder.pauseCapture();
-        lock_thread_for(3);
+        lock_thread_for(1);
         recorder.startCapture();
         lock_thread_for(5);
         recorder.stopCaputure();