Add rate limiting and realtime PTS calculation to media capture

Fix mediaserver demo

Author: auscaster

BUILD.md

@@ -69,9 +69,9 @@ cmake .. -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_SHARED_LIBS=OFF \
          -DWEBRTC_ROOT_DIR=/home/kam/sourcey/webrtcbuilds/out/src
 
 ## WebRTC selective module build
-cmake .. -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_SHARED_LIBS=OFF \
+cmake .. -DCMAKE_BUILD_TYPE=RELEASE -DBUILD_SHARED_LIBS=OFF \
          -DBUILD_MODULES=ON -DBUILD_APPLICATIONS=ON \
-         -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DBUILD_SAMPLES_webrtc=ON \
+         -DBUILD_TESTS=OFF -DBUILD_SAMPLES=OFF -DBUILD_SAMPLES_av=ON -DBUILD_SAMPLES_webrtc=ON \
          -DWITH_FFMPEG=ON -DWITH_WEBRTC=ON -DENABLE_LOGGING=ON \
          -DBUILD_MODULE_base=ON -DBUILD_MODULE_av=ON \
          -DBUILD_MODULE_crypto=ON -DBUILD_MODULE_http=ON \
@@ -106,7 +106,8 @@ cmake .. -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_SHARED_LIBS=OFF \
          -DBUILD_MODULE_crypto=ON -DBUILD_MODULE_http=ON \
          -DBUILD_MODULE_json=ON -DBUILD_MODULE_av=ON \
          -DBUILD_MODULE_net=ON -DBUILD_MODULE_socketio=ON \
-         -DBUILD_MODULE_symple=ON -DBUILD_MODULE_util=ON
+         -DBUILD_MODULE_symple=ON -DBUILD_MODULE_util=ON \
+         -DBUILD_MODULE_webrtc=OFF
 
 ## Net build
 cmake .. -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_SHARED_LIBS=OFF \

Makefile

@@ -1,7 +1,13 @@
+# This file automates the release process adhering to semantic versioning.
+# Tasks supported are git tagging and docker image building and pushing.
+# Before calling `make release` update the version number in the VERSION file.
+
 NAME    := sourcey/libsourcey
 VERSION := $$(cat VERSION)
 
-git_release:
+release: | git_tag docker_build docker_push
+
+git_tag:
 	git add VERSION
 	git add . --update
 	git commit --message="Release ${VERSION}"

src/av/include/scy/av/codec.h

@@ -118,18 +118,18 @@ struct AV_API VideoCodec : public Codec
 
     VideoCodec();
     VideoCodec(int width, int height, double fps = 0.0,
-               const std::string& pixelFmt = "", // = DEFAULT_VIDEO_PIXEL_FMT
+               const std::string& pixelFmt = DEFAULT_VIDEO_PIXEL_FMT,
                int bitRate = 0,                  // = DEFAULT_VIDEO_BIT_RATE
                int sampleRate = 0);              // = DEFAULT_VIDEO_SAMPLE_RATE
     VideoCodec(const std::string& name, int width = 0, int height = 0, double fps = 0.0,
                int bitRate = 0,
                int sampleRate = 0,
-               const std::string& pixelFmt = "");
+               const std::string& pixelFmt = DEFAULT_VIDEO_PIXEL_FMT);
     VideoCodec(const std::string& name, const std::string& encoder,
                int width = 0, int height = 0, double fps = 0.0,
                int bitRate = 0,
                int sampleRatee = 0,
-               const std::string& pixelFmt = "");
+               const std::string& pixelFmt = DEFAULT_VIDEO_PIXEL_FMT);
     VideoCodec(const VideoCodec& r);
     virtual ~VideoCodec();
 

src/av/include/scy/av/mediacapture.h

@@ -56,11 +56,16 @@ class AV_API MediaCapture : public ICapture, public basic::Runnable
     virtual void getEncoderAudioCodec(AudioCodec& params);
     virtual void getEncoderVideoCodec(VideoCodec& params);
 
-    /// Continuously loop the input file when set
+    /// Continuously loop the input file when set.
     void setLoopInput(bool flag);
 
-    /// Playback video in real time when set
-    void setRealtimePlayback(bool flag);
+    /// Limit playback to video FPS.
+    void setLimitFramerate(bool flag);
+
+    /// Set to use realtime PTS calculation.
+    /// This is preferred when sing live captures as FFmpeg provided values are
+    /// not always reliable.
+    void setRealtimePTS(bool flag);
 
     AVFormatContext* formatCtx() const;
     VideoDecoder* video() const;
@@ -87,6 +92,7 @@ class AV_API MediaCapture : public ICapture, public basic::Runnable
     bool _stopping;
     bool _looping;
     bool _realtime;
+    bool _ratelimit;
 };