StreamTranscoder: check end of positive offset based on number of generated frames

valnoel · valnoel · commit 691e4fe82cfc · 2020-06-26T11:46:14.000+02:00
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -588,15 +588,6 @@ void StreamTranscoder::preProcessCodecLatency()
         wasARewrapCase = true;
     }
 
-    if(_offset > 0) {
-        const double fps = 1.0 * _outputEncoder->getCodec().getAVCodecContext().time_base.den /
-            (_outputEncoder->getCodec().getAVCodecContext().time_base.num * _outputEncoder->getCodec().getAVCodecContext().ticks_per_frame);
-        const double frame_duration = 1.0 / fps;
-        const double output_latency_duration = frame_duration * (latency - 1);
-        LOG_WARN("Compensate for offset with codec latency by " << output_latency_duration << " seconds (fps=" << fps << ", latency=" << latency << ")");
-        _offset -= output_latency_duration;
-    }
-
     while((latency--) > 0)
     {
         processFrame();
@@ -626,7 +617,20 @@ bool StreamTranscoder::processFrame()
     // Manage offset
     if(_offset > 0)
     {
-        const bool endOfOffset = _outputStream->getStreamDuration() >= _offset;
+        bool endOfOffset = false;
+        if(_currentDecoder == _generators.at(0))
+        {
+            const double fps = 1.0 * _outputEncoder->getCodec().getAVCodecContext().time_base.den /
+                (_outputEncoder->getCodec().getAVCodecContext().time_base.num * _outputEncoder->getCodec().getAVCodecContext().ticks_per_frame);
+            const double frame_duration = 1.0 / fps;
+            const double generated_duration = _currentDecoder->getNbDecodedFrames() * frame_duration;
+            endOfOffset = generated_duration >= _offset;
+        }
+        else
+        {
+            endOfOffset = _outputStream->getStreamDuration() >= _offset;
+        }
+
         if(endOfOffset)
         {
             LOG_INFO("End of positive offset")
