Fix bug where samples_out was being flushed before flushing the swr_c…

…ontext.
bytedeco · Dec 5, 2024 · d3fe0b7 · d3fe0b7
1 parent 8b85ac1
commit d3fe0b7
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/java/org/bytedeco/javacv/FFmpegFrameRecorder.java b/src/main/java/org/bytedeco/javacv/FFmpegFrameRecorder.java
@@ -1170,13 +1170,6 @@ public synchronized boolean recordSamples(int sampleRate, int audioChannels, Buf
             throw new Exception("start() was not called successfully!");
         }
 
-        if (samples == null && samples_out[0].position() > 0) {
-            // Typically samples_out[0].limit() is double the audio_input_frame_size --> sampleDivisor = 2
-            double sampleDivisor = Math.floor((int)Math.min(samples_out[0].limit(), Integer.MAX_VALUE) / audio_input_frame_size);
-            writeSamples((int)Math.floor((int)samples_out[0].position() / sampleDivisor));
-            return writeFrame((AVFrame)null);
-        }
-
         if (samples == null && samples_convert_ctx == null) {
             // We haven't tried to record any samples yet so we don't need to flush.
             return false;
@@ -1322,6 +1315,14 @@ public synchronized boolean recordSamples(int sampleRate, int audioChannels, Buf
                 writeSamples(audio_input_frame_size);
             }
         }
+
+        if (samples == null && samples_out[0].position() > 0) {
+            // Typically samples_out[0].limit() is double the audio_input_frame_size --> sampleDivisor = 2
+            double sampleDivisor = Math.floor((int)Math.min(samples_out[0].limit(), Integer.MAX_VALUE) / audio_input_frame_size);
+            writeSamples((int)Math.floor((int)samples_out[0].position() / sampleDivisor));
+            return writeFrame((AVFrame)null);
+        }
+
         return samples != null ? frame.key_frame() != 0 : writeFrame((AVFrame)null);
 
         }