[vlc-commits] [Git][videolan/vlc][master] 4 commits: vdummy: implement the display callback

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
9e85ee74 by Thomas Guillem at 2022-05-06T06:08:54+00:00
vdummy: implement the display callback

Otherwise, the vout won't be paced at and will never wait for the clock.

Regression since 3f75f04af6b.

- - - - -
2edfdad3 by Thomas Guillem at 2022-05-06T06:08:54+00:00
test: vout: implement the display callback

Otherwise, the vout won't be paced at and will never wait for the clock.

Regression since 3f75f04af6b.

- - - - -
0d961863 by Thomas Guillem at 2022-05-06T06:08:54+00:00
test: vout: remove unused close cb

- - - - -
f8326cf4 by Thomas Guillem at 2022-05-06T06:08:54+00:00
vout: display: assert that prepare or display cbs are valid

- - - - -


3 changed files:

- modules/video_output/vdummy.c
- src/video_output/display.c
- test/src/video_output/video_output.c


Changes:

=====================================
modules/video_output/vdummy.c
=====================================
@@ -83,7 +83,14 @@ static void Open(vout_display_t *vd, video_format_t *fmt)
     }
 }
 
+static void Display(vout_display_t *vd, picture_t *picture)
+{
+    (void) vd;
+    (void) picture;
+}
+
 static const struct vlc_display_operations ops_dummy = {
+    .display = Display,
     .control = Control,
 };
 


=====================================
src/video_output/display.c
=====================================
@@ -677,6 +677,7 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
 
         int ret = cb(vd, &osys->display_fmt, vctx);
         if (ret == VLC_SUCCESS) {
+            assert(vd->ops->prepare != NULL || vd->ops->display != NULL);
             if (VoutDisplayCreateRender(vd) == 0) {
                 msg_Dbg(vd, "using %s module \"%s\"", "vout display",
                         module_get_object(mods[i]));


=====================================
test/src/video_output/video_output.c
=====================================
@@ -165,9 +165,10 @@ static int OpenWindow(vout_window_t *wnd)
     return VLC_SUCCESS;
 }
 
-static void CloseDisplay(vout_display_t *vd)
+static void Display(vout_display_t *vd, picture_t *picture)
 {
-
+    (void) vd;
+    (void) picture;
 }
 
 static int OpenDisplay(vout_display_t *vd, video_format_t *fmtp,
@@ -175,7 +176,7 @@ static int OpenDisplay(vout_display_t *vd, video_format_t *fmtp,
 {
     static const struct vlc_display_operations ops =
     {
-        .close = CloseDisplay,
+        .display = Display,
     };
     vd->ops = &ops;
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b1e684c77a725884d315989a5341d0522d16d1db...f8326cf47c8f896790fd16b3e8d2448647df58ce

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/b1e684c77a725884d315989a5341d0522d16d1db...f8326cf47c8f896790fd16b3e8d2448647df58ce
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance