[vlc-devel] [PATCH 14/17] Decklink: Audio frames are now vlc_frame_t

Denis Charmet typx at dinauz.org
Mon Apr 22 19:10:43 CEST 2019


---
 modules/video_output/decklink.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 98460c1abc..2c16fb1c05 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -39,7 +39,6 @@
 
 #include <vlc_vout_display.h>
 
-#include <vlc_block.h>
 #include <vlc_image.h>
 #include <vlc_aout.h>
 
@@ -1137,7 +1136,7 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
     return VLC_SUCCESS;
 }
 
-static void PlayAudio(audio_output_t *aout, block_t *audio, vlc_tick_t systempts)
+static void PlayAudio(audio_output_t *aout, vlc_frame_t *audio, vlc_tick_t systempts)
 {
     decklink_sys_t *sys = (decklink_sys_t *) aout->sys;
     vlc_mutex_lock(&sys->lock);
@@ -1145,7 +1144,7 @@ static void PlayAudio(audio_output_t *aout, block_t *audio, vlc_tick_t systempts
     audio->i_pts -= sys->offset;
     vlc_mutex_unlock(&sys->lock);
     if (!p_output) {
-        block_Release(audio);
+        vlc_frame_Release(audio);
         return;
     }
 
@@ -1159,7 +1158,7 @@ static void PlayAudio(audio_output_t *aout, block_t *audio, vlc_tick_t systempts
     else if (sampleFrameCount != written)
         msg_Err(aout, "Written only %d samples out of %d", written, sampleFrameCount);
 
-    block_Release(audio);
+    vlc_frame_Release(audio);
 }
 
 static int OpenAudio(vlc_object_t *p_this)
-- 
2.20.1



More information about the vlc-devel mailing list