Projects
Extra
vlc-beta
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 137
View file
_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
@@ -18,7 +18,7 @@ ORC_CONF := -Dauto_features=disabled -.orc: orc +.orc: orc crossfile.meson $(MESONCLEAN) $(MESON) $(ORC_CONF) +$(MESONBUILD)
View file
_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
@@ -25,7 +25,7 @@ SMB2_CONF := -DENABLE_LIBKRB5=OFF -.smb2: smb2 +.smb2: smb2 toolchain.cmake $(CMAKECLEAN) $(HOSTVARS_CMAKE) $(CMAKE) $(SMB2_CONF) +$(CMAKEBUILD)
View file
_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
View file
_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
@@ -59,8 +59,8 @@ namespace { -using AddonPtr = vlc_shared_data_ptr_type(addon_entry_t, - addon_entry_Hold, addon_entry_Release); +using AddonPtr = ::vlc::vlc_shared_data_ptr<addon_entry_t, + &addon_entry_Hold, &addon_entry_Release>; class AddonItem { public:
View file
_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
@@ -24,13 +24,13 @@ #include <vlc_media_source.h> #include <vlc_cxx_helpers.hpp> -using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t, - vlc_media_source_Hold, - vlc_media_source_Release); +using MediaSourcePtr = ::vlc::vlc_shared_data_ptr<vlc_media_source_t, + &vlc_media_source_Hold, + &vlc_media_source_Release>; -using MediaTreePtr = vlc_shared_data_ptr_type(vlc_media_tree_t, - vlc_media_tree_Hold, - vlc_media_tree_Release); +using MediaTreePtr = ::vlc::vlc_shared_data_ptr<vlc_media_tree_t, + &vlc_media_tree_Hold, + &vlc_media_tree_Release>; class MediaTreeLocker {
View file
_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
@@ -90,7 +90,7 @@ QString m_title; //vlc_es_id_t *m_id = NULL; - vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_id; + ::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_id; bool m_selected = false; }; QList<Data> m_data; @@ -139,7 +139,7 @@ private: vlc_player_t* m_player; - typedef vlc_shared_data_ptr_type(vlc_player_title_list, vlc_player_title_list_Hold, vlc_player_title_list_Release) PlayerTitleList; + typedef ::vlc::vlc_shared_data_ptr<vlc_player_title_list, &vlc_player_title_list_Hold, &vlc_player_title_list_Release> PlayerTitleList; PlayerTitleList m_titleList; int m_current = -1; int m_count = 0;
View file
_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
@@ -49,13 +49,13 @@ //PlayerController private implementation -using SharedEsId = vlc_shared_data_ptr_type(vlc_es_id_t, - vlc_es_id_Hold, - vlc_es_id_Release); +using SharedEsId = ::vlc::vlc_shared_data_ptr<vlc_es_id_t, + &vlc_es_id_Hold, + &vlc_es_id_Release>; -using SharedTitleList = vlc_shared_data_ptr_type(vlc_player_title_list, - vlc_player_title_list_Hold, - vlc_player_title_list_Release); +using SharedTitleList = ::vlc::vlc_shared_data_ptr<vlc_player_title_list, + &vlc_player_title_list_Hold, + &vlc_player_title_list_Release>; PlayerControllerPrivate::~PlayerControllerPrivate() {
View file
_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
@@ -38,8 +38,8 @@ using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>; -using SharedVOutThread = vlc_shared_data_ptr_type(vout_thread_t, vout_Hold, vout_Release); -using SharedAOut = vlc_shared_data_ptr_type(audio_output_t, aout_Hold, aout_Release); +using SharedVOutThread = ::vlc::vlc_shared_data_ptr<vout_thread_t, &vout_Hold, &vout_Release>; +using SharedAOut = ::vlc::vlc_shared_data_ptr<audio_output_t, &aout_Hold, &aout_Release>; class RendererManager; class QSignalMapper;
View file
_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
@@ -120,7 +120,7 @@ TrackListModel m_audioTracks; TrackListModel m_subtitleTracks; - vlc_shared_data_ptr_type(vlc_es_id_t, vlc_es_id_Hold, vlc_es_id_Release) m_secondarySpuEsId; + ::vlc::vlc_shared_data_ptr<vlc_es_id_t, &vlc_es_id_Hold, &vlc_es_id_Release> m_secondarySpuEsId; VLCDuration m_audioDelay; VLCDuration m_subtitleDelay;
View file
_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
@@ -34,9 +34,9 @@ //namespace vlc { // namespace playlist { -using SharedPlaylistItem = vlc_shared_data_ptr_type(vlc_playlist_item_t, - vlc_playlist_item_Hold, - vlc_playlist_item_Release); +using SharedPlaylistItem = ::vlc::vlc_shared_data_ptr<vlc_playlist_item_t, + &vlc_playlist_item_Hold, + &vlc_playlist_item_Release>; /** * Playlist item wrapper.
View file
_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
@@ -22,9 +22,9 @@ #include "../util/renderer_manager.hpp" -using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t, - vlc_renderer_item_hold, - vlc_renderer_item_release); +using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t, + &vlc_renderer_item_hold, + &vlc_renderer_item_release>; class TestClass : public QObject {
View file
_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
@@ -33,7 +33,7 @@ static void player_renderer_changed(vlc_player_t *, vlc_renderer_item_t *new_item, void *data); -using RendererItemPtr = vlc_shared_data_ptr_type(vlc_renderer_item_t, vlc_renderer_item_hold, vlc_renderer_item_release); +using RendererItemPtr = ::vlc::vlc_shared_data_ptr<vlc_renderer_item_t, &vlc_renderer_item_hold, &vlc_renderer_item_release>; using vlc_player_locker = vlc_locker<vlc_player_t, vlc_player_Lock, vlc_player_Unlock>; struct ItemEntry
View file
_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
@@ -30,9 +30,9 @@ #include <vlc_cxx_helpers.hpp> -using SharedInputItem = vlc_shared_data_ptr_type(input_item_t, - input_item_Hold, - input_item_Release); +using SharedInputItem = ::vlc::vlc_shared_data_ptr<input_item_t, + &input_item_Hold, + &input_item_Release>; Q_DECLARE_METATYPE(SharedInputItem)
View file
_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
@@ -89,7 +89,7 @@ private: static void obj_hold( vout_thread_t* obj ) { vout_Hold(obj); } static void obj_release( vout_thread_t* obj ) { vout_Release(obj); } - typedef vlc_shared_data_ptr_type(vout_thread_t, obj_hold, obj_release) SharedPtr; + typedef ::vlc::vlc_shared_data_ptr<vout_thread_t, &obj_hold, &obj_release> SharedPtr; SharedPtr m_object; }; @@ -149,7 +149,7 @@ private: static void obj_hold( audio_output_t* obj ) { aout_Hold(obj); } static void obj_release( audio_output_t* obj ) { aout_Release(obj); } - typedef vlc_shared_data_ptr_type(audio_output_t, obj_hold, obj_release) SharedPtr; + typedef ::vlc::vlc_shared_data_ptr<audio_output_t, &obj_hold, &obj_release> SharedPtr; SharedPtr m_object; };
View file
_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
@@ -41,9 +41,9 @@ #include <system_error> #include <vector> -using InputItemPtr = vlc_shared_data_ptr_type(input_item_t, - input_item_Hold, - input_item_Release); +using InputItemPtr = ::vlc::vlc_shared_data_ptr<input_item_t, + &input_item_Hold, + &input_item_Release>; namespace vlc { namespace medialibrary {
View file
_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
@@ -103,11 +103,17 @@ ret = filter_chain_AppendConverter(p_chain, &fmt_intermediate); es_format_Clean(&fmt_intermediate); if (ret != VLC_SUCCESS) + { + filter_chain_Delete(p_chain); return ret; + } ret = filter_chain_AppendConverter(p_chain, NULL); if (ret != VLC_SUCCESS) + { + filter_chain_Delete(p_chain); return ret; + } p_filter->p_sys = p_chain; p_filter->ops = &chain_ops;
View file
_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
@@ -345,6 +345,7 @@ if ( ret != VLC_SUCCESS ) { msg_Err( p_filter, "Could not append scaling filter" ); + filter_chain_Delete( p_sys->p_chain ); free( p_sys ); return ret; }
View file
_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);
View file
_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;
View file
_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
@@ -21,7 +21,7 @@ p->count--; } -using MockRcPtr = vlc_shared_data_ptr_type(mockrc, mockrc_Hold, mockrc_Release); +using MockRcPtr = ::vlc::vlc_shared_data_ptr<mockrc, &mockrc_Hold, &mockrc_Release>; static void test_raii() {
View file
_service:obs_scm:vlc-beta.obsinfo
Changed
@@ -1,4 +1,4 @@ name: vlc-beta -version: 20251008.adcf4aff3 -mtime: 1759937447 -commit: adcf4aff3ce4863b5adde5d301251fb7b565851a +version: 20251009.59103d665 +mtime: 1760028972 +commit: 59103d665c3e00116a36d9c644ce93ed24714185
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.