[vlc-commits] filters: use filter_Flush() instead of accessing the callback directly

Steve Lhomme git at videolan.org
Tue Oct 13 11:07:13 CEST 2020


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Oct  6 11:54:36 2020 +0200| [92596e16f1066fe329f7c7537173749f13e09f22] | committer: Steve Lhomme

filters: use filter_Flush() instead of accessing the callback directly

It's easier to find out who flushes filters and when.

It's also easier to reorder the code without having the Flush callback above a
lot of common code.

The di_flush call in MMAL passthrough mode was probably wrong.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=92596e16f1066fe329f7c7537173749f13e09f22
---

 modules/audio_filter/converter/tospdif.c | 2 +-
 modules/hw/mmal/converter.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/audio_filter/converter/tospdif.c b/modules/audio_filter/converter/tospdif.c
index 5b0e2df8fc..be01958b30 100644
--- a/modules/audio_filter/converter/tospdif.c
+++ b/modules/audio_filter/converter/tospdif.c
@@ -588,7 +588,7 @@ static block_t *DoWork( filter_t *p_filter, block_t *p_in_buf )
         case SPDIF_MORE_DATA:
             break;
         case SPDIF_ERROR:
-            Flush( p_filter );
+            filter_Flush( p_filter );
             break;
     }
 
diff --git a/modules/hw/mmal/converter.c b/modules/hw/mmal/converter.c
index 872ffe4892..4059e1504e 100644
--- a/modules/hw/mmal/converter.c
+++ b/modules/hw/mmal/converter.c
@@ -711,7 +711,7 @@ fail:
         mmal_buffer_header_release(out_buf);
     if (p_pic != NULL)
         picture_Release(p_pic);
-    conv_flush(p_filter);
+    filter_Flush(p_filter);
     return NULL;
 }
 



More information about the vlc-commits mailing list