Packman Build Service PMBS

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/contrib/src/orc/rules.mak -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/contrib/src/orc/rules.mak Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/contrib/src/smb2/rules.mak -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/contrib/src/smb2/rules.mak Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/include/vlc_cxx_helpers.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/include/vlc_cxx_helpers.hpp Changed

@@ -51,7 +51,7 @@
 // building as C++17 (noexcept becomes part of the function signature stating there)
 
 // Wraps a pointer with a custom releaser
-// ex: auto ptr = vlc_wrap_cptr( input_item, &input_item_Release );
+// ex: auto ptr = vlc::wrap_cptr( input_item, &input_item_Release );
 
 ///
 /// Wraps a C pointer into a std::unique_ptr
@@ -60,7 +60,7 @@
 /// T is the pointee type, and R is an arbitrary releaser type.
 ///
 /// ptr will be automatically released by calling r( ptr ) when falling out of
-/// scope (whether by returning of by throwing an exception
+/// scope (whether by returning or by throwing an exception).
 ///
 /// @param ptr a C pointer
 /// @param r An instance of a Callable type, that will be invoked with ptr
@@ -82,7 +82,7 @@
 /// releaser type.
 ///
 /// ptr will be automatically released by calling r( ptr ) when falling out of
-/// scope (whether by returning of by throwing an exception
+/// scope (whether by returning or by throwing an exception).
 ///
 /// This function is equivalent to wrap_cptr, except that the returned
 /// unique_ptr provides an operator for array access instead of operator* and
@@ -136,16 +136,13 @@
 /// To create a new shared resource wrapper type for my_type_t, simply declare:
 ///
 ///     using MyTypePtr =
-///         vlc_shared_data_ptr_type(my_type_t, my_type_Hold, my_type_Release);
+///         ::vlc::vlc_shared_data_ptr<my_type_t, &my_type_Hold, &my_type_Release>;
 ///
 /// Then use it to wrap a raw C pointer:
 ///
 ///     my_type_t *raw_ptr = /* ... */;
 ///     MyTypePtr ptr(raw_ptr);
-
-// In C++17, the template declaration could be replaced by:
-//     template<typename T, auto HOLD, auto RELEASE>
-template <typename T, typename H, typename R, H HOLD, R RELEASE>
+template <typename T, auto HOLD, auto RELEASE>
 class vlc_shared_data_ptr {
     T *ptr = nullptr;
 
@@ -271,11 +268,6 @@
     }
 };
 
-// useful due to the unnecessarily complex template declaration before C++17
-#define vlc_shared_data_ptr_type(type, hold, release) \
-    ::vlc::vlc_shared_data_ptr<type, decltype(&hold), decltype(&release), \
-                               &hold, &release>
-
 #if defined(VLC_THREADS_H_) || defined(DOC)
 
 namespace threads

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/network/addonsmodel.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/network/addonsmodel.cpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/network/vlcmediasourcewrapper.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/network/vlcmediasourcewrapper.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/player/input_models.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/player/input_models.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/player/player_controller.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/player/player_controller.cpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/player/player_controller.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/player/player_controller.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/player/player_controller_p.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/player/player_controller_p.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/playlist/playlist_item.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/playlist/playlist_item.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/tests/test_renderer_manager_model.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/tests/test_renderer_manager_model.cpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/util/renderer_manager.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/util/renderer_manager.cpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/util/shared_input_item.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/util/shared_input_item.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/gui/qt/util/varcommon_p.hpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/gui/qt/util/varcommon_p.hpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/misc/medialibrary/fs/directory.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/misc/medialibrary/fs/directory.cpp Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/video_chroma/gst_mem.c -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/video_chroma/gst_mem.c Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/video_filter/canvas.c -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/video_filter/canvas.c Changed

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/video_output/win32/wingdi.c -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/video_output/win32/wingdi.c Changed

