Merge pull request #19 from LCMApps/no-ffprobe-buffers

No ffprobe buffers
LCMApps · Oct 4, 2018 · 0827528 · 0827528
2 parents f637555 + 934b66e
commit 0827528
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 198 deletions.
diff --git a/src/FramesMonitor.js b/src/FramesMonitor.js
@@ -269,6 +269,8 @@ class FramesMonitor extends EventEmitter {
                     '-hide_banner',
                     '-v',
                     errorLevel,
+                    '-fflags',
+                    'nobuffer',
                     '-show_frames',
                     '-show_entries',
                     'frame=pkt_size,pkt_pts_time,media_type,pict_type,key_frame,width,height',

diff --git a/tests/Functional/FramesMonitor/listen.test.js b/tests/Functional/FramesMonitor/listen.test.js
@@ -42,8 +42,8 @@ describe('FramesMonitor::listen, fetch frames from inactive stream', () => {
     });
 
     afterEach(() => {
-        spyOnFrame.reset();
-        spyOnStderr.reset();
+        spyOnFrame.resetHistory();
+        spyOnStderr.resetHistory();
     });
 
     it('must receive error cuz stream is inactive', done => {
@@ -96,16 +96,13 @@ describe('FramesMonitor::listen, fetch frames from active stream', () => {
     });
 
     afterEach(() => {
-        spyOnPFrame.reset();
-        spyOnIFrame.reset();
-        spyOnAudioFrame.reset();
+        spyOnPFrame.resetHistory();
+        spyOnIFrame.resetHistory();
+        spyOnAudioFrame.resetHistory();
     });
 
     it('must receive all stream frames', done => {
         const expectedReturnCode       = 0;
-        const expectedIFramesCount     = 60;
-        const expectedPFramesCount     = 240;
-        const expectedAudioFramesCount = 431;
 
         const onFrame = {I: spyOnIFrame, P: spyOnPFrame};
 
@@ -124,10 +121,10 @@ describe('FramesMonitor::listen, fetch frames from active stream', () => {
                 assert.instanceOf(reason, ExitReasons.NormalExit);
                 assert.strictEqual(reason.payload.code, expectedReturnCode);
 
-                assert.strictEqual(spyOnAudioFrame.callCount, expectedAudioFramesCount);
+                assert.isTrue(spyOnAudioFrame.called);
 
-                assert.strictEqual(spyOnIFrame.callCount, expectedIFramesCount);
-                assert.strictEqual(spyOnPFrame.callCount, expectedPFramesCount);
+                assert.isTrue(spyOnIFrame.called);
+                assert.isTrue(spyOnPFrame.called);
 
                 done();
             } catch (err) {

diff --git a/tests/Functional/processFrames.test.js b/tests/Functional/processFrames.test.js
diff --git a/tests/Unit/FramesMonitor/_runShowFramesProcess.test.js b/tests/Unit/FramesMonitor/_runShowFramesProcess.test.js
@@ -11,6 +11,8 @@ function getSpawnArguments(url, timeoutInSec, errorLevel) {
         '-hide_banner',
         '-v',
         errorLevel,
+        '-fflags',
+        'nobuffer',
         '-show_frames',
         '-show_entries',
         'frame=pkt_size,pkt_pts_time,media_type,pict_type,key_frame,width,height',

diff --git a/tests/inputs/test_open_gop.mp4 b/tests/inputs/test_open_gop.mp4