[vlc-commits] video_output: rename vout_FilterDisplay() to vout_ConvertForDisplay()

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Feb 18 14:20:40 2019 +0100| [1f6e46a388e511c3ef898e7eba3911ca445f78dc] | committer: Steve Lhomme

video_output: rename vout_FilterDisplay() to vout_ConvertForDisplay()

It's not any kind of filter, it's the filter to convert the source format
into the format accepted by the display.

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

 src/video_output/display.c      | 4 ++--
 src/video_output/video_output.c | 2 +-
 src/video_output/vout_wrapper.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index c5b1703243..c93ca4dae6 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -418,7 +418,7 @@ bool vout_IsDisplayFiltered(vout_display_t *vd)
     return osys->converters == NULL || !filter_chain_IsEmpty(osys->converters);
 }
 
-picture_t *vout_FilterDisplay(vout_display_t *vd, picture_t *picture)
+picture_t *vout_ConvertForDisplay(vout_display_t *vd, picture_t *picture)
 {
     vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
 
@@ -452,7 +452,7 @@ picture_t *vout_display_Prepare(vout_display_t *vd, picture_t *picture,
                                 subpicture_t *subpic, vlc_tick_t date)
 {
     assert(subpic == NULL); /* TODO */
-    picture = vout_FilterDisplay(vd, picture);
+    picture = vout_ConvertForDisplay(vd, picture);
 
     if (picture != NULL && vd->prepare != NULL)
         vd->prepare(vd, picture, subpic, date);
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 0ef179d059..4c4f55af68 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1079,7 +1079,7 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
     /* Render the direct buffer */
     vout_UpdateDisplaySourceProperties(vd, &todisplay->format);
 
-    todisplay = vout_FilterDisplay(vd, todisplay);
+    todisplay = vout_ConvertForDisplay(vd, todisplay);
     if (todisplay == NULL) {
         if (subpic != NULL)
             subpicture_Delete(subpic);
diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
index dffbfa4057..d95a34359d 100644
--- a/src/video_output/vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -33,7 +33,7 @@ picture_pool_t *vout_GetPool(vout_display_t *vd, unsigned count);
  * It destroy a vout managed display.
  */
 bool vout_IsDisplayFiltered(vout_display_t *);
-picture_t * vout_FilterDisplay(vout_display_t *, picture_t *);
+picture_t * vout_ConvertForDisplay(vout_display_t *, picture_t *);
 void vout_FilterFlush(vout_display_t *);
 
 void vout_SetDisplayFilled(vout_display_t *, bool is_filled);