@@ -60,7 +60,6 @@
 typedef struct vout_display_sys_t
 {
     struct event_thread_t    *video_wnd;
-    bool                     size_changed;
     bool                     place_changed;
 
     /* Our offscreen bitmap and its framebuffer */
@@ -130,22 +129,19 @@
     VLC_UNUSED(date);
     vout_display_sys_t *sys = vd->sys;
 
-    if (sys->place_changed || sys->size_changed)
+    if (sys->place_changed)
     {
         bool err = false;
         HWND hwnd = CommonVideoHWND(sys->video_wnd);
         HDC hdc = GetDC(hwnd);
-        if (sys->size_changed)
-            err |= ChangeSize(vd, hdc);
-        if (sys->place_changed)
-            err |= ChangePlace(vd, hdc);
+        err |= ChangeSize(vd, hdc);
+        err |= ChangePlace(vd, hdc);
         ReleaseDC(hwnd, hdc);
 
         if (unlikely(err))
             return;
 
         sys->place_changed = false;
-        sys->size_changed = false;
     }
 
     assert((LONG)picture->format.i_visible_width  == sys->bmiInfo.bmiHeader.biWidth &&
@@ -198,8 +194,6 @@
     if (!sys)
         return VLC_ENOMEM;
 
-    sys->size_changed = true;
-    sys->place_changed = true;
     if (CommonWindowInit(vd, &sys->video_wnd, false))
         goto error;
 
@@ -318,6 +312,8 @@
     sys->off_dc = CreateCompatibleDC(window_dc);
 
     int err = ChangeSize(vd, window_dc);
+    if (err == VLC_SUCCESS)
+        err = ChangePlace(vd, window_dc);
     if (err != VLC_SUCCESS)
         DeleteDC(sys->off_dc);

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/modules/video_output/xcb/x11.c -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/modules/video_output/xcb/x11.c Changed

@@ -47,7 +47,6 @@
     xcb_shm_seg_t segment; /**< shared memory segment XID */
     bool attached;
     uint8_t depth; /* useful bits per pixel */
-    video_format_t fmt;
 } vout_display_sys_t;
 
 static void Prepare(vout_display_t *vd, picture_t *pic,
@@ -134,19 +133,19 @@
         ck = xcb_shm_put_image_checked(conn, sys->window, sys->gc,
               /* real width */ pic->p->i_pitch / pic->p->i_pixel_pitch,
              /* real height */ pic->p->i_lines,
-                       /* x */ sys->fmt.i_x_offset,
-                       /* y */ sys->fmt.i_y_offset,
-                   /* width */ sys->fmt.i_visible_width,
-                  /* height */ sys->fmt.i_visible_height,
+                       /* x */ vd->fmt->i_x_offset,
+                       /* y */ vd->fmt->i_y_offset,
+                   /* width */ vd->fmt->i_visible_width,
+                  /* height */ vd->fmt->i_visible_height,
                                vd->place->x, vd->place->y, sys->depth,
                                XCB_IMAGE_FORMAT_Z_PIXMAP, 0,
                                segment, buf->offset);
     else {
-        const size_t offset = sys->fmt.i_x_offset * pic->p->i_pixel_pitch
-                            + sys->fmt.i_y_offset * pic->p->i_pitch;
-        unsigned int lines = pic->p->i_lines - sys->fmt.i_y_offset;
+        const size_t offset = vd->fmt->i_x_offset * pic->p->i_pixel_pitch
+                            + vd->fmt->i_y_offset * pic->p->i_pitch;
+        unsigned int lines = pic->p->i_lines - vd->fmt->i_y_offset;
 
-        if (sys->fmt.i_x_offset > 0) {
+        if (vd->fmt->i_x_offset > 0) {
             /*
              * Draw the last line separately as the scan line padding would
              * potentially reach beyond the end of the picture buffer.
@@ -187,35 +186,30 @@
         xcb_shm_detach(conn, segment);
 }
 
-static int ResetPictures(vout_display_t *vd, video_format_t *fmt)
+static int ResetPictures(vout_display_t *vd, video_format_t *restrict f)
 {
-    vout_display_sys_t *sys = vd->sys;
     video_format_t src;
 
     video_format_ApplyRotation(&src, vd->source);
-    sys->fmt.i_width  = src.i_width  * vd->place->width / src.i_visible_width;
-    sys->fmt.i_height = src.i_height * vd->place->height / src.i_visible_height;
-
-    sys->fmt.i_visible_width  = vd->place->width;
-    sys->fmt.i_visible_height = vd->place->height;
-    sys->fmt.i_x_offset = src.i_x_offset * vd->place->width / src.i_visible_width;
-    sys->fmt.i_y_offset = src.i_y_offset * vd->place->height / src.i_visible_height;
+    f->i_width  = src.i_width  * vd->place->width / src.i_visible_width;
+    f->i_height = src.i_height * vd->place->height / src.i_visible_height;
 
-    *fmt = sys->fmt;
+    f->i_visible_width  = vd->place->width;
+    f->i_visible_height = vd->place->height;
+    f->i_x_offset = src.i_x_offset * vd->place->width / src.i_visible_width;
+    f->i_y_offset = src.i_y_offset * vd->place->height / src.i_visible_height;
     return VLC_SUCCESS;
 }
 
 static int Control(vout_display_t *vd, int query)
 {
-    vout_display_sys_t *sys = vd->sys;
-
     switch (query) {
     case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
     case VOUT_DISPLAY_CHANGE_SOURCE_PLACE:
     {
-        if (vd->place->width  != sys->fmt.i_visible_width
-         || vd->place->height != sys->fmt.i_visible_height)
+        if (vd->place->width  != vd->fmt->i_visible_width
+         || vd->place->height != vd->fmt->i_visible_height)
             return VLC_EGENERIC;
 
         return VLC_SUCCESS;
@@ -238,8 +232,8 @@
 
     xcb_configure_window(sys->conn, sys->window, mask, values);
 
-    if (vd->place->width  != sys->fmt.i_visible_width ||
-        vd->place->height != sys->fmt.i_visible_height)
+    if (vd->place->width  != vd->fmt->i_visible_width ||
+        vd->place->height != vd->fmt->i_visible_height)
         return VLC_EGENERIC;
 
     return VLC_SUCCESS;
@@ -398,8 +392,8 @@
     else
         sys->segment = 0;
 
-    sys->fmt = *fmtp;
     /* Setup vout_display_t once everything is fine */
+    ResetPictures(vd, fmtp);
     vd->ops = &ops;
 
     (void) context;

_service:obs_scm:vlc-beta-20251008.adcf4aff3.obscpio/src/test/shared_data_ptr.cpp -> _service:obs_scm:vlc-beta-20251009.59103d665.obscpio/src/test/shared_data_ptr.cpp Changed

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 137