[vlc-commits] [Git][videolan/vlc][master] Revert "configure: generate an error in extra checks when return type is bogus"

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
239eafa8 by Rémi Denis-Courmont at 2024-05-30T18:26:05+03:00
Revert "configure: generate an error in extra checks when return type is 
bogus"

This reverts commit 4cd7d490402b1e733f41a5b1b593077a3bc39ab1.

This warning can occur in callbacks that never return. Some functions cannot
have a return statement because that would cause dead code warnings, while
they also cannot return void because the callback prototype is externally
mandated. Ideally the compiler would notice that the function does not
return, and sometimes it does, but evidently we cannot rely on that, so
we have to revert this warning back to a warning, not an error.

Fixes #28650.

- - - - -


1 changed file:

- configure.ac


Changes:

=
configure.ac
=
@@ -1189,9 +1189,9 @@ AC_ARG_ENABLE([extra_checks],
 [Turn some warnings into compilation error (default 
disabled)]),,
 [enable_extra_checks="no"])
 AS_IF([test "${enable_extra_checks}" = "yes"], [
-AX_APPEND_COMPILE_FLAGS([-Werror=missing-field-initializers -Werror=format 
-Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion 
-Werror=return-type -Werror=implicit-int -Werror=return-mismatch 
-Werror=declaration-missing-parameter-type], [CFLAGS])
+AX_APPEND_COMPILE_FLAGS([-Werror=missing-field-initializers -Werror=format 
-Werror=incompatible-pointer-types -Werror=restrict -Werror=int-conversion 
-Werror=implicit-int -Werror=return-mismatch 
-Werror=declaration-missing-parameter-type], [CFLAGS])
 AC_LANG_PUSH(C++)
-AX_APPEND_COMPILE_FLAGS([-Werror=missing-field-initializers -Werror=format 
-Werror=return-type -Werror=return-mismatch], [CXXFLAGS])
+AX_APPEND_COMPILE_FLAGS([-Werror=missing-field-initializers -Werror=format 
-Werror=return-mismatch], [CXXFLAGS])
 AC_LANG_POP(C++)
 ])
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/239eafa8b1a9a8f3e9d830232e09fba4675d705a

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/239eafa8b1a9a8f3e9d830232e09fba4675d705a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] test: link demux-run with cdg plugin

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
410d5999 by Jonas Dittrich at 2024-02-23T19:52:30+00:00
test: link demux-run with cdg plugin

- - - - -


2 changed files:

- test/Makefile.am
- test/src/input/demux-run.c


Changes:

=
test/Makefile.am
=
@@ -335,6 +335,7 @@ libvlc_demux_run_la_LIBADD += \
../modules/libau_plugin.la \
../modules/libavi_plugin.la \
../modules/libcaf_plugin.la \
+   ../modules/libdemux_cdg_plugin.la \
../modules/libes_plugin.la \
../modules/libflacsys_plugin.la \
../modules/libh26x_plugin.la \


=
test/src/input/demux-run.c
=
@@ -425,6 +425,7 @@ int vlc_demux_process_memory(const struct vlc_run_args 
*args,
 f(demux_au) \
 f(demux_avi_avi) \
 f(demux_caf) \
+f(demux_demux_cdg) \
 f(demux_mpeg_es) \
 f(demux_flacsys) \
 f(demux_mpeg_h26x) \



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/410d599922f7890f506decd3cb6591cf78e8d668

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/410d599922f7890f506decd3cb6591cf78e8d668
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] 8 commits: demux: mp4: set samples duration

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
3e324f65 by François Cartegnie at 2024-02-20T08:30:09+00:00
demux: mp4: set samples duration

(cherry picked from commit 096500ddebd4d621ea8ce96cdd93baa2ce05a2a8) (rebased)
rebased:
- vlc_tick_t is merged in 3.0
Signed-off-by: Steve Lhomme 

- - - - -
5eaa84f9 by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: i_nztime is an vlc_tick_t as the comment suggests

(cherry picked from commit 52f365152813cf692956ba37ff700ef3c5c7e1a5)
Signed-off-by: Steve Lhomme 

- - - - -
539fc944 by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: the result of MP4_TrackGetDTS() is always used as a vlc_tick_t

Also for the value returned by MP4_TrackGetPTSDelta()

(cherry picked from commit 2060b8b3e2aee1e080889766c802b978ee9ffe92) (edited)
edited:
- vlc_tick was merged in 3.0
Signed-off-by: Steve Lhomme 

- - - - -
fc759ab8 by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: simplify value check

No need to due the subtraction, the value is overwritten right after.

(cherry picked from commit 878df3f879ad8c87a1a5b35dd904bf7d52d31a34)
Signed-off-by: Steve Lhomme 

- - - - -
9229409a by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: the i_start in TrackTimeToSampleChunk() is a vlc_tick_t

That's the kind of data it is given

(cherry picked from commit 09f5070644fad4a9f101ae039c897702bbb63306)
Signed-off-by: Steve Lhomme 

- - - - -
7d59dda7 by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: separate stime_t & vlc_tick_t duration in MP4_GetInterleaving()

Thus max_continuity is effectively an vlc_tick_t which compares correctly to
DEMUX_TRACK_MAX_PRELOAD

(cherry picked from commit f2be7ebbed9b475e91ca3bfe842fb8a451f016ed)
Signed-off-by: Steve Lhomme 

- - - - -
091f734e by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: use a special timestamp rescaler to convert explicitly to vlc_tick_t

(cherry picked from commit 3b84ba41218c7d4f03f0abeb569067ace77ad25e) (edited)
edited:
* MP4_TrackTimeApplyELST was merged in 3.0
* the code around changes is slightly different
* DEMUX_GET_PTS_DELAY expects a int64_t, not a mtime_t
Signed-off-by: Steve Lhomme 

- - - - -
c6883f93 by Steve Lhomme at 2024-02-20T08:30:09+00:00
demux:mp4: use a special timestamp rescaler to convert explicitly from 
vlc_tick_t

(cherry picked from commit ddfb4f086701bcdf2988402ec144ef7dfdd3c23d) (rebased)
rebased:
* the i_traf_start_time processing is different in 3.0 with i_moof_time involved
* the frag seek time doesn't use b_iframesync
* the code around the changes was slightly different
Signed-off-by: Steve Lhomme 

- - - - -


1 changed file:

- modules/demux/mp4/mp4.c


Changes:

=
modules/demux/mp4/mp4.c
=
@@ -80,7 +80,7 @@ struct demux_sys_t
 uint64_t i_duration;   /* Declared fragmented duration (movie 
time scale) */
 uint64_t i_cumulated_duration; /* Same as above, but not from probing, 
(movie time scale) */
 uint32_t i_timescale;  /* movie time scale */
-uint64_t i_nztime; /* time position of the presentation 
(CLOCK_FREQ timescale) */
+vlc_tick_t   i_nztime; /* time position of the presentation 
(CLOCK_FREQ timescale) */
 unsigned int i_tracks;   /* number of tracks */
 mp4_track_t  *track; /* array of track */
 floatf_fps;  /* number of frame per seconds */
@@ -205,6 +205,16 @@ static int64_t MP4_rescale( int64_t i_value, uint32_t 
i_timescale, uint32_t i_ne
 return q * i_newscale + r * i_newscale / i_timescale;
 }
 
+static vlc_tick_t MP4_rescale_mtime( int64_t i_value, uint32_t i_timescale )
+{
+return MP4_rescale(i_value, i_timescale, CLOCK_FREQ);
+}
+
+static int64_t MP4_rescale_qtime( vlc_tick_t i_value, uint32_t i_timescale )
+{
+return MP4_rescale(i_value, CLOCK_FREQ, i_timescale);
+}
+
 static uint32_t stream_ReadU32( stream_t *s, void *p_read, uint32_t i_toread )
 {
 ssize_t i_return = 0;
@@ -406,7 +416,7 @@ static void MP4_TrackTimeApplyELST( const mp4_track_t 
*p_track, uint64_t i_movie
 }
 
 /* Return time in microsecond of a track */
-static inline mtime_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t *p_track )
+static inline vlc_tick_t MP4_TrackGetDTS( demux_t *p_demux, mp4_track_t 
*p_track )
 {
 demux_sys_t *p_sys = p_demux->p_sys;
 const mp4_chunk_t *p_chunk = &p_track->chunk[p_track->i_chunk];
@@ -417,22 +427,69 @@ static inline mtime_t MP4_TrackGetDTS( demux_t *p_demux, 
mp4_track_t *p_track )
 /* now handle elst */
 MP4_TrackTimeApplyELST( p_track, p_sys->i_timescale, &sdts );
 
-return MP4_rescale( sdts, p_track->i_timescale, CLOCK_FREQ );
+return MP4_rescale_mtime( sdts, p_track->i_timescale );
 }
 
 static inline bool MP4_TrackGetPTSDelta( demux_t *p_demux, co

[vlc-commits] [Git][videolan/vlc][master] avcodec: do not hard-code pix format wrong

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
270a9e1d by Rémi Denis-Courmont at 2024-02-21T18:52:39+00:00
avcodec: do not hard-code pix format wrong

This is plain wrong. This is practically wrong because it actually
broke HDR support in VDPAU and it is theoretically wrong because it
requires hard-coding values internal to avcodec, and which vary by
versions at that.

Fixes #28530.

- - - - -


1 changed file:

- modules/codec/avcodec/va.c


Changes:

=
modules/codec/avcodec/va.c
=
@@ -35,69 +35,10 @@ bool vlc_va_MightDecode(enum AVPixelFormat hwfmt, enum 
AVPixelFormat swfmt)
 switch (hwfmt)
 {
 case AV_PIX_FMT_VAAPI:
-switch (swfmt)
-{
-case AV_PIX_FMT_YUVJ420P:
-case AV_PIX_FMT_YUV420P:
-case AV_PIX_FMT_YUV420P10LE:
-return true;
-default:
-return false;
-}
 case AV_PIX_FMT_DXVA2_VLD:
-switch (swfmt)
-{
-case AV_PIX_FMT_YUV420P10LE:
-case AV_PIX_FMT_YUVJ420P:
-case AV_PIX_FMT_YUV420P:
-case AV_PIX_FMT_YUV444P:
-case AV_PIX_FMT_YUV420P12:
-case AV_PIX_FMT_YUV444P10:
-case AV_PIX_FMT_YUV444P12:
-case AV_PIX_FMT_YUV422P10:
-case AV_PIX_FMT_YUV422P12:
-return true;
-default:
-return false;
-}
-break;
-
 case AV_PIX_FMT_D3D11VA_VLD:
-switch (swfmt)
-{
-case AV_PIX_FMT_YUV420P10LE:
-case AV_PIX_FMT_YUVJ420P:
-case AV_PIX_FMT_YUV420P:
-case AV_PIX_FMT_YUV444P:
-case AV_PIX_FMT_YUV420P12:
-case AV_PIX_FMT_YUV444P10:
-case AV_PIX_FMT_YUV444P12:
-case AV_PIX_FMT_YUV422P10:
-case AV_PIX_FMT_YUV422P12:
-return true;
-default:
-return false;
-}
-break;
-
 case AV_PIX_FMT_VDPAU:
-switch (swfmt)
-{
-case AV_PIX_FMT_YUVJ444P:
-case AV_PIX_FMT_YUV444P:
-case AV_PIX_FMT_YUV444P10:
-case AV_PIX_FMT_YUV444P12:
-case AV_PIX_FMT_YUVJ422P:
-case AV_PIX_FMT_YUV422P:
-case AV_PIX_FMT_YUVJ420P:
-case AV_PIX_FMT_YUV420P:
-case AV_PIX_FMT_YUV420P10:
-case AV_PIX_FMT_YUV420P12:
-return true;
-default:
-return false;
-}
-break;
+return true;
 default:
 return false;
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/270a9e1d1a39161a599b92871b0fdcf1e122e31b

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/270a9e1d1a39161a599b92871b0fdcf1e122e31b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 3 commits: access: always pass en50221_capmt_info_t as const

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
6436143c by François Cartegnie at 2024-02-20T20:43:55+00:00
access: always pass en50221_capmt_info_t as const

Will allow caching the struct instead of rebuilding
a new one for each call.

- - - - -
0b14fe9c by François Cartegnie at 2024-02-20T20:43:55+00:00
demux: ts: cache CAPMT info

- - - - -
678d0466 by François Cartegnie at 2024-02-20T20:43:55+00:00
demux: ts: update CAPMT on program selection change

- - - - -


12 changed files:

- modules/access/dtv/access.c
- modules/access/dtv/bdagraph.cpp
- modules/access/dtv/dtv.h
- modules/access/dtv/en50221.c
- modules/access/dtv/en50221.h
- modules/access/dtv/en50221_capmt.h
- modules/access/dtv/linux.c
- modules/demux/mpeg/ts.c
- modules/demux/mpeg/ts_psi.c
- modules/demux/mpeg/ts_psi.h
- modules/demux/mpeg/ts_streams.c
- modules/demux/mpeg/ts_streams_private.h


Changes:

=
modules/access/dtv/access.c
=
@@ -577,7 +577,7 @@ static int Control (stream_t *access, int query, va_list 
args)
 
 case STREAM_SET_PRIVATE_ID_CA:
 {
-en50221_capmt_info_t *pmt = va_arg(args, void *);
+const en50221_capmt_info_t *pmt = va_arg(args, void *);
 
 if( !dvb_set_ca_pmt (dev, pmt) )
 return VLC_EGENERIC;


=
modules/access/dtv/bdagraph.cpp
=
@@ -215,7 +215,7 @@ int dvb_fill_device_caps( dvb_device_t *, dvb_device_caps_t 
* )
 return -1;
 }
 
-bool dvb_set_ca_pmt (dvb_device_t *, en50221_capmt_info_t *)
+bool dvb_set_ca_pmt (dvb_device_t *, const en50221_capmt_info_t *)
 {
 return false;
 }


=
modules/access/dtv/dtv.h
=
@@ -73,7 +73,7 @@ float dvb_get_signal_strength (dvb_device_t *);
 float dvb_get_snr (dvb_device_t *);
 
 typedef struct en50221_capmt_info_s en50221_capmt_info_t;
-bool dvb_set_ca_pmt (dvb_device_t *, en50221_capmt_info_t *);
+bool dvb_set_ca_pmt (dvb_device_t *, const en50221_capmt_info_t *);
 
 int dvb_set_inversion (dvb_device_t *, int);
 int dvb_tune (dvb_device_t *);


=
modules/access/dtv/en50221.c
=
@@ -2179,10 +2179,11 @@ void en50221_Poll( cam_t * p_cam )
 /*
  * en50221_SetCAPMT :
  */
-int en50221_SetCAPMT( cam_t * p_cam, en50221_capmt_info_t *p_info )
+int en50221_SetCAPMT( cam_t * p_cam, const en50221_capmt_info_t *p_info )
 {
 bool b_update = false;
 bool b_needs_descrambling = CAPMTNeedsDescrambling( p_info );
+en50221_capmt_info_t *p_oldinfo = NULL;
 
 for ( unsigned i = 0; i < MAX_PROGRAMS; i++ )
 {
@@ -2192,34 +2193,37 @@ int en50221_SetCAPMT( cam_t * p_cam, 
en50221_capmt_info_t *p_info )
 {
 b_update = true;
 
+/* Existing scrambled program went clear now */
 if ( !b_needs_descrambling )
 {
-en50221_capmt_Delete( p_info );
-p_info = p_cam->pp_selected_programs[i];
+p_oldinfo = p_cam->pp_selected_programs[i];
 p_cam->pp_selected_programs[i] = NULL;
 }
+/* Existing scrambled program has been updated */
 else if( p_info != p_cam->pp_selected_programs[i] )
 {
 en50221_capmt_Delete( p_cam->pp_selected_programs[i] );
-p_cam->pp_selected_programs[i] = p_info;
+p_cam->pp_selected_programs[i] = en50221_capmt_Duplicate( 
p_info );
 }
 
 break;
 }
 }
 
+/* New selection of scrambled program */
 if ( !b_update && b_needs_descrambling )
 {
 for ( unsigned i = 0; i < MAX_PROGRAMS; i++ )
 {
 if ( p_cam->pp_selected_programs[i] == NULL )
 {
-p_cam->pp_selected_programs[i] = p_info;
+p_cam->pp_selected_programs[i] = en50221_capmt_Duplicate( 
p_info );
 break;
 }
 }
 }
 
+/* Serialization of CAPMT commands to CI */
 if ( b_update || b_needs_descrambling )
 {
 for ( unsigned i = 1; i <= MAX_SESSIONS; i++ )
@@ -2230,17 +2234,15 @@ int en50221_SetCAPMT( cam_t * p_cam, 
en50221_capmt_info_t *p_info )
 if ( b_update && b_needs_descrambling )
 CAPMTUpdate( p_cam, i, p_info );
 else if ( b_update )
-CAPMTDelete( p_cam, i, p_info );
+CAPMTDelete( p_cam, i, p_oldinfo );
 else
 CAPMTAdd( p_cam, i, p_info );
 }
 }
 }
 
-if ( !b_needs_descrambling )
-{
-en50221_capmt_Delete( p_info );
-}
+if( p_oldinfo )
+  

[vlc-commits] [Git][videolan/vlc][master] 6 commits: stdckdint: add compatibility header

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
38c10291 by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
stdckdint: add compatibility header

This only implements unsigned types for now, as there are no known use
cases for signed checked arithmetic as of yet. The macros will safely
error out at compilation time if signed types are misused.

- - - - -
167633ac by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
lib: use 

- - - - -
444d71bf by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
core: use 

- - - - -
58f181ad by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
mms: use 

- - - - -
88432ec9 by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
coreaudio: use 

- - - - -
de4e0e33 by Rémi Denis-Courmont at 2024-02-20T19:34:53+00:00
rdp: use 

- - - - -


14 changed files:

- compat/Makefile.am
- + compat/stdckdint/stdckdint.h
- configure.ac
- lib/media_player.c
- lib/media_track.c
- lib/picture.c
- meson.build
- modules/access/mms/mmstu.c
- modules/access/rdp.c
- modules/audio_output/coreaudio_common.c
- src/misc/objres.c
- src/misc/picture.c
- src/player/title.c
- src/text/memstream.c


Changes:

=
compat/Makefile.am
=
@@ -1,4 +1,4 @@
-noinst_HEADERS = stdbit/stdbit.h
+noinst_HEADERS = stdbit/stdbit.h stdckdint/stdckdint.h
 pkglib_LTLIBRARIES = libcompat.la
 libcompat_la_SOURCES = dummy.c
 libcompat_la_LIBADD = $(LTLIBOBJS) $(LIBRT) $(LIBM)


=
compat/stdckdint/stdckdint.h
=
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+
+#ifndef __STDC_VERSION_STDCKDINT_H__
+# define __STDC_VERSION_STDCKDINT_H__ 202311L
+
+# if defined(__GNUC__) || defined(__clang__)
+#  define ckd_add(r, a, b) __builtin_add_overflow(a, b, r)
+#  define ckd_sub(r, a, b) __builtin_sub_overflow(a, b, r)
+#  define ckd_mul(r, a, b) __builtin_mul_overflow(a, b, r)
+# else
+#  include 
+
+#  define __ckd_unsigned(suffix, type, MAX) \
+static inline _Bool __ckd_add_##suffix(type *r, type a, type b) \
+{ \
+*r = a + b; \
+return ((type)(a + b)) < a; \
+} \
+\
+static inline _Bool __ckd_sub_##suffix(type *r, type a, type b) \
+{ \
+*r = a - b; \
+return a < b; \
+} \
+\
+static inline _Bool __ckd_mul_##suffix(type *r, type a, type b) \
+{ \
+*r = a * b; \
+return b > 0 && a > (MAX / b); \
+}
+
+#  define __ckd_func(op, r, a, b) \
+_Generic (*(r), \
+unsigned char:  __ckd_##op##_uc((unsigned char *)(r), a, b), \
+unsigned short: __ckd_##op##_us((unsigned short *)(r), a, b), \
+unsigned int:   __ckd_##op##_ui((unsigned int *)(r), a, b), \
+unsigned long:  __ckd_##op##_ul((unsigned long *)(r), a, b), \
+unsigned long long: __ckd_##op##_ull((unsigned long long *)(r), a, b))
+
+__ckd_unsigned(uc,  unsigned char,  UCHAR_MAX)
+__ckd_unsigned(us,  unsigned short, USHRT_MAX)
+__ckd_unsigned(ui,  unsigned int,   UINT_MAX)
+__ckd_unsigned(ul,  unsigned long,  ULONG_MAX)
+__ckd_unsigned(ull, unsigned long long, ULLONG_MAX)
+
+#  define ckd_add(r, a, b) __ckd_func(add, r, a, b)
+#  define ckd_sub(r, a, b) __ckd_func(sub, r, a, b)
+#  define ckd_mul(r, a, b) __ckd_func(mul, r, a, b)
+# endif
+#endif /* __STDC_VERSION_STDCKDINT_H__ */


=
configure.ac
=
@@ -983,6 +983,9 @@ dnl
 AC_CHECK_HEADER([stdbit.h],, [
   CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdbit"
 ])
+AC_CHECK_HEADER([stdckdint.h],, [
+  CPPFLAGS="${CPPFLAGS} -I\$(top_srcdir)/compat/stdckdint"
+])
 
 dnl  POSIX
 AC_CHECK_HEADERS([arpa/inet.h poll.h pthread.h search.h sys/shm.h sys/socket.h 
sys/uio.h wordexp.h])


=
lib/media_player.c
=
@@ -25,6 +25,7 @@
 #endif
 
 #include 
+#include 
 
 #include 
 #include 
@@ -2122,9 +2123,8 @@ libvlc_media_player_get_programlist( 
libvlc_media_player_t *p_mi )
 goto error;
 
 size_t size;
-if( mul_overflow( count, sizeof(libvlc_player_program_t *), &size) )
-goto error;
-if( add_ov

[vlc-commits] [Git][videolan/vlc][master] avcodec: update VDPAU candidate chromas

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
eb282ddb by Rémi Denis-Courmont at 2024-02-20T09:30:06+00:00
avcodec: update VDPAU candidate chromas

This is a partial/short-term work-around for the functional regression
caused by 8d94f8ecfc5. That commit should be reverted to fix this properly
and more permanently.

- - - - -


1 changed file:

- modules/codec/avcodec/va.c


Changes:

=
modules/codec/avcodec/va.c
=
@@ -85,10 +85,14 @@ bool vlc_va_MightDecode(enum AVPixelFormat hwfmt, enum 
AVPixelFormat swfmt)
 {
 case AV_PIX_FMT_YUVJ444P:
 case AV_PIX_FMT_YUV444P:
+case AV_PIX_FMT_YUV444P10:
+case AV_PIX_FMT_YUV444P12:
 case AV_PIX_FMT_YUVJ422P:
 case AV_PIX_FMT_YUV422P:
 case AV_PIX_FMT_YUVJ420P:
 case AV_PIX_FMT_YUV420P:
+case AV_PIX_FMT_YUV420P10:
+case AV_PIX_FMT_YUV420P12:
 return true;
 default:
 return false;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/eb282ddbb6dc4428e6d377dd686caf52e601bbce

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] include: remove legacy GCC version checks

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
2102849e by Rémi Denis-Courmont at 2024-02-20T08:52:57+00:00
include: remove legacy GCC version checks

According to NEWS, we require GCC 8.0 or later, so there are is point
checking for 5.0 or 6.0 any longer.

- - - - -


1 changed file:

- include/vlc_common.h


Changes:

=
include/vlc_common.h
=
@@ -64,13 +64,6 @@
  * unoptimized fallbacks for other C11/C++11 conforming compilers.
  * @{
  */
-#ifdef __GNUC__
-# define VLC_GCC_VERSION(maj,min) \
-((__GNUC__ > (maj)) || (__GNUC__ == (maj) && __GNUC_MINOR__ >= (min)))
-#else
-/** GCC version check */
-# define VLC_GCC_VERSION(maj,min) (0)
-#endif
 
 /* Function attributes for compiler warnings */
 #if defined __has_attribute
@@ -167,11 +160,7 @@
 
 
 #ifdef __GNUC__
-# if VLC_GCC_VERSION(6,0)
-#  define VLC_DEPRECATED_ENUM __attribute__((deprecated))
-# else
-#  define VLC_DEPRECATED_ENUM
-# endif
+# define VLC_DEPRECATED_ENUM __attribute__((deprecated))
 
 # if defined( _WIN32 ) && !defined( __clang__ )
 #  define VLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
@@ -764,7 +753,7 @@ static inline uint64_t vlc_bswap64(uint64_t x)
  */
 static inline bool uadd_overflow(unsigned a, unsigned b, unsigned *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_uadd_overflow(a, b, res);
 #else
  *res = a + b;
@@ -775,7 +764,7 @@ static inline bool uadd_overflow(unsigned a, unsigned b, 
unsigned *res)
 static inline bool uaddl_overflow(unsigned long a, unsigned long b,
   unsigned long *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_uaddl_overflow(a, b, res);
 #else
  *res = a + b;
@@ -786,7 +775,7 @@ static inline bool uaddl_overflow(unsigned long a, unsigned 
long b,
 static inline bool uaddll_overflow(unsigned long long a, unsigned long long b,
unsigned long long *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_uaddll_overflow(a, b, res);
 #else
  *res = a + b;
@@ -832,13 +821,13 @@ static inline bool add_overflow(unsigned long long a, 
unsigned long long b,
 }
 #endif
 
-#if !(VLC_GCC_VERSION(5,0) || defined(__clang__))
+#if !(defined(__GNUC__) || defined(__clang__))
 # include 
 #endif
 
 static inline bool umul_overflow(unsigned a, unsigned b, unsigned *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_umul_overflow(a, b, res);
 #else
  *res = a * b;
@@ -849,7 +838,7 @@ static inline bool umul_overflow(unsigned a, unsigned b, 
unsigned *res)
 static inline bool umull_overflow(unsigned long a, unsigned long b,
   unsigned long *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_umull_overflow(a, b, res);
 #else
  *res = a * b;
@@ -860,7 +849,7 @@ static inline bool umull_overflow(unsigned long a, unsigned 
long b,
 static inline bool umulll_overflow(unsigned long long a, unsigned long long b,
unsigned long long *res)
 {
-#if VLC_GCC_VERSION(5,0) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__)
  return __builtin_umulll_overflow(a, b, res);
 #else
  *res = a * b;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2102849ee4cb47e7a475fe12a5974130562bc97a

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2102849ee4cb47e7a475fe12a5974130562bc97a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt, windows: fix flickering of acrylic

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
1bb350fc by Prince Gupta at 2024-02-20T08:31:19+00:00
qt, windows: fix flickering of acrylic

don't reset acrylic surface on window position change
fixes #27603

- - - - -
59694013 by Prince Gupta at 2024-02-20T08:31:19+00:00
qt, dcomp: remove requestReset from acrylic surface

code is not used anymore

- - - - -


2 changed files:

- modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp
- modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp


Changes:

=
modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.cpp
=
@@ -106,6 +106,16 @@ 
CompositorDCompositionAcrylicSurface::CompositorDCompositionAcrylicSurface(qt_in
 {
 setActive(m_transparencyEnabled && m_mainCtx->acrylicActive());
 });
+
+// CSDWin32EventHandler updates frame when window is maximized
+connect(window(), &QWindow::windowStateChanged, this, [this]()
+{
+sync();
+commitChanges();
+}
+// CSDWin32EventHandler changes client rect on window state change
+// use queued connection so that we can get correct state.
+, Qt::QueuedConnection);
 }
 
 CompositorDCompositionAcrylicSurface::~CompositorDCompositionAcrylicSurface()
@@ -132,8 +142,6 @@ bool 
CompositorDCompositionAcrylicSurface::nativeEventFilter(const QByteArray &,
 
 sync();
 commitChanges();
-
-requestReset(); // in case z-order changed
 break;
 }
 case WM_SETTINGCHANGE:
@@ -417,15 +425,6 @@ void CompositorDCompositionAcrylicSurface::commitChanges()
 DwmFlush();
 }
 
-void CompositorDCompositionAcrylicSurface::requestReset()
-{
-if (m_resetPending)
-return;
-
-m_resetPending = true;
-m_resetTimer.start(5, Qt::PreciseTimer, this);
-}
-
 void CompositorDCompositionAcrylicSurface::setActive(const bool newActive)
 {
 if (newActive == m_active)
@@ -459,20 +458,4 @@ HWND CompositorDCompositionAcrylicSurface::hwnd()
 return nullptr;
 }
 
-void CompositorDCompositionAcrylicSurface::timerEvent(QTimerEvent *event)
-{
-if (!event)
-return;
-
-if (event->timerId() == m_resetTimer.timerId())
-{
-m_resetPending = false;
-m_resetTimer.stop();
-
-updateVisual();
-sync();
-commitChanges();
-}
-}
-
 }


=
modules/gui/qt/maininterface/compositor_dcomp_acrylicsurface.hpp
=
@@ -177,8 +177,6 @@ public:
 protected:
 bool nativeEventFilter(const QByteArray &eventType, void *message, long 
*result) override;
 
-void timerEvent(QTimerEvent *event) override;
-
 private:
 bool init(ID3D11Device *device);
 bool loadFunctions();
@@ -191,7 +189,6 @@ private:
 void sync();
 void updateVisual();
 void commitChanges();
-void requestReset();
 
 void setActive(bool newActive);
 
@@ -228,7 +225,6 @@ private:
 qt_intf_t *m_intf = nullptr;
 CompositorDirectComposition *m_compositor = nullptr;
 MainCtx *m_mainCtx = nullptr;
-QBasicTimer m_resetTimer;
 bool m_resetPending = false;
 bool m_active = false;
 bool m_transparencyEnabled = false;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/509c0e816d99d05d9efc72e6d4302aa2100ad7f7...5969401387ad119c0421fb582caf162d2acc51bb

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] modules: fix calloc() arguments

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
509c0e81 by Rémi Denis-Courmont at 2024-02-19T18:47:50+00:00
modules: fix calloc() arguments

- - - - -


1 changed file:

- src/modules/cache.c


Changes:

=
src/modules/cache.c
=
@@ -258,7 +258,7 @@ static int vlc_cache_load_plugin_config(vlc_plugin_t 
*plugin, block_t *file)
 /* Allocate memory */
 if (lines)
 {
-plugin->conf.params = calloc(sizeof (struct vlc_param), lines);
+plugin->conf.params = calloc(lines, sizeof (struct vlc_param));
 if (unlikely(plugin->conf.params == NULL))
 {
 plugin->conf.size = 0;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/509c0e816d99d05d9efc72e6d4302aa2100ad7f7

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/509c0e816d99d05d9efc72e6d4302aa2100ad7f7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] qml: delay fade animation until the sizes are ready in FadingEdge

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
f436f96a by Fatih Uzunoglu at 2024-02-19T17:51:23+00:00
qml: delay fade animation until the sizes are ready in FadingEdge

- - - - -


1 changed file:

- modules/gui/qt/widgets/qml/FadingEdge.qml


Changes:

=
modules/gui/qt/widgets/qml/FadingEdge.qml
=
@@ -112,6 +112,22 @@ Item {
 property real endFadeSize: root.enableEndFade ? normalFadeSize : 0
 readonly property real endFadePos: 1.0 - endFadeSize
 
+onBeginningFadeSizeChanged: {
+if (!beginningFadeBehavior.enabled) {
+Qt.callLater(() => {
+beginningFadeBehavior.enabled = true
+})
+}
+}
+
+onEndFadeSizeChanged: {
+if (!endFadeBehavior.enabled) {
+Qt.callLater(() => {
+endFadeBehavior.enabled = true
+})
+}
+}
+
 Component.onCompleted: {
 console.assert(shaderEffectSource.shaderEffect === null)
 shaderEffectSource.shaderEffect = this
@@ -124,6 +140,10 @@ Item {
 
 // TODO: Qt >= 5.15 use inline component
 Behavior on beginningFadeSize {
+id: beginningFadeBehavior
+
+enabled: false
+
 // Qt Bug: UniformAnimator does not work...
 NumberAnimation {
 duration: VLCStyle.duration_veryShort
@@ -132,6 +152,10 @@ Item {
 }
 
 Behavior on endFadeSize {
+id: endFadeBehavior
+
+enabled: false
+
 // Qt Bug: UniformAnimator does not work...
 NumberAnimation {
 duration: VLCStyle.duration_veryShort



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/f436f96a8a72d9af9bcbfa77fbd7a383233962c0

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: macosx: Enable autoscroll for carousels, hacking around buggy initial presentation

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
52cef12d by Claudio Cambra at 2024-02-19T17:25:55+00:00
macosx: Enable autoscroll for carousels, hacking around buggy initial 
presentation

Signed-off-by: Claudio Cambra 

- - - - -
80712124 by Claudio Cambra at 2024-02-19T17:25:55+00:00
macosx: Add option to disable autoscroll on carousel when interacted with

Signed-off-by: Claudio Cambra 

- - - - -
ac189620 by Claudio Cambra at 2024-02-19T17:25:55+00:00
macosx: Reenable auto scroll post interaction after timeout

Signed-off-by: Claudio Cambra 

- - - - -
b9c97261 by Claudio Cambra at 2024-02-19T17:25:55+00:00
macosx: Fix jitter on autoscroll reenable in icarousel

Signed-off-by: Claudio Cambra 

- - - - -


3 changed files:

- 
modules/gui/macosx/library/home-library/VLCLibraryHomeViewBaseCarouselContainerView.m
- modules/gui/macosx/views/iCarousel/iCarousel.h
- modules/gui/macosx/views/iCarousel/iCarousel.m


Changes:

=
modules/gui/macosx/library/home-library/VLCLibraryHomeViewBaseCarouselContainerView.m
=
@@ -112,6 +112,9 @@
 
 [self updateCarouselViewHeight];
 [self updateCarouselOffset];
+
+self.carouselView.autoscroll = -.05;
+self.carouselView.reenablePostInteractAutoscrollTimeout = 3.;
 }
 
 - (void)updateCarouselViewHeight


=
modules/gui/macosx/views/iCarousel/iCarousel.h
=
@@ -138,6 +138,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL scrollToItemBoundary;
 @property (nonatomic, assign) BOOL ignorePerpendicularSwipes;
 @property (nonatomic, assign) BOOL centerItemWhenSelected;
+@property (assign) BOOL disableAutoscrollOnInteract;
+@property (assign) CGFloat reenablePostInteractAutoscrollTimeout;
 @property (nonatomic, readonly, getter = isDragging) BOOL dragging;
 @property (nonatomic, readonly, getter = isDecelerating) BOOL decelerating;
 @property (nonatomic, readonly, getter = isScrolling) BOOL scrolling;


=
modules/gui/macosx/views/iCarousel/iCarousel.m
=
@@ -126,6 +126,8 @@
 @property (nonatomic, assign, getter = isDragging) BOOL dragging;
 @property (nonatomic, assign) BOOL didDrag;
 @property (nonatomic, assign) NSTimeInterval toggleTime;
+@property NSTimer *postInteractTimer;
+@property CGFloat priorAutoscroll;
 
 NSComparisonResult compareViewDepth(UIView *view1, UIView *view2, iCarousel 
*self);
 
@@ -152,6 +154,9 @@ NSComparisonResult compareViewDepth(UIView *view1, UIView 
*view2, iCarousel *sel
 _scrollToItemBoundary = YES;
 _ignorePerpendicularSwipes = YES;
 _centerItemWhenSelected = YES;
+_disableAutoscrollOnInteract = YES;
+_reenablePostInteractAutoscrollTimeout = 0.0;
+_priorAutoscroll = 0.0;
 
 _contentView = [[UIView alloc] initWithFrame:self.bounds];
 
@@ -2210,6 +2215,23 @@ NSComparisonResult compareViewDepth(UIView *view1, 
UIView *view2, iCarousel *sel
 
 - (void)mouseDragged:(NSEvent *)theEvent
 {
+if (self.disableAutoscrollOnInteract && self.autoscroll != 0.0) {
+self.priorAutoscroll = self.autoscroll;
+self.autoscroll = 0;
+
+if (self.reenablePostInteractAutoscrollTimeout > 0.0) {
+if (self.postInteractTimer != nil && self.postInteractTimer.valid) 
{
+[self.postInteractTimer invalidate];
+self.postInteractTimer = nil;
+}
+
+self.postInteractTimer = [NSTimer 
scheduledTimerWithTimeInterval:self.reenablePostInteractAutoscrollTimeout 
repeats:NO block:^(NSTimer * const timer){
+self.lastTime = CACurrentMediaTime();
+self.autoscroll = self.priorAutoscroll;
+}];
+}
+}
+
 _didDrag = YES;
 if (_scrollEnabled)
 {



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/ffd3f0e70a1b61d9d919387fa14558c1d4bf7881...b9c9726147188aa390e06998981ad92cc6befa19

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] Use requested win32 dvb-adapter parameter

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
be426a63 by Craig Huggins at 2024-02-19T17:25:46+00:00
Use requested win32 dvb-adapter parameter

(cherry picked from commit 81ce022fae048e4d5a17a08f7d15cea68d68adeb)
- - - - -


1 changed file:

- modules/access/dtv/bdagraph.cpp


Changes:

=
modules/access/dtv/bdagraph.cpp
=
@@ -2054,7 +2054,7 @@ HRESULT BDAGraph::Check( REFCLSID guid_this_network_type )
  * available, so return with an error. */
 
 long l_adapter = -1;
-l_adapter = var_GetInteger( p_access, "dvb-adapter" );
+l_adapter = var_InheritInteger( p_access, "dvb-adapter" );
 if( l_tuner_used < 0 && l_adapter >= 0 )
 l_tuner_used = l_adapter - 1;
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/be426a636a356e16a4b2f22790624748c338987a

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: stdbit: fix stdc_first_leading_*()

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
585c4f85 by Rémi Denis-Courmont at 2024-01-18T20:34:12+00:00
stdbit: fix stdc_first_leading_*()

- - - - -
1931ecd6 by Rémi Denis-Courmont at 2024-01-18T20:34:12+00:00
stdbit: factor stdc_first_trailing_zero*()

No functional changes.

- - - - -
623ee542 by Rémi Denis-Courmont at 2024-01-18T20:34:12+00:00
stdbit: factor stdc_count_zeros*()

No functional changes.

- - - - -
7a970a33 by Rémi Denis-Courmont at 2024-01-18T20:34:12+00:00
stdbit: fix std_bit_width*()

- - - - -


1 changed file:

- compat/stdbit/stdbit.h


Changes:

=
compat/stdbit/stdbit.h
=
@@ -243,116 +243,61 @@ static inline unsigned int 
stdc_trailing_ones_uc(unsigned char value)
 #define stdc_trailing_ones(value) \
 __stdbit_generic_type_func(trailing_ones, value)
 
-static inline unsigned int stdc_first_leading_zero_ull(unsigned long long 
value)
-{
-return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ull(value);
-}
-
-static inline unsigned int stdc_first_leading_zero_ul(unsigned long value)
-{
-return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ul(value);
-}
-
-static inline unsigned int stdc_first_leading_zero_ui(unsigned int value)
-{
-return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_ui(value);
-}
-
-static inline unsigned int stdc_first_leading_zero_us(unsigned short value)
-{
-return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_us(value);
-}
-
-static inline unsigned int stdc_first_leading_zero_uc(unsigned char value)
-{
-return (CHAR_BIT * sizeof (value)) - stdc_leading_zeros_uc(value);
-}
-
-#define stdc_first_leading_zero(value) \
-__stdbit_generic_type_func(first_leading_zero, value)
-
 static inline unsigned int stdc_first_leading_one_ull(unsigned long long value)
 {
-return stdc_first_leading_zero_ull(~value);
+return value ? (stdc_leading_zeros_ull(value) + 1) : 0;
 }
 
 static inline unsigned int stdc_first_leading_one_ul(unsigned long value)
 {
-return stdc_first_leading_zero_ul(~value);
+return value ? (stdc_leading_zeros_ul(value) + 1) : 0;
 }
 
 static inline unsigned int stdc_first_leading_one_ui(unsigned int value)
 {
-return stdc_first_leading_zero_ui(~value);
+return value ? (stdc_leading_zeros_ui(value) + 1) : 0;
 }
 
 static inline unsigned int stdc_first_leading_one_us(unsigned short value)
 {
-return stdc_first_leading_zero_us(~value);
+return value ? (stdc_leading_zeros_us(value) + 1) : 0;
 }
 
 static inline unsigned int stdc_first_leading_one_uc(unsigned char value)
 {
-return stdc_first_leading_zero_uc(~value);
+return value ? (stdc_leading_zeros_uc(value) + 1) : 0;
 }
 
 #define stdc_first_leading_one(value) \
 __stdbit_generic_type_func(first_leading_one, value)
 
-#if defined (__GNUC__) || defined (__clang__)
-static inline unsigned int stdc_first_trailing_zero_ull(unsigned long long 
value)
-{
-return __builtin_ffsll(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_ul(unsigned long value)
-{
-return __builtin_ffsl(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_ui(unsigned int value)
-{
-return __builtin_ffs(~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_us(unsigned short value)
-{
-return __builtin_ffs((unsigned short)~value);
-}
-
-static inline unsigned int stdc_first_trailing_zero_uc(unsigned char value)
-{
-return __builtin_ffs((unsigned char)~value);
-}
-#else
-static inline unsigned int stdc_first_trailing_zero_ull(unsigned long long 
value)
+static inline unsigned int stdc_first_leading_zero_ull(unsigned long long 
value)
 {
-return (~value) ? (1 + stdc_trailing_ones_ull(value)) : 0;
+return stdc_leading_ones_ull(~value);
 }
 
-static inline unsigned int stdc_first_trailing_zero_ul(unsigned long value)
+static inline unsigned int stdc_first_leading_zero_ul(unsigned long value)
 {
-return (~value) ? (1 + stdc_trailing_ones_ul(value)) : 0;
+return stdc_leading_ones_ul(~value);
 }
 
-static inline unsigned int stdc_first_trailing_zero_ui(unsigned int value)
+static inline unsigned int stdc_first_leading_zero_ui(unsigned int value)
 {
-return (~value) ? (1 + stdc_trailing_ones_ui(value)) : 0;
+return stdc_leading_ones_ui(~value);
 }
 
-static inline unsigned int stdc_first_trailing_zero_us(unsigned short value)
+static inline unsigned int stdc_first_leading_zero_us(unsigned short value)
 {
-return ((unsigned short)~value) ? (1 + stdc_trailing_ones_us(value)) : 0;
+return stdc_leading_ones_us(~value);
 }
 
-static inline unsigned int stdc_first_trailing_zero_uc(unsigned char value)
+static inline unsigned int stdc_first_leading_zero_uc(unsigned char value)
 {
-return ((unsigned char)~value) ? (1 + stdc_trailing_ones_uc(value)) : 0;
+return stdc_leading_ones_uc(~value);
 }
-#endif
 
-#define stdc_first_trailing_zero(value) \
-__stdbi

[vlc-commits] [Git][videolan/vlc][master] udisks: fix off-by-one

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
8d5dfed5 by Rémi Denis-Courmont at 2024-01-17T06:42:59+00:00
udisks: fix off-by-one

Refs #28486.

- - - - -


1 changed file:

- modules/services_discovery/udisks.c


Changes:

=
modules/services_discovery/udisks.c
=
@@ -101,8 +101,12 @@ static int human(uint64_t *i)
 {
 if (i == 0)
 return 0;
+
 unsigned exp = (stdc_bit_width(*i) - 1) / 10;
-exp = (exp < ARRAY_SIZE(binary_prefixes)) ? exp : 
ARRAY_SIZE(binary_prefixes);
+
+if (exp >= ARRAY_SIZE(binary_prefixes))
+exp = ARRAY_SIZE(binary_prefixes) - 1;
+
 *i >>= (10 * exp);
 return exp;
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/8d5dfed586a14f27038570840cf82d0c14cb1af7

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/8d5dfed586a14f27038570840cf82d0c14cb1af7
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: egl/x11: move window creation to CreateSurface()

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
6f38082e by Jeffrey Knockel at 2024-01-16T17:50:57+00:00
egl/x11: move window creation to CreateSurface()

This is a non-functional change so that we can facilitate creating the
window with the EGL config's visual in the future.

- - - - -
5d19dd41 by Jeffrey Knockel at 2024-01-16T17:50:57+00:00
egl/xcb: move window creation to CreateSurface()

This is a non-functional change so that we can facilitate creating the
window with the EGL config's visual in the future.

- - - - -
05606bdf by Jeffrey Knockel at 2024-01-16T17:50:57+00:00
egl/x11: create window with EGL config's visual

Previously we unconditionally created the EGL output window with the
visual of its screen's root window.  However, this visual does not
necessarily match the visual of our chosen EGL config.

- - - - -
e44289ca by Jeffrey Knockel at 2024-01-16T17:50:57+00:00
egl/xcb: create window with EGL config's visual

Previously we unconditionally created the EGL output window with the
visual of its screen's root window.  However, this visual does not
necessarily match the visual of our chosen EGL config.

- - - - -


1 changed file:

- modules/video_output/opengl/egl.c


Changes:

=
modules/video_output/opengl/egl.c
=
@@ -36,6 +36,7 @@
 #include 
 #ifdef USE_PLATFORM_X11
 # include 
+# include 
 #endif
 #ifdef USE_PLATFORM_XCB
 # include 
@@ -61,10 +62,12 @@ typedef struct vlc_gl_sys_t
 EGLContext context;
 #if defined (USE_PLATFORM_X11)
 Display *x11;
+unsigned long x11_black_pixel;
 Window x11_win;
 #endif
 #if defined (USE_PLATFORM_XCB)
 xcb_connection_t *conn;
+uint32_t xcb_black_pixel;
 xcb_window_t xcb_win;
 #endif
 #if defined (USE_PLATFORM_WAYLAND)
@@ -237,9 +240,33 @@ static EGLSurface CreateSurface(vlc_gl_t *gl, EGLDisplay 
dpy, EGLConfig config,
 unsigned int width, unsigned int height)
 {
 vlc_gl_sys_t *sys = gl->sys;
-Window win = sys->x11_win;
 
-XResizeWindow(sys->x11, win, width, height);
+EGLint val;
+if (eglGetConfigAttrib(dpy, config, EGL_NATIVE_VISUAL_ID, &val) == 
EGL_FALSE)
+return EGL_NO_SURFACE;
+XVisualInfo vinfo_template;
+int vinfoc;
+vinfo_template.visualid = (VisualID) val;
+XVisualInfo *vinfov = XGetVisualInfo(sys->x11, VisualIDMask, 
&vinfo_template, &vinfoc);
+if (vinfov == NULL || vinfoc == 0)
+return EGL_NO_SURFACE;
+Visual *visual = vinfov[0].visual;
+int depth = vinfov[0].depth;
+XFree(vinfov);
+
+unsigned long mask =
+CWBackPixel | CWBorderPixel | CWBitGravity | CWColormap;
+XSetWindowAttributes swa = {
+.background_pixel = sys->x11_black_pixel,
+.border_pixel = sys->x11_black_pixel,
+.bit_gravity = NorthWestGravity,
+.colormap = XCreateColormap(sys->x11, gl->surface->handle.xid, visual,
+AllocNone),
+};
+Window win = XCreateWindow(sys->x11, gl->surface->handle.xid, 0, 0, width,
+   height, 0, depth, InputOutput, visual, mask,
+   &swa);
+sys->x11_win = win;
 XMapWindow(sys->x11, win);
 
 # if defined(EGL_VERSION_1_5)
@@ -312,20 +339,8 @@ static EGLDisplay OpenDisplay(vlc_gl_t *gl)
 if (display == EGL_NO_DISPLAY)
 goto error;
 
-unsigned long mask =
-CWBackPixel | CWBorderPixel | CWBitGravity | CWColormap;
-XSetWindowAttributes swa = {
-.background_pixel = BlackPixelOfScreen(wa.screen),
-.border_pixel = BlackPixelOfScreen(wa.screen),
-.bit_gravity = NorthWestGravity,
-.colormap = DefaultColormapOfScreen(wa.screen),
-};
-
 sys->x11 = x11;
-sys->x11_win = XCreateWindow(x11, surface->handle.xid, 0, 0, wa.width,
- wa.height, 0, DefaultDepthOfScreen(wa.screen),
- InputOutput, DefaultVisualOfScreen(wa.screen),
- mask, &swa);
+sys->x11_black_pixel = BlackPixelOfScreen(wa.screen);
 return display;
 error:
 XCloseDisplay(x11);
@@ -382,18 +397,62 @@ static void DestroySurface(vlc_gl_t *gl)
 xcb_unmap_window(sys->conn, sys->xcb_win);
 }
 
+static uint8_t VisualIdToDepth(xcb_connection_t *conn, xcb_visualid_t vid)
+{
+xcb_screen_iterator_t si = xcb_setup_roots_iterator (xcb_get_setup (conn));
+for (; si.rem; xcb_screen_next (&si)) {
+xcb_depth_iterator_t di = xcb_screen_allowed_depths_iterator (si.data);
+for (; di.rem; xcb_depth_next (&di)) {
+xcb_visualtype_iterator_t vi = xcb_depth_visuals_iterator 
(di.data);
+for (; vi.rem; xcb_visualtype_next (&vi)) {
+if (vid == vi.data->visual_id) {
+return di.data->depth;
+}
+}
+}
+}
+return 0;
+}
+
 static EGLSurface CreateSurface(vlc_gl_t *gl, E

[vlc-commits] [Git][videolan/vlc][master] 2 commits: egl: factor common code

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
9ae398fd by Rémi Denis-Courmont at 2024-01-13T12:40:58+02:00
egl: factor common code

No functional changes.

- - - - -
467c85eb by Rémi Denis-Courmont at 2024-01-13T12:40:58+02:00
egl/wayland: require reference counting

Apart from the stand-alone window provider (which requires server-side
decorations), this provider cannot practically be used - unless
reference counting is supported.

So check that reference counting is supported and fail safe otherwise.

- - - - -


1 changed file:

- modules/video_output/opengl/egl.c


Changes:

=
modules/video_output/opengl/egl.c
=
@@ -164,34 +164,32 @@ static void ReleaseDisplay(vlc_gl_t *gl)
 static EGLDisplay OpenDisplay(vlc_gl_t *gl)
 {
 vlc_window_t *surface = gl->surface;
-EGLint ref_attr = EGL_NONE;
-
-# ifdef EGL_KHR_display_reference
-if (CheckClientExt("EGL_KHR_display_reference"))
-ref_attr = EGL_TRACK_REFERENCES_KHR;
-# endif
 
 if (surface->type != VLC_WINDOW_TYPE_WAYLAND)
 return EGL_NO_DISPLAY;
+if (!CheckClientExt("EGL_KHR_display_reference")) {
+msg_Warn(gl, "EGL display reference counting not supported");
+return EGL_NO_DISPLAY;
+}
 
-# if defined(EGL_VERSION_1_5)
-#  ifdef EGL_KHR_platform_wayland
-if (CheckClientExt("EGL_KHR_platform_wayland")) {
-const EGLAttrib attrs[] = { ref_attr, EGL_TRUE, EGL_NONE };
+# ifdef EGL_KHR_display_reference
+static const EGLAttrib attrs[] = {
+EGL_TRACK_REFERENCES_KHR, EGL_TRUE,
+EGL_NONE
+};
 
+#  if defined(EGL_VERSION_1_5)
+#   ifdef EGL_KHR_platform_wayland
+if (CheckClientExt("EGL_KHR_platform_wayland"))
 return eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR,
  surface->display.wl, attrs);
-}
-#  endif
-
-# elif defined(EGL_EXT_platform_wayland)
-if (CheckClientExt("EGL_EXT_platform_wayland")) {
-const EGLint attrs[] = { ref_attr, EGL_TRUE, EGL_NONE };
+#   endif
 
+#  elif defined(EGL_EXT_platform_wayland)
+if (CheckClientExt("EGL_EXT_platform_wayland"))
 return getPlatformDisplayEXT(EGL_PLATFORM_WAYLAND_EXT,
  surface->display.wl, attrs);
-}
-
+#  endif
 # endif
 return EGL_NO_DISPLAY;
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/346113b36b5ff643a886c1b59c14a00ada39ce02...467c85eba337e5b2ac57afb9bbbe0773d22fd10b

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] configure: add upper version constraint on libplacebo

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
9134e207 by Niklas Haas at 2024-01-13T09:31:13+00:00
configure: add upper version constraint on libplacebo

Libplacebo v6 substantially reworks the public API related to color
spaces, tone mapping, and more - and also requires GLSL 130 as a minimum
version, as well as access to OpenGL-backed textures to do any
nontrivial form of color mapping.

Not only does this result in compilation failures, but it also totally
prevents basic operation. These problems can be addressed on VLC v4, but
backporting all of that to VLC v3 would be prohitively costly. As such,
simply prevent VLC v3 from being combined with libplacebo v6,
intentionallly or otherwise.

- - - - -


1 changed file:

- configure.ac


Changes:

=
configure.ac
=
@@ -4197,7 +4197,7 @@ AC_ARG_ENABLE(libplacebo,
   [disable libplacebo support (default auto)])])
 
 AS_IF([test "$enable_libplacebo" != "no"], [
-  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2.1], [
+  PKG_CHECK_MODULES([LIBPLACEBO], [libplacebo >= 0.2.1 libplacebo < 6], [
 AC_DEFINE([HAVE_LIBPLACEBO], [1], [Define to 1 if libplacebo is enabled.])
   ], [
 AS_IF([test -n "${enable_libplacebo}"], [



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/9134e2079b5a14ce852ceaf84515c8e4ae35580f

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/9134e2079b5a14ce852ceaf84515c8e4ae35580f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] network: remove local IPV6 defines

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
3b8438ca by Johannes Kauffmann at 2024-01-06T17:43:44+00:00
network: remove local IPV6 defines

These defines are available since MinGW-W64 v2.0.

- - - - -


1 changed file:

- src/network/io.c


Changes:

=
src/network/io.c
=
@@ -90,11 +90,6 @@ int net_Socket (vlc_object_t *p_this, int family, int 
socktype,
 #endif
 
 #if defined (_WIN32)
-# ifndef IPV6_PROTECTION_LEVEL
-#  warning Please update your C library headers.
-#  define IPV6_PROTECTION_LEVEL 23
-#  define PROTECTION_LEVEL_UNRESTRICTED 10
-# endif
 if (family == AF_INET6)
 setsockopt (fd, IPPROTO_IPV6, IPV6_PROTECTION_LEVEL,
 &(int){ PROTECTION_LEVEL_UNRESTRICTED }, sizeof (int));



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3b8438caad22651d62ca337e67a3f68bce4611f8

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3b8438caad22651d62ca337e67a3f68bce4611f8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] pulse: print server info in debug

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ed436a34 by Rémi Denis-Courmont at 2024-01-06T15:40:33+00:00
pulse: print server info in debug

- - - - -


1 changed file:

- modules/audio_output/pulse.c


Changes:

=
modules/audio_output/pulse.c
=
@@ -1150,6 +1150,16 @@ fail:
 return VLC_EGENERIC;
 }
 
+static void server_info_cb(pa_context *ctx, const pa_server_info *info,
+   void *userdata)
+{
+audio_output_t *aout = userdata;
+
+msg_Dbg(aout, "server %s version %s on %s@%s", info->server_name,
+info->server_version, info->user_name, info->host_name);
+(void) ctx;
+}
+
 /**
  * Removes a PulseAudio playback stream
  */
@@ -1216,6 +1226,10 @@ static int Open(vlc_object_t *obj)
 aout->device_select = StreamMove;
 
 pa_threaded_mainloop_lock(sys->mainloop);
+op = pa_context_get_server_info(sys->context, server_info_cb, aout);
+if (likely(op != NULL))
+pa_operation_unref(op);
+
 /* Sinks (output devices) list */
 op = pa_context_get_sink_info_list(sys->context, sink_add_cb, aout);
 if (likely(op != NULL))



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ed436a3449e8d2254c05f174a5ade9cfa93b4ac2

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 33 commits: compat: add fallback for C23

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
a7707435 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
compat: add fallback for C23 

- - - - -
28e16df5 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
configure: expose fallback  if absent

- - - - -
364543f4 by Steve Lhomme at 2024-01-06T13:23:18+00:00
meson: expose fallback  if absent

Signed-off-by: Rémi Denis-Courmont 

- - - - -
a1245add by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
stdbit: use GCC / Clang built-ins where applicable

- - - - -
6dccabda by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
jack: use stdc_bit_floor()

- - - - -
2c2f7782 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
oss: use stdc_bit_width()

- - - - -
1d4a993b by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
cli: use stdc_leading_ones()

- - - - -
ff4998ac by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
ts: use stdc_bit_width()

- - - - -
e9a72670 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
lua: use stdc_leading_ones()

- - - - -
f4ae4633 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
hevc: use stdc_bit_width()

- - - - -
291ae983 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
udisks: use stdc_bit_width()

- - - - -
ea1a53da by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
opengl: use std_ceil_bit()

- - - - -
0fca15d7 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
include: remove ad-hoc count_leading_zeros functions

- - - - -
12c21a94 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
dtv: use stdc_trailing_zeros()

- - - - -
2ab31af0 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
rtp/mp2v: use stdc_trailing_zeros()

- - - - -
e40f2973 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
rtp/rawvid: use stdc_trailing_zeros()

- - - - -
ebffbb5d by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
cli: use stdc_trailing_zeros()

- - - - -
4cf5be4f by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
mux/mpeg: use stdc_trailing_zeros()

- - - - -
3046f027 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
mux/mpeg: use stdc_has_single_bit()

- - - - -
83dc5256 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
orient: use stdc_trailing_zeros()

- - - - -
88912a7d by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
deinterlace: use stdc_trailing_zeros()

- - - - -
ebcdd69a by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
picture_pool: use stdc_trailing_zeros()

- - - - -
cbfd849f by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
rtp/pcm: use stdc_count_ones()

- - - - -
dc384d52 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
wasapi: use stdc_count_ones()

- - - - -
c3e955bb by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
remap: use stdc_count_ones()

- - - - -
73ad6b5d by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
alsa: use stdc_count_ones()

- - - - -
5616696f by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
faad: use stdc_count_ones()

- - - - -
42547658 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
flac: use stdc_count_ones()

- - - - -
b73113c6 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
mp4: use stdc_count_ones()

- - - - -
f5b0d227 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
a52: use stdc_count_ones()

- - - - -
b11df40e by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
dts: use stdc_count_ones()

- - - - -
e73b7daa by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
xcb: use stdc_count_ones()

- - - - -
75510b03 by Rémi Denis-Courmont at 2024-01-06T13:23:18+00:00
hxxx: use stdc_has_single_bit()

- - - - -


30 changed files:

- compat/Makefile.am
- + compat/stdbit/stdbit.h
- configure.ac
- include/vlc_common.h
- meson.build
- modules/access/dtv/access.c
- modules/access/jack.c
- modules/access/rtp/mpeg12.c
- modules/access/rtp/pcm.c
- modules/access/wasapi.c
- modules/audio_filter/channel_mixer/remap.c
- modules/audio_output/alsa.c
- modules/audio_output/oss.c
- modules/codec/faad.c
- modules/codec/flac.c
- modules/codec/rtp-rawvid.c
- modules/control/cli/cli.c
- modules/control/cli/player.c
- modules/demux/mp4/essetup.c
- modules/demux/mpeg/ts_psi.c
- modules/lua/libs/win.c
- modules/mux/mpeg/tables.c
- modules/packetizer/a52.h
- modules/packetizer/dts.c
- modules/packetizer/hevc_nal.c
- modules/packetizer/hxxx_nal.h
- modules/services_discovery/udisks.c
- modules/video_chroma/orient.c
- modules/video_filter/deinterlace/deinterlace.c
- modules/video_output/opengl/gl_util.h


The diff was not included because it is too large.


View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/d395e10d4882bc2c9b7947c3ef50cc9f2eff806f...75510b031df2f3eef20f4168c7949b575210c194

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


VideoLAN code repository instance___
vl

[vlc-commits] [Git][videolan/vlc][master] 2 commits: sout: hls: fix double free on error

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
82a9de66 by Alaric Senat at 2024-01-06T11:27:16+00:00
sout: hls: fix double free on error

Variant parsing failure already clears the variant map. Calling
`hls_variant_maps_Destroy()` a second time was trigerring a double free.

- - - - -
d395e10d by Alaric Senat at 2024-01-06T11:27:16+00:00
sout: hls: increase playlist count at creation

Instead of increasing it at each ES addition. The previous behavior was
wrongly incrementing the playlist count when multiple ES were muxed in
the same playlist.

- - - - -


1 changed file:

- modules/stream_out/hls/hls.c


Changes:

=
modules/stream_out/hls/hls.c
=
@@ -629,8 +629,13 @@ static void DeletePlaylist(hls_playlist_t *playlist)
 static hls_playlist_t *AddPlaylist(sout_stream_t *stream, struct vlc_list 
*head)
 {
 hls_playlist_t *variant = CreatePlaylist(stream);
-if (variant != NULL)
-vlc_list_append(&variant->node, head);
+if (variant == NULL)
+return NULL;
+
+vlc_list_append(&variant->node, head);
+
+sout_stream_sys_t *sys = stream->p_sys;
+++sys->playlist_created_count;
 return variant;
 }
 
@@ -658,8 +663,6 @@ Add(sout_stream_t *stream, const es_format_t *fmt, const 
char *es_id)
 if (playlist == NULL)
 return NULL;
 
-++sys->playlist_created_count;
-
 sout_input_t *input = sout_MuxAddStream(playlist->mux, fmt);
 if (input == NULL)
 goto error;
@@ -930,7 +933,7 @@ static int Open(vlc_object_t *this)
 msg_Err(stream,
 "At least one variant mapping needs to be specified with the "
 "\"" SOUT_CFG_PREFIX "variants\" option");
-goto error;
+goto variant_error;
 }
 status = hls_variant_maps_Parse(variants, &sys->variant_stream_maps);
 free(variants);
@@ -940,7 +943,7 @@ static int Open(vlc_object_t *this)
 msg_Err(stream,
 "Wrong variant mapping syntax. It should look like: "
 "\"{id1,id2},{id3,id4},...\"");
-goto error;
+goto variant_error;
 }
 
 if (var_GetBool(stream, SOUT_CFG_PREFIX "host-http"))
@@ -989,6 +992,7 @@ static int Open(vlc_object_t *this)
 return VLC_SUCCESS;
 error:
 hls_variant_maps_Destroy(&sys->variant_stream_maps);
+variant_error:
 hls_config_Clean(&sys->config);
 free(sys);
 return status;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/97325b0f157af414028b1f2ed0a2551f75c5d8b2...d395e10d4882bc2c9b7947c3ef50cc9f2eff806f

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] player: fix vlc_player_Start() without effect

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
97325b0f by Thomas Guillem at 2024-01-06T10:02:32+00:00
player: fix vlc_player_Start() without effect

vlc_player_Start() could have 0 effects when the input was being deleted
while the user requested to play it again.

- - - - -


1 changed file:

- src/player/player.c


Changes:

=
src/player/player.c
=
@@ -1156,6 +1156,17 @@ vlc_player_Start(vlc_player_t *player)
 player->started = true;
 return VLC_SUCCESS;
 }
+else if (unlikely(player->media != NULL))
+{
+/* The current media is being stopped while the user requested to
+ * play it again. Tell the thread to play the same media when
+ * ready. */
+player->started = true;
+player->next_media = input_item_Hold(player->media);
+player->releasing_media = false;
+player->next_media_requested = true;
+return VLC_SUCCESS;
+}
 else
 return VLC_EGENERIC;
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/97325b0f157af414028b1f2ed0a2551f75c5d8b2

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/97325b0f157af414028b1f2ed0a2551f75c5d8b2
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 3 commits: qt: compositor: fix leak on compositor failure

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
da87c329 by Alexandre Janniaux at 2024-01-06T09:08:10+00:00
qt: compositor: fix leak on compositor failure

When a compositor was allocated but its initialization failed, the
pointer would not be returned by the
vlc::CompositorFactory::createCompositor function and the pointer was
leaked.

Fix the following leak:

Indirect leak of 120 byte(s) in 1 object(s) allocated from:
#0 0x7f806a2e2002 in operator new(unsigned long) 
/usr/src/debug/gcc/gcc/libsanitizer/asan/asan_new_delete.cpp:95
#1 0x7f80550b07b3 in instanciateCompositor 
../../../../modules/gui/qt/maininterface/compositor.cpp:45
#2 0x7f80550b59e8 in vlc::CompositorFactory::createCompositor() 
../../../../modules/gui/qt/maininterface/compositor.cpp:95
#3 0x7f80546daafa in Thread ../../../../modules/gui/qt/qt.cpp:822
#4 0x7f80688aa9ea  (/usr/lib/libc.so.6+0x8c9ea) (BuildId: 
8bfe03f6bf9b6a6e2591babd0bbc266837d8f658)

- - - - -
494ced7b by Alexandre Janniaux at 2024-01-06T09:08:10+00:00
qt: use unique_ptr for compositor

The code is already defending against nullptr since multiple clients can
destroy the pointer, and the compositor might not be allocated in the
situation where Qt is allocated as a dialog provider, so there is no
reason to not use std::unique_ptr here.

Previous commits also ensure that vlc_object_create<>() will correctly
initialize C++ objects, and vlc_object_destroy<>() will correctly
destroy them.

No functional changes.

- - - - -
4df5dbc2 by Alexandre Janniaux at 2024-01-06T09:08:10+00:00
qt: systempalette: use C++ wrapper for vlc_object_create

The C++ wrapper is simpler to write and would initialize C++ objects
correctly, though they are not required here.

- - - - -


4 changed files:

- modules/gui/qt/maininterface/compositor.cpp
- modules/gui/qt/qt.cpp
- modules/gui/qt/qt.hpp
- modules/gui/qt/style/systempalette.cpp


Changes:

=
modules/gui/qt/maininterface/compositor.cpp
=
@@ -92,12 +92,15 @@ Compositor* CompositorFactory::createCompositor()
 {
 if (m_compositorName == "auto" || m_compositorName == 
compositorList[m_compositorIndex].name)
 {
-Compositor* compositor = 
compositorList[m_compositorIndex].instantiate(m_intf);
+std::unique_ptr compositor {
+compositorList[m_compositorIndex].instantiate(m_intf)
+};
+
 if (compositor->init())
 {
 //avoid looping over the same compositor if the current ones 
fails further initialisation steps
 m_compositorIndex++;
-return compositor;
+return compositor.release();
 }
 }
 }


=
modules/gui/qt/qt.cpp
=
@@ -596,6 +596,8 @@ static int OpenIntfCommon( vlc_object_t *p_this, bool 
dialogProvider )
 {
 auto intfThread = reinterpret_cast(p_this);
 libvlc_int_t *libvlc = vlc_object_instance( p_this );
+
+/* Ensure initialization of objects in qt_intf_t. */
 auto p_intf = vlc_object_create( libvlc );
 if (!p_intf)
 return VLC_ENOMEM;
@@ -609,6 +611,7 @@ static int OpenIntfCommon( vlc_object_t *p_this, bool 
dialogProvider )
 p_intf->b_isDialogProvider = dialogProvider;
 p_intf->isShuttingDown = false;
 p_intf->refCount = 1;
+
 int ret = OpenInternal(p_intf);
 if (ret != VLC_SUCCESS)
 {
@@ -819,15 +822,14 @@ static void *Thread( void *obj )
 {
 bool ret = false;
 do {
-p_intf->p_compositor = compositorFactory.createCompositor();
+p_intf->p_compositor.reset(compositorFactory.createCompositor());
 if (! p_intf->p_compositor)
 break;
 ret = p_intf->p_compositor->makeMainInterface(p_intf->p_mi);
 if (!ret)
 {
 p_intf->p_compositor->destroyMainInterface();
-delete p_intf->p_compositor;
-p_intf->p_compositor = nullptr;
+p_intf->p_compositor.reset();
 }
 } while(!ret);
 
@@ -939,8 +941,7 @@ static void *ThreadCleanup( qt_intf_t *p_intf, 
CleanupReason cleanupReason )
 delete p_intf->mainSettings;
 p_intf->mainSettings = nullptr;
 
-delete p_intf->p_compositor;
-p_intf->p_compositor = nullptr;
+p_intf->p_compositor.reset();
 }
 }
 


=
modules/gui/qt/qt.hpp
=
@@ -32,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 #define QT_NO_CAST_TO_ASCII
@@ -106,7 +108,7 @@ struct qt_intf_t
 vlc_player_t *p_player; /* player */
 vlc::playlist::PlaylistController* p_mainPlaylistController;
 PlayerController* p_mainPlayerController;
-vlc::Compositor*

[vlc-commits] [Git][videolan/vlc][master] swscale: don't map to native-endian formats

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
9b4a4753 by Jeffrey Knockel at 2024-01-06T08:25:10+00:00
swscale: don't map to native-endian formats

Map to formats that produce the same byte order regardless of client
endianness.

- - - - -


1 changed file:

- modules/video_chroma/swscale.c


Changes:

=
modules/video_chroma/swscale.c
=
@@ -282,19 +282,19 @@ static void FixParameters( enum AVPixelFormat *pi_fmt, 
bool *pb_has_a, vlc_fourc
 *pb_has_a = true;
 break;
 case VLC_CODEC_RGBA:
-*pi_fmt = AV_PIX_FMT_BGR32;
+*pi_fmt = AV_PIX_FMT_RGBA;
 *pb_has_a = true;
 break;
 case VLC_CODEC_ARGB:
-*pi_fmt = AV_PIX_FMT_BGR32_1;
+*pi_fmt = AV_PIX_FMT_ARGB;
 *pb_has_a = true;
 break;
 case VLC_CODEC_BGRA:
-*pi_fmt = AV_PIX_FMT_RGB32;
+*pi_fmt = AV_PIX_FMT_BGRA;
 *pb_has_a = true;
 break;
 case VLC_CODEC_ABGR:
-*pi_fmt = AV_PIX_FMT_RGB32_1;
+*pi_fmt = AV_PIX_FMT_ABGR;
 *pb_has_a = true;
 break;
 default:



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/9b4a4753ececcb8e98349f81b3a303370061cd1f

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/9b4a4753ececcb8e98349f81b3a303370061cd1f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] xcb/x11: fix byte order for 24/32 depths

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
2ad7165b by Jeffrey Knockel at 2024-01-06T08:01:45+00:00
xcb/x11: fix byte order for 24/32 depths

Previously the client used the wrong byte order for these depths when
the server is little-endian.

- - - - -


1 changed file:

- modules/video_output/xcb/pictures.c


Changes:

=
modules/video_output/xcb/pictures.c
=
@@ -110,28 +110,32 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, 
uint_fast8_t depth,
 vt->green_mask == 0xff00 &&
 vt->blue_mask  == 0x00ff)
 {
-f->i_chroma = VLC_CODEC_XRGB;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_XRGB : VLC_CODEC_BGRX;
 }
 else
 if (vt->red_mask   == 0x00ff &&
 vt->green_mask == 0xff00 &&
 vt->blue_mask  == 0x00ff)
 {
-f->i_chroma = VLC_CODEC_XBGR;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_XBGR : VLC_CODEC_RGBX;
 }
 else
 if (vt->red_mask   == 0xff00 &&
 vt->green_mask == 0x00ff &&
 vt->blue_mask  == 0xff00)
 {
-f->i_chroma = VLC_CODEC_RGBX;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_RGBX : VLC_CODEC_XBGR;
 }
 else
 if (vt->red_mask   == 0xff00 &&
 vt->green_mask == 0x00ff &&
 vt->blue_mask  == 0xff00)
 {
-f->i_chroma = VLC_CODEC_BGRX;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_BGRX : VLC_CODEC_XRGB;
 }
 else
 return false;
@@ -142,14 +146,16 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, 
uint_fast8_t depth,
 vt->green_mask == 0x00ff00 &&
 vt->blue_mask  == 0xff)
 {
-f->i_chroma = VLC_CODEC_RGB24;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_RGB24 : VLC_CODEC_BGR24;
 }
 else
 if (vt->red_mask   == 0xff &&
 vt->green_mask == 0x00ff00 &&
 vt->blue_mask  == 0xff)
 {
-f->i_chroma = VLC_CODEC_BGR24;
+f->i_chroma = setup->image_byte_order == 
XCB_IMAGE_ORDER_MSB_FIRST ?
+  VLC_CODEC_BGR24 : VLC_CODEC_RGB24;
 }
 else
 return false;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2ad7165b8865e84d7fa7fbc98b0ab087e9ebc3f0

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2ad7165b8865e84d7fa7fbc98b0ab087e9ebc3f0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: orc: needs autoreconf

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4be3b875 by Rémi Denis-Courmont at 2023-10-01T11:30:44+00:00
contrib: orc: needs autoreconf

This fixes the build on riscv64-linux-gnu, which is otherwise not
recognised as a valid triplet.

- - - - -


1 changed file:

- contrib/src/orc/rules.mak


Changes:

=
contrib/src/orc/rules.mak
=
@@ -23,6 +23,7 @@ orc: orc-$(ORC_VERSION).tar.gz .sum-orc
$(MOVE)
 
 .orc: orc
+   $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE)
+$(MAKEBUILD)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4be3b8750082e2d88ac54beb78aecbf5ab101a3d

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4be3b8750082e2d88ac54beb78aecbf5ab101a3d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] filter_picture: pass only the chroma to GetPackedRgbIndexes()

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
a6caa96f by Steve Lhomme at 2023-10-01T09:21:32+00:00
filter_picture: pass only the chroma to GetPackedRgbIndexes()

We don't need anything else anymore.

- - - - -


3 changed files:

- modules/video_filter/blend.cpp
- modules/video_filter/filter_picture.h
- modules/video_filter/sepia.c


Changes:

=
modules/video_filter/blend.cpp
=
@@ -267,7 +267,7 @@ class CPictureRGBX : public CPicture {
 public:
 CPictureRGBX(const CPicture &cfg) : CPicture(cfg)
 {
-if (GetPackedRgbIndexes(fmt, &offset_r, &offset_g, &offset_b, 
&offset_a) != VLC_SUCCESS) {
+if (GetPackedRgbIndexes(fmt->i_chroma, &offset_r, &offset_g, 
&offset_b, &offset_a) != VLC_SUCCESS) {
 /* at least init to something on error to silence compiler 
warnings */
 offset_r = 0;
 offset_g = 1;


=
modules/video_filter/filter_picture.h
=
@@ -90,10 +90,10 @@ static inline int GetPackedYuvOffsets( vlc_fourcc_t 
i_chroma,
 }
 }
 
-static inline int GetPackedRgbIndexes( const video_format_t *p_fmt, int 
*i_r_index,
+static inline int GetPackedRgbIndexes( vlc_fourcc_t fcc, int *i_r_index,
int *i_g_index, int *i_b_index, int 
*i_a_index )
 {
-switch(p_fmt->i_chroma)
+switch(fcc)
 {
 case VLC_CODEC_RGBA:
 *i_r_index = 0;


=
modules/video_filter/sepia.c
=
@@ -410,7 +410,7 @@ static void RVSepia( picture_t *p_pic, picture_t *p_outpic, 
int i_intensity )
 p_pic->format.i_chroma != VLC_CODEC_BGR24;
 int i_rindex = 0, i_gindex = 1, i_bindex = 2, i_aindex = -1;
 
-GetPackedRgbIndexes( &p_outpic->format, &i_rindex, &i_gindex, &i_bindex, 
&i_aindex );
+GetPackedRgbIndexes( p_outpic->format.i_chroma, &i_rindex, &i_gindex, 
&i_bindex, &i_aindex );
 
 p_in = p_pic->p[0].p_pixels;
 p_in_end = p_in + p_pic->p[0].i_visible_lines



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/a6caa96f1dda3dc75846ac18eaa2b0abec305d2d

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: httpd: use size_t for buffer size results

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
f349e8b8 by Steve Lhomme at 2023-07-14T07:24:25+00:00
httpd: use size_t for buffer size results

The value can never be negative and it simplifies code in places.

We also need to change the i_body which is used as a pointer in some cases.

The value can never be negative and it simplifies code in places.

We also need to change the i_body which is used as a pointer in some cases.

- - - - -
84c06874 by Steve Lhomme at 2023-07-14T07:24:25+00:00
chromecast: remove unused parameters

- - - - -
2957b7aa by Steve Lhomme at 2023-07-14T07:24:25+00:00
httpd: remove unused variable

- - - - -
e34463bb by Steve Lhomme at 2023-07-14T07:24:25+00:00
access: rtp: put the libvlc_rtp declaration before it's used

- - - - -


8 changed files:

- include/vlc_httpd.h
- modules/access/rtp/Makefile.am
- modules/lua/libs/httpd.c
- modules/stream_out/chromecast/chromecast.h
- modules/stream_out/chromecast/chromecast_ctrl.cpp
- modules/stream_out/rtp.c
- modules/stream_out/rtsp.c
- src/network/httpd.c


Changes:

=
include/vlc_httpd.h
=
@@ -99,7 +99,7 @@ typedef struct httpd_message_t
 
 /* body */
 int64_t i_body_offset;
-int i_body;
+size_t  i_body;
 uint8_t *p_body;
 
 } httpd_message_t;
@@ -121,13 +121,13 @@ VLC_API char* httpd_ServerIP( const httpd_client_t *cl, 
char *, int * );
 
 typedef struct httpd_file_t httpd_file_t;
 typedef struct httpd_file_sys_t httpd_file_sys_t;
-typedef int (*httpd_file_callback_t)( httpd_file_sys_t *, httpd_file_t *, 
uint8_t *psz_request, uint8_t **pp_data, int *pi_data );
+typedef int (*httpd_file_callback_t)( httpd_file_sys_t *, httpd_file_t *, 
uint8_t *psz_request, uint8_t **pp_data, size_t *pi_data );
 VLC_API httpd_file_t * httpd_FileNew( httpd_host_t *, const char *psz_url, 
const char *psz_mime, const char *psz_user, const char *psz_password, 
httpd_file_callback_t pf_fill, httpd_file_sys_t * ) VLC_USED;
 VLC_API httpd_file_sys_t * httpd_FileDelete( httpd_file_t * );
 
 
 typedef struct httpd_handler_t  httpd_handler_t;
-typedef int (*httpd_handler_callback_t)( void *, httpd_handler_t *, char 
*psz_url, uint8_t *psz_request, int i_type, uint8_t *p_in, int i_in, char 
*psz_remote_addr, char *psz_remote_host, uint8_t **pp_data, int *pi_data );
+typedef int (*httpd_handler_callback_t)( void *, httpd_handler_t *, char 
*psz_url, uint8_t *psz_request, int i_type, uint8_t *p_in, int i_in, char 
*psz_remote_addr, char *psz_remote_host, uint8_t **pp_data, size_t *pi_data );
 VLC_API httpd_handler_t * httpd_HandlerNew( httpd_host_t *, const char 
*psz_url, const char *psz_user, const char *psz_password, 
httpd_handler_callback_t pf_fill, void * ) VLC_USED;
 VLC_API void * httpd_HandlerDelete( httpd_handler_t * );
 


=
modules/access/rtp/Makefile.am
=
@@ -1,3 +1,10 @@
+# RTP library
+libvlc_rtp_la_SOURCES = access/rtp/rtpfmt.c access/rtp/rtp.h \
+   access/rtp/session.c
+libvlc_rtp_la_CPPFLAGS = -I$(srcdir)/access/rtp
+libvlc_rtp_la_LDFLAGS = -no-undefined
+noinst_LTLIBRARIES += libvlc_rtp.la
+
 # RTP plugin
 access_LTLIBRARIES += librtp_plugin.la
 librtp_plugin_la_SOURCES = \
@@ -9,13 +16,6 @@ librtp_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
-I$(srcdir)/access/rtp
 librtp_plugin_la_CFLAGS = $(AM_CFLAGS)
 librtp_plugin_la_LIBADD = libvlc_rtp.la $(SOCKET_LIBS)
 
-# RTP library
-libvlc_rtp_la_SOURCES = access/rtp/rtpfmt.c access/rtp/rtp.h \
-   access/rtp/session.c
-libvlc_rtp_la_CPPFLAGS = -I$(srcdir)/access/rtp
-libvlc_rtp_la_LDFLAGS = -no-undefined
-noinst_LTLIBRARIES += libvlc_rtp.la
-
 # Secure RTP library
 libvlc_srtp_la_SOURCES = access/rtp/srtp.c access/rtp/srtp.h
 libvlc_srtp_la_CPPFLAGS = -I$(srcdir)/access/rtp


=
modules/lua/libs/httpd.c
=
@@ -40,7 +40,7 @@
 /*
  * Local prototypes
  */
-static uint8_t *vlclua_todata( lua_State *L, int narg, int *i_data );
+static uint8_t *vlclua_todata( lua_State *L, int narg, size_t *i_data );
 
 static int vlclua_httpd_host_delete( lua_State * );
 static int vlclua_httpd_handler_new( lua_State * );
@@ -126,7 +126,7 @@ static int vlclua_httpd_handler_callback(
  void *opaque, httpd_handler_t *p_handler, char *psz_url,
  uint8_t *psz_request, int i_type, uint8_t *p_in, int i_in,
  char *psz_remote_addr, char *psz_remote_host,
- uint8_t **pp_data, int *pi_data )
+ uint8_t **pp_data, size_t *pi_data )
 {
 VLC_UNUSED(p_handler);
 httpd_handler_lua_t *p_sys = opaque;
@@ -255,7 +255,7 @@ struct httpd_file_sys_t
 
 static int vlclua_httpd_file_callback(
 httpd_file_sys_t *p_sys, httpd_file_t *p_file, uint8_t *psz_request,
-

[vlc-commits] [Git][videolan/vlc][master] 7 commits: qt: keep reference of simple pref 'ui' objects

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
910c787c by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: keep reference of simple pref 'ui' objects

- - - - -
ffb06c60 by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: replace ADD_CATEGORY macro by a function in simpleprefs

- - - - -
2163981b by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: replace CONFIG_XXX macros with functions

- - - - -
65520aeb by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: refactor audioConfig in simplePrefs

- - - - -
8458c3ad by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: use direct reference to ui widgets in simplePrefs

- - - - -
9af17407 by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: used structured data to store audio control widgets

- - - - -
095cdf89 by Pierre Lamot at 2023-07-08T17:38:47+00:00
qt: remove of BUTTON_SET_ACT macro

- - - - -


6 changed files:

- modules/gui/qt/dialogs/extended/extended_panels.cpp
- modules/gui/qt/dialogs/open/open_disk.ui
- modules/gui/qt/dialogs/open/open_panels.cpp
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/qt/dialogs/preferences/simple_preferences.hpp
- modules/gui/qt/qt.hpp


Changes:

=
modules/gui/qt/dialogs/extended/extended_panels.cpp
=
@@ -1457,6 +1457,11 @@ SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget 
*_parent )
 
 updateButton = new QToolButton;
 updateButton->setAutoRaise( true );
+updateButton->setText("");
+updateButton->setToolTip(qtr( "Eject the disc" ));
+updateButton->setIcon( QIcon( ":/menu/update.svg") );
+BUTTONACT( updateButton, &SyncControls::update );
+
 mainLayout->addWidget( updateButton, 0, 4, 1, 1 );
 
 /* Various Connects */
@@ -1484,9 +1489,6 @@ SyncControls::SyncControls( qt_intf_t *_p_intf, QWidget 
*_parent )
 connect( THEMIM, &PlayerController::subtitleFPSChanged, subSpeedSpin, 
&QDoubleSpinBox::setValue );
 connect( &m_SubsDelayCfgFactor, &QVLCFloat::valueChanged, subDurationSpin, 
&QDoubleSpinBox::setValue);
 
-BUTTON_SET_ACT( updateButton, "", qtr( "Eject the disc" ), 
&SyncControls::update );
-updateButton->setIcon( QIcon( ":/menu/update.svg") );
-
 initSubsDuration();
 
 /* Set it */


=
modules/gui/qt/dialogs/open/open_disk.ui
=
@@ -156,6 +156,13 @@
 0

   
+  
+   Eject the disc
+  
+  
+   
+:/menu/eject.svg:/menu/eject.svg
+  
  
 
 
@@ -393,6 +400,8 @@
   audioSpin
   subtitlesSpin
  
- 
+ 
+  
+ 
  
 


=
modules/gui/qt/dialogs/open/open_panels.cpp
=
@@ -365,8 +365,7 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, qt_intf_t 
*_p_intf ) :
 BUTTONACT( ui.audioCDRadioButton, &DiscOpenPanel::updateButtons );
 BUTTONACT( ui.dvdsimple,  &DiscOpenPanel::updateButtons );
 BUTTONACT( ui.browseDiscButton,   &DiscOpenPanel::browseDevice );
-BUTTON_SET_ACT( ui.ejectButton, "", qtr( "Eject the disc"), 
&DiscOpenPanel::eject );
-ui.ejectButton->setIcon( QIcon( ":/menu/eject.svg") );
+BUTTONACT( ui.ejectButton,  &DiscOpenPanel::eject );
 
 connect( ui.deviceCombo, &QComboBox::editTextChanged, this, 
&DiscOpenPanel::updateMRL );
 connect( ui.deviceCombo, 
QOverload::of(&QComboBox::currentIndexChanged),


=
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=
@@ -244,42 +244,39 @@ SPrefsCatList::SPrefsCatList( qt_intf_t *_p_intf, QWidget 
*_parent ) :
See QT bugs 131 & 816 and QAbstractButton's source code. */
 QSignalMapper *mapper = new QSignalMapper( layout );
 connect( mapper, QSIGNALMAPPER_MAPPEDINT_SIGNAL, this, 
&SPrefsCatList::switchPanel );
-
-QPixmap scaled;
 qreal dpr = devicePixelRatioF();
 
-#define ADD_CATEGORY( button, label, ltooltip, icon, numb ) \
-QToolButton * button = new QToolButton( this ); \
-/* Scale icon to non native size outside of toolbutton to avoid widget 
size */\
-/* computation using native size */\
-scaled = QPixmap( icon )\
- .scaledToHeight( ICON_HEIGHT * dpr, Qt::SmoothTransformation );\
-scaled.setDevicePixelRatio( dpr ); \
-button->setIcon( scaled );\
-button->setText( label );   \
-button->setToolTip( ltooltip ); \
-button->setToolButtonStyle( Qt::ToolButtonTextUnderIcon );  \
-button->setIconSize( QSize( ICON_WIDTH, ICON_HEIGHT ) );  \
-button->setMinimumWidth( 40 + ICON_WIDTH );\
-button->setSizePolicy(QSizePolicy::MinimumExpanding, 
QSizePolicy::Minimum); \
-button->setAutoRaise( true );

[vlc-commits] [Git][videolan/vlc][master] contrib: libarchive: disable Werror when building

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
a57b38d5 by Steve Lhomme at 2023-07-08T11:52:09+00:00
contrib: libarchive: disable Werror when building

We have odd configurations that it may not expect. Like passing -gcodeview
to get .pdb files in clang.

Werror is on by default in debug builds.

- - - - -


1 changed file:

- contrib/src/libarchive/rules.mak


Changes:

=
contrib/src/libarchive/rules.mak
=
@@ -17,7 +17,7 @@ LIBARCHIVE_CONF := \
-DENABLE_CPIO=OFF -DENABLE_TAR=OFF -DENABLE_CAT=OFF \
-DENABLE_NETTLE=OFF \
-DENABLE_LIBXML2=OFF -DENABLE_LZMA=OFF -DENABLE_ICONV=OFF 
-DENABLE_EXPAT=OFF \
-   -DENABLE_TEST=OFF
+   -DENABLE_TEST=OFF -DENABLE_WERROR=OFF
 
 # CNG enables bcrypt on Windows and useless otherwise, it's OK we build for 
Win7+
 LIBARCHIVE_CONF +=-DENABLE_CNG=ON



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/a57b38d5306fb0839283383a51c0792dae13954a

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] sdi: fix use-after-free

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4b16a94d by Thomas Guillem at 2023-06-19T18:42:57+00:00
sdi: fix use-after-free

Fixes #28223

- - - - -


1 changed file:

- modules/stream_out/sdi/DBMSDIOutput.cpp


Changes:

=
modules/stream_out/sdi/DBMSDIOutput.cpp
=
@@ -370,8 +370,8 @@ int DBMSDIOutput::ConfigureVideo(const video_format_t *vfmt)
 size_t len = strlen(psz_string);
 if (len > 4)
 {
-free(psz_string);
 msg_Err(p_stream, "Invalid mode %s", psz_string);
+free(psz_string);
 goto error;
 }
 strncpy(wanted_mode.str, psz_string, 4);



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4b16a94d390f94ed60feec5ae2968824265f6cce

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4b16a94d390f94ed60feec5ae2968824265f6cce
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 8 commits: archive: fix the type used for libarchive_skip_cb

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
5da9f85b by Steve Lhomme at 2023-01-07T22:21:26+00:00
archive: fix the type used for libarchive_skip_cb

It is not using off_t.

- - - - -
74131267 by Steve Lhomme at 2023-01-07T22:21:26+00:00
taglib: don't cast the file st_size to a possibly smaller type

We can just use auto and always get the proper type.

- - - - -
36d83f71 by Steve Lhomme at 2023-01-07T22:21:26+00:00
vlc_common: don't redefine off_t to a larger type on Windows

That makes our usage of mingw-w64 structures like stat, _stat32, _stat64i32
invalid. Plus calls to functions expecting a smaller type.

If we need a bigger type, we need to use our own.

We already set _FILE_OFFSET_BITS so that off_t can be larger than usual.

- - - - -
3462d4be by Steve Lhomme at 2023-01-07T22:21:26+00:00
configure: remove skins2 hack to undefine the toolchain off_t

- - - - -
d4b73a54 by Steve Lhomme at 2023-01-07T22:21:26+00:00
sout: use uint64_t for seeking offsets

We don't need to depend on the flimsy off_t. This is in line with the way 
file
and stream offsets are used in access modules.

- - - - -
3b3a8b39 by Steve Lhomme at 2023-01-07T22:21:26+00:00
vlc_fs: always map lseek to _lseeki64 on Windows

We can safely pass int64_t offsets this way.

- - - - -
47db8028 by Steve Lhomme at 2023-01-07T22:21:26+00:00
mux/avi: use uint32_t for buffer offset

The values are read from size_t anyway, nothing to do with a file offset.
They are read from 32-bit variables are written as 32-bit variables.

- - - - -
a5e1a194 by Steve Lhomme at 2023-01-07T22:21:26+00:00
hxxx_nal: use size_t for the move values

They seem to represent a size for data in memory (size in block allocation) and
offset for a buffer memmove().

- - - - -


13 changed files:

- configure.ac
- include/vlc_common.h
- include/vlc_fs.h
- include/vlc_sout.h
- modules/access/avio.c
- modules/access/ftp.c
- modules/access_output/file.c
- modules/meta_engine/taglib.cpp
- modules/mux/avi.c
- modules/packetizer/hxxx_nal.c
- modules/stream_extractor/archive.c
- src/missing.c
- src/stream_output/stream_output.c


Changes:

=
configure.ac
=
@@ -4100,7 +4100,7 @@ AS_IF([test "${enable_skins2}" != "no"], [
 
   dnl Win32
   AS_IF([test "${SYS}" = "mingw32"], [
-VLC_ADD_CPPFLAGS([skins2],[-U_OFF_T_ -U_off_t -DWIN32_SKINS])
+VLC_ADD_CPPFLAGS([skins2],[-DWIN32_SKINS])
 VLC_ADD_LIBS([skins2],[-lgdi32 -lole32 -luuid -lmsimg32])
   dnl OS/2
   ], [test "${SYS}" = "os2"], [


=
include/vlc_common.h
=
@@ -1153,19 +1153,6 @@ static inline void SetQWLE (void *p, uint64_t qw)
 
 #if defined(_WIN32)
 /* several type definitions */
-#   if defined( __MINGW32__ )
-#   if !defined( _OFF_T_ )
-typedef long long _off_t;
-typedef _off_t off_t;
-#   define _OFF_T_
-#   else
-#   ifdef off_t
-#   undef off_t
-#   endif
-#   define off_t long long
-#   endif
-#   endif
-
 #   ifndef O_NONBLOCK
 #   define O_NONBLOCK 0
 #   endif


=
include/vlc_fs.h
=
@@ -35,10 +35,8 @@ struct iovec;
 # ifndef fstat
 #  define fstat _fstati64
 # endif
-# ifndef _MSC_VER
-#  undef lseek
-#  define lseek _lseeki64
-# endif
+# undef lseek
+# define lseek _lseeki64
 #else // !_WIN32
 #include 
 #endif


=
include/vlc_sout.h
=
@@ -58,7 +58,7 @@ struct sout_access_out_t
 
 char*psz_path;
 void*p_sys;
-int (*pf_seek)( sout_access_out_t *, off_t );
+int (*pf_seek)( sout_access_out_t *, uint64_t );
 ssize_t (*pf_read)( sout_access_out_t *, block_t * );
 ssize_t (*pf_write)( sout_access_out_t *, block_t * );
 int (*pf_control)( sout_access_out_t *, int, va_list );
@@ -76,7 +76,7 @@ VLC_API sout_access_out_t * sout_AccessOutNew( vlc_object_t 
*, const char *psz_a
 #define sout_AccessOutNew( obj, access, name ) \
 sout_AccessOutNew( VLC_OBJECT(obj), access, name )
 VLC_API void sout_AccessOutDelete( sout_access_out_t * );
-VLC_API int sout_AccessOutSeek( sout_access_out_t *, off_t );
+VLC_API int sout_AccessOutSeek( sout_access_out_t *, uint64_t );
 VLC_API ssize_t sout_AccessOutRead( sout_access_out_t *, block_t * );
 VLC_API ssize_t sout_AccessOutWrite( sout_access_out_t *, block_t * );
 VLC_API int sout_AccessOutControl( sout_access_out_t *, int, ... );


=
modules/access/avio.c
=
@@ -52,7 +52,7 @@ static int Seek   (stream_t *, uint64_t);
 static int Control(stream_t *, int, va_list);
 static ssize_t Write(sout_access_out_t *, block_t *);
 static int OutContr

[vlc-commits] [Git][videolan/vlc][master] qml: disable activeFocusOnTab for context buttons

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
7193add2 by Fatih Uzunoglu at 2022-12-25T09:49:57+00:00
qml: disable activeFocusOnTab for context buttons

- - - - -


2 changed files:

- modules/gui/qt/widgets/qml/ListItem.qml
- modules/gui/qt/widgets/qml/TableViewDelegate.qml


Changes:

=
modules/gui/qt/widgets/qml/ListItem.qml
=
@@ -223,6 +223,8 @@ FocusScope {
 font.underline: activeFocus
 
 onClicked: root.contextMenuButtonClicked(this)
+
+activeFocusOnTab: false
 }
 }
 }


=
modules/gui/qt/widgets/qml/TableViewDelegate.qml
=
@@ -227,6 +227,8 @@ T.Control {
 var pos = 
contextButton.mapToGlobal(VLCStyle.margin_xsmall, contextButton.height / 2 + 
VLCStyle.fontHeight_normal)
 delegate.contextMenuButtonClicked(this, delegate.rowModel, 
pos)
 }
+
+activeFocusOnTab: false
 }
 }
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/7193add2531bd81dce74911eb1a397aa75b03a0c

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/7193add2531bd81dce74911eb1a397aa75b03a0c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: Contribs: update libiconv to 1.16

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
8c7c22e3 by Jean-Baptiste Kempf at 2022-05-27T16:33:17+00:00
Contribs: update libiconv to 1.16

- - - - -
5494afa0 by Jean-Baptiste Kempf at 2022-05-27T16:33:17+00:00
Contribs: update gettext to 0.21

- - - - -


9 changed files:

- − 
contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch
- − 
contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch
- contrib/src/gettext/SHA512SUMS
- + contrib/src/gettext/gettext-0.21-disable-libtextstyle.patch
- contrib/src/gettext/rules.mak
- contrib/src/iconv/SHA512SUMS
- contrib/src/iconv/bins.patch
- − contrib/src/iconv/libiconv-win64.patch
- contrib/src/iconv/rules.mak


Changes:

=
contrib/src/gettext/0001-libasprintf-On-mingw-really-use-our-vasprintf-functi.patch
 deleted
=
@@ -1,105 +0,0 @@
-From 69105728ea5e1ce289498865b81e5ffeacebd840 Mon Sep 17 00:00:00 2001
-From: Bruno Haible 
-Date: Sun, 25 Nov 2018 02:10:44 +0100
-Subject: [PATCH 1/2] libasprintf: On mingw, really use our vasprintf function,
- not mingw_vasprintf.
-
-mingw now has a definition of 'vasprintf' in  that redirects to
-mingw_vasprintf, which does not support argument reordering (i.e.
-HAVE_POSIX_PRINTF is not defined). Make sure to avoid this function and use
-the one defined in our lib-asprintf.c instead.
-
-* gettext-runtime/libasprintf/lib-asprintf.h (asprintf): Define as macro
-redirecting to libasprintf_asprintf.
-(vasprintf): Define as macro redirecting to libasprintf_vasprintf.
-* gettext-runtime/libasprintf/lib-asprintf.c: Define also libasprintf_asprintf
-and libasprintf_vasprintf.
-* gettext-runtime/libasprintf/autosprintf.cc: Include lib-asprintf.h last.
-
-(cherry picked from commit 63295aac24c693d2d902eadd272259b7bdd7eae3)

- gettext-runtime/libasprintf/autosprintf.cc |  5 -
- gettext-runtime/libasprintf/lib-asprintf.c | 13 -
- gettext-runtime/libasprintf/lib-asprintf.h |  7 ++-
- 3 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/gettext-runtime/libasprintf/autosprintf.cc 
b/gettext-runtime/libasprintf/autosprintf.cc
-index 0c8bff1f1..57295aebd 100644
 a/gettext-runtime/libasprintf/autosprintf.cc
-+++ b/gettext-runtime/libasprintf/autosprintf.cc
-@@ -28,7 +28,6 @@
- #include 
- #include 
- #include 
--#include "lib-asprintf.h"
- 
- /* std::swap() is in  since C++11.  */
- #if __cplusplus >= 201103L
-@@ -37,6 +36,10 @@
- # include 
- #endif
- 
-+/* This include must come last, since it contains overrides of functions that
-+   the system may provide (namely, vasprintf).  */
-+#include "lib-asprintf.h"
-+
- namespace gnu
- {
- 
-diff --git a/gettext-runtime/libasprintf/lib-asprintf.c 
b/gettext-runtime/libasprintf/lib-asprintf.c
-index afa04dda8..927fe7779 100644
 a/gettext-runtime/libasprintf/lib-asprintf.c
-+++ b/gettext-runtime/libasprintf/lib-asprintf.c
-@@ -1,5 +1,5 @@
- /* Library functions for class autosprintf.
--   Copyright (C) 2002-2003, 2006, 2015-2016 Free Software Foundation, Inc.
-+   Copyright (C) 2002-2003, 2006, 2018 Free Software Foundation, Inc.
-Written by Bruno Haible , 2002.
- 
-This program is free software: you can redistribute it and/or modify
-@@ -31,8 +31,19 @@
- #include "vasnprintf.c"
- #include "asnprintf.c"
- 
-+/* Define to the same symbols as in lib-asprintf.h.  */
-+#define asprintf libasprintf_asprintf
-+#define vasprintf libasprintf_vasprintf
-+
- /* Define functions declared in "vasprintf.h".  */
- #include "vasprintf.c"
- #include "asprintf.c"
- 
-+/* Define the same functions also without the 'libasprintf_' prefix,
-+   for binary backward-compatibility.  */
-+#undef asprintf
-+#undef vasprintf
-+#include "vasprintf.c"
-+#include "asprintf.c"
-+
- #endif
-diff --git a/gettext-runtime/libasprintf/lib-asprintf.h 
b/gettext-runtime/libasprintf/lib-asprintf.h
-index 22874f289..c55c988c8 100644
 a/gettext-runtime/libasprintf/lib-asprintf.h
-+++ b/gettext-runtime/libasprintf/lib-asprintf.h
-@@ -1,5 +1,5 @@
- /* Library functions for class autosprintf.
--   Copyright (C) 2002-2003, 2015-2016 Free Software Foundation, Inc.
-+   Copyright (C) 2002-2003, 2018 Free Software Foundation, Inc.
-Written by Bruno Haible , 2002.
- 
-This program is free software: you can redistribute it and/or modify
-@@ -26,6 +26,11 @@
- 
- #else
- 
-+/* Define to symbols that are guaranteed to not be defined by the system
-+   header files.  */
-+#define asprintf libasprintf_asprintf
-+#define vasprintf libasprintf_vasprintf
-+
- /* Get asprintf(), vasprintf() declarations.  */
- #include "vasprintf.h"
- 
--- 
-2.17.1
-


=
contrib/src/gettext/0002-libasprintf-Avoid-compilation-error-on-mingw-with-D_.patch
 deleted
=
@@ -1,43 +0,0 @@
-From 27b39c7a632b85966bbe0776e6a6e2d34fcee018 Mon Sep 17 00:00:00 2001
-From: Bruno Haible 
-Date: Sat, 18

[vlc-commits] [Git][videolan/vlc][master] window: use filtered mouse events

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
3b6a553c by Maxim Biro at 2022-10-18T17:17:37+00:00
window: use filtered mouse events

Make window/GUI use filtered mouse events, as it was the case in VLC3
and VLC2.

- - - - -


1 changed file:

- src/video_output/video_window.c


Changes:

=
src/video_output/video_window.c
=
@@ -197,8 +197,8 @@ static void vout_display_window_MouseEvent(vlc_window_t 
*window,
 if (vlc_mouse_HasMoved(&state->mouse.video, &video_mouse))
 var_SetCoords(vout, "mouse-moved", m->i_x, m->i_y);
 if (vlc_mouse_HasButton(&state->mouse.video, &video_mouse))
-var_SetInteger(vout, "mouse-button-down", m->i_pressed);
-if (m->b_double_click && ev->button_mask == MOUSE_BUTTON_LEFT)
+var_SetInteger(vout, "mouse-button-down", video_mouse.i_pressed);
+if (video_mouse.b_double_click && vlc_mouse_IsLeftPressed(&video_mouse))
 var_ToggleBool(vout, "fullscreen");
 
 state->mouse.video = video_mouse;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3b6a553c70b4a9a5a569042a28728d6da5964210

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/3b6a553c70b4a9a5a569042a28728d6da5964210
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: qt: use system png

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
d071738e by Johannes Kauffmann at 2022-10-17T17:50:23+00:00
contrib: qt: use system png

In practice, Qt was already using the system png by accident, because
the png is almost always built and installed before Qt is configured.

- - - - -
e83ab9be by Johannes Kauffmann at 2022-10-17T17:50:23+00:00
contrib: qt: use system jpeg

Recently, the contrib libjpeg was changed to libjpeg-turbo with some
improvements over libjpeg [1]. While Qt also bundles libjpeg-turbo, it
is better to only build one copy.

[1]. vlc@4a1bd36fa14a53c42c5f77471c313ec79600a522

- - - - -
d6495036 by Johannes Kauffmann at 2022-10-17T17:50:23+00:00
contrib: qt: use system freetype

- - - - -
6ecdd0ac by Johannes Kauffmann at 2022-10-17T17:50:23+00:00
contrib: qt: use system harfbuzz

This will prevent using the bundled "harfbuzz-ng" which is really
harfbuzz 1.7.4. The bundled "harfbuzz", which a very old version, is
still compiled and linked in however, and can't be disabled [1].

[1]. https://bugreports.qt.io/browse/QTBUG-104647

- - - - -


1 changed file:

- contrib/src/qt/rules.mak


Changes:

=
contrib/src/qt/rules.mak
=
@@ -20,7 +20,7 @@ DEPS_qt += wine-headers
 endif
 endif
 
-DEPS_qt += zlib $(DEPS_zlib)
+DEPS_qt += freetype2 $(DEPS_freetype2) harfbuzz $(DEPS_harfbuzz) jpeg 
$(DEPS_jpeg) png $(DEPS_png) zlib $(DEPS_zlib)
 
 ifeq ($(call need_pkg,"Qt5Core >= 5.11 Qt5Gui Qt5Widgets"),)
 PKGS_FOUND += qt
@@ -97,10 +97,10 @@ QT_PLATFORM += -device-option VLC_EXTRA_CFLAGS="-isystem 
$(PREFIX)/include" \
-device-option VLC_EXTRA_LDFLAGS="-L$(PREFIX)/lib"
 
 QT_CONFIG := -static -no-shared -opensource -confirm-license -no-pkg-config \
-   -no-sql-sqlite -no-gif -qt-libjpeg -no-openssl $(QT_OPENGL) -no-dbus \
+   -no-sql-sqlite -no-gif -no-openssl $(QT_OPENGL) -no-dbus \
-no-vulkan -no-sql-odbc -no-pch -no-feature-testlib \
-no-compile-examples -nomake examples -nomake tests \
-   -system-zlib
+   -system-freetype -system-harfbuzz -system-libjpeg -system-libpng 
-system-zlib
 
 QT_CONFIG += -skip qtsql
 QT_CONFIG += -release



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/ebdf14dbd0aafe93d5e2184346f57456a76f9757...6ecdd0ac17cbf0546ddabc1b7fe97afd873fd595

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: zlib: update to 1.2.13

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
0c0ab818 by Steve Lhomme at 2022-10-16T16:13:28+00:00
contrib: zlib: update to 1.2.13

Fixes CVE-2022-37434.

- - - - -


4 changed files:

- 
contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
- contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
- contrib/src/zlib/SHA512SUMS
- contrib/src/zlib/rules.mak


Changes:

=
contrib/src/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
=
@@ -1,4 +1,4 @@
-From d923a126c8d3d2c94513d6fd05a1c6248c9c6bf9 Mon Sep 17 00:00:00 2001
+From 5c03377a53b137d647f1e485cd89e57f358ee3e9 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme 
 Date: Fri, 9 Sep 2022 10:19:56 +0200
 Subject: [PATCH 1/2] Fix mingw static library name on mingw and Emscripten
@@ -9,10 +9,10 @@ They build code in a UNIX like environment but CMake doesn't 
set UNIX for it.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e6fbb37..bb9a76d 100644
+index b412dc7..3f42869 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -199,10 +199,10 @@ if(NOT CYGWIN)
+@@ -163,10 +163,10 @@ if(NOT CYGWIN)
  set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION})
  endif()
  


=
contrib/src/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
=
@@ -1,25 +1,26 @@
-From f12a2840ccb937d695d8a0db26c76d2f642525cf Mon Sep 17 00:00:00 2001
+From dc5305dbdd39d5f90c0413704d6945c5f8ac6617 Mon Sep 17 00:00:00 2001
 From: Steve Lhomme 
 Date: Thu, 29 Sep 2022 06:32:21 +0200
 Subject: [PATCH 2/2] Add an option to enable/disable building examples
 
 ---
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
+ CMakeLists.txt | 4 
+ 1 file changed, 4 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb9a76d..c08ac3f 100644
+index 3f42869..3f6de05 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ set(VERSION "1.2.12")
+@@ -5,6 +5,8 @@ project(zlib C)
  
- option(ASM686 "Enable building i686 assembly implementation")
- option(AMD64 "Enable building amd64 assembly implementation")
-+option(BUILD_EXAMPLES "Build examples" ON)
+ set(VERSION "1.2.13")
  
++option(BUILD_EXAMPLES "Build examples" ON)
++
  set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation 
directory for executables")
  set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation 
directory for libraries")
-@@ -230,6 +231,7 @@ endif()
+ set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH 
"Installation directory for headers")
+@@ -194,6 +196,7 @@ endif()
  # Example binaries
  #
  
@@ -27,7 +28,7 @@ index bb9a76d..c08ac3f 100644
  add_executable(example test/example.c)
  target_link_libraries(example zlib)
  add_test(example example)
-@@ -247,3 +249,4 @@ if(HAVE_OFF64_T)
+@@ -211,3 +214,4 @@ if(HAVE_OFF64_T)
  target_link_libraries(minigzip64 zlib)
  set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS 
"-D_FILE_OFFSET_BITS=64")
  endif()


=
contrib/src/zlib/SHA512SUMS
=
@@ -1 +1 @@
-cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
  zlib-1.2.12.tar.gz
+9e7ac71a1824855ae526506883e439456b74ac0b811d54e94f6908249ba8719bec4c8d7672903c5280658b26cb6b5e93ecaaafe5cdc2980c760fa196773f0725
  zlib-1.2.13.tar.xz


=
contrib/src/zlib/rules.mak
=
@@ -1,18 +1,18 @@
 # ZLIB
-ZLIB_VERSION := 1.2.12
-ZLIB_URL := $(GITHUB)/madler/zlib/archive/refs/tags/v$(ZLIB_VERSION).tar.gz
+ZLIB_VERSION := 1.2.13
+ZLIB_URL := 
$(GITHUB)/madler/zlib/releases/download/v$(ZLIB_VERSION)/zlib-$(ZLIB_VERSION).tar.xz
 
 PKGS += zlib
 ifeq ($(call need_pkg,"zlib"),)
 PKGS_FOUND += zlib
 endif
 
-$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz:
+$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.xz:
$(call download_pkg,$(ZLIB_URL),zlib)
 
-.sum-zlib: zlib-$(ZLIB_VERSION).tar.gz
+.sum-zlib: zlib-$(ZLIB_VERSION).tar.xz
 
-zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
+zlib: zlib-$(ZLIB_VERSION).tar.xz .sum-zlib
$(UNPACK)
$(APPLY) 
$(SRC)/zlib/0001-Fix-mingw-static-library-name-on-mingw-and-Emscripte.patch
$(APPLY) 
$(SRC)/zlib/0002-Add-an-option-to-enable-disable-building-examples.patch
@@ -24,14 +24,6 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib
 
 ZLIB_CONF = -DINSTALL_PKGCONFIG_DIR:STRING=$(PREFIX)/lib/pkgconfig 
-DBUILD_EXAMPLES=OFF
 
-# ASM is disabled as the necessary source files are not in the tarball nor the 
git
-# ifeq ($(ARCH),i386)
-# ZLIB_CONF += -DASM686=ON
-# endif
-# ifeq ($(ARCH),x86_64)
-# ZLIB_CONF += -DAMD64=ON
-# endif
-

[vlc-commits] [Git][videolan/vlc][master] wasm-emscripten: add support for address sanitizer

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
d5974cd7 by Alexandre Janniaux at 2022-10-16T15:26:33+00:00
wasm-emscripten: add support for address sanitizer

In this commit, the --with-sanitizer option is forwarded to the
configure script for VLC, but also intercepted so that the emcc call
creating the plugin list can use the option as well.

It's necessary for now since the plugin list is not generated by
automake yet, thus the call to emcc is not intercepted to add the
sanitizer options added from VLC's configure.ac.

- - - - -


1 changed file:

- extras/package/wasm-emscripten/build.sh


Changes:

=
extras/package/wasm-emscripten/build.sh
=
@@ -31,6 +31,8 @@ get_entryname()
 echo "$entryname"
 }
 
+VLC_USE_SANITIZER=
+
 while test -n "$1"
 do
 case "$1" in
@@ -44,6 +46,9 @@ do
 --with-prebuilt-contribs)
 VLC_USE_PREBUILT_CONTRIBS=1
 ;;
+--with-sanitizer=*)
+VLC_USE_SANITIZER="${1#--with-sanitizer=}"
+;;
 --gen-contrib-archive|-c)
 GENERATE_ARCHIVE=1
 ;;
@@ -164,12 +169,17 @@ if [ $BUILD_MODE -eq 1 ]; then
 # in tools/deps_info.py
 
 # shm.h is a blacklisted module
+SANITIZER_OPTIONS=
+if [ ! -z "${VLC_USE_SANITIZER}" ]; then
+SANITIZER_OPTIONS="--with-sanitizer=${VLC_USE_SANITIZER}"
+fi
 emconfigure "$VLC_SRCPATH"/configure --host=wasm32-unknown-emscripten 
--enable-debug \
 --disable-shared --disable-vlc \
 --disable-sout --disable-vlm --disable-a52 
--disable-xcb --disable-lua \
 --disable-addonmanagermodules --disable-ssp 
--disable-nls \
 --enable-gles2 \
-
--with-contrib="$VLC_SRCPATH"/contrib/wasm32-unknown-emscripten
+
--with-contrib="$VLC_SRCPATH"/contrib/wasm32-unknown-emscripten \
+"${SANITIZER_OPTIONS}"
 fi
 
 diagnostic "libvlc build: make"
@@ -201,6 +211,11 @@ const void *vlc_static_modules[] = {
 
 diagnostic "vlc static modules: compiling static modules entry points"
 # compile vlc-modules.c
-emcc -pthread -c "$BUILD_PATH"/vlc-modules.c -o "$BUILD_PATH"/vlc-modules.bc
+SANITIZERS=
+if echo "${VLC_USE_SANITIZER}" | grep address > /dev/null; then
+SANITIZERS="$SANITIZERS -fsanitize=address -fsanitize-address-use-after-scope 
-fno-omit-frame-pointer"
+fi
+
+emcc $SANITIZERS -pthread -c "$BUILD_PATH"/vlc-modules.c -o 
"$BUILD_PATH"/vlc-modules.bc
 
 echo "VLC for wasm32-unknown-emscripten built!"



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/d5974cd744511b2796c9445afb4e56b430377ded

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] ci: Disable branch protection for the current Windows/ARM64 builds

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
fee6371a by Martin Storsjö at 2022-10-11T18:17:05+03:00
ci: Disable branch protection for the current Windows/ARM64 builds

Clang does support the flag and gladly generates the instructions
for return address signing, but it doesn't generate matching unwind
info for it.

If a return address is signed, unwinding through it would fail unless
the signing is reversed at the right place. The ARM64 SEH unwind info
format has no public documentation on how to handle return address
signing currently.

This issue isn't noticeable on any current public Windows on ARM64
devices or servers, as the CPUs don't implement the return address
signing instructions (which then are handled as no-ops). However,
binaries with those instructions would fail subtly (seemingly work
fine, but fail whenever unwinding the stack) on newer CPUs.

Therefore, disable it in the CI configuration, as long as that uses
a version of Clang that doesn't generate correct unwind info for this
case.

- - - - -


1 changed file:

- extras/ci/gitlab-ci.yml


Changes:

=
extras/ci/gitlab-ci.yml
=
@@ -171,6 +171,9 @@ win64-arm-llvm:
 variables:
 <<: *variables-win64-arm
 UWP_EXTRA_BUILD_FLAGS: -u -x -S 0x0A06
+# Clang <= 15 produces incorrect unwind info for code with
+# branch protection enabled on Windows.
+CONFIGFLAGS: --disable-branch-protection
 
 uwp64-libvlc-llvm:
 extends: .win-common



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/fee6371af86a37f947ef3273fd0f364fb579fa9c

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: aom: update to 3.5.0

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
4d9fbf01 by Tristan Matthews at 2022-10-12T18:07:27+00:00
contrib: aom: update to 3.5.0

See release notes: https://aomedia.googlesource.com/aom/+/refs/tags/v3.5.0

(cherry picked from commit 27110b65c738c54bc47e437b5d5e971f5cb5edf5)

- - - - -


2 changed files:

- contrib/src/aom/SHA512SUMS
- contrib/src/aom/rules.mak


Changes:

=
contrib/src/aom/SHA512SUMS
=
@@ -1 +1 @@
-9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
  libaom-3.3.0.tar.gz
+370c529a84d54c95f05c5a3b3edadd1cca95eeccd5a6b5454e574211c6dd9bf5bd33ab67b43587c6de37688fe546ea9e16de0ab2d721e965143b7e8c85db6fd4
  libaom-3.5.0.tar.gz


=
contrib/src/aom/rules.mak
=
@@ -1,5 +1,5 @@
 # aom
-AOM_VERSION := 3.3.0
+AOM_VERSION := 3.5.0
 AOM_URL := 
https://storage.googleapis.com/aom-releases/libaom-$(AOM_VERSION).tar.gz
 
 PKGS += aom



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4d9fbf01fea4a0c08930a96043c9d1db87b1f61f

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4d9fbf01fea4a0c08930a96043c9d1db87b1f61f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] picture: align picture width to 64

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
ad26d63a by Steve Lhomme at 2022-10-12T15:08:12+00:00
picture: align picture width to 64

It seems the latest FFmpeg requires 64 bits alignment for some I420 output.

Fixes #27285

(cherry picked from commit fa75a43b0bb9b2997fda7006b6a83d697ecd6c89)

Signed-off-by: Steve Lhomme 

- - - - -


1 changed file:

- src/misc/picture.c


Changes:

=
src/misc/picture.c
=
@@ -178,7 +178,7 @@ int picture_Setup( picture_t *p_picture, const 
video_format_t *restrict fmt )
 unsigned int i_ratio_h  = 1;
 for( unsigned i = 0; i < p_dsc->plane_count; i++ )
 {
-i_modulo_w = LCM( i_modulo_w, 16 * p_dsc->p[i].w.den );
+i_modulo_w = LCM( i_modulo_w, 64 * p_dsc->p[i].w.den );
 i_modulo_h = LCM( i_modulo_h, 16 * p_dsc->p[i].h.den );
 if( i_ratio_h < p_dsc->p[i].h.den )
 i_ratio_h = p_dsc->p[i].h.den;
@@ -198,7 +198,7 @@ int picture_Setup( picture_t *p_picture, const 
video_format_t *restrict fmt )
 p->i_visible_pitch = (fmt->i_visible_width + (p_dsc->p[i].w.den - 1)) 
/ p_dsc->p[i].w.den * p_dsc->p[i].w.num * p_dsc->pixel_size;
 p->i_pixel_pitch   = p_dsc->pixel_size;
 
-assert( (p->i_pitch % 16) == 0 );
+assert( (p->i_pitch % 64) == 0 );
 }
 p_picture->i_planes  = p_dsc->plane_count;
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ad26d63aa48f0da1b67a8caf565a5e808b06f0d1

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] On the road to 3.0.18, final NEWS update

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
535e17ff by David Fuhrmann at 2022-10-11T14:47:43+00:00
On the road to 3.0.18, final NEWS update

- - - - -


2 changed files:

- NEWS
- configure.ac


Changes:

=
NEWS
=
@@ -1,5 +1,13 @@
+Changes between 3.0.18-rc2 and 3.0.18:
+--
+
+macOS:
+* Fix audio device listing with non-latin names
+* Update some translations
+
+
 Changes between 3.0.18-rc and 3.0.18-rc2:
--
+-
 
 Codec/Demux:
  * Add support for Y16 chroma
@@ -24,7 +32,7 @@ Contribs:
 
 
 Changes between 3.0.17.4 and 3.0.18-rc:
---
+---
 
 Demux:
  * Major adaptive streaming update, notably for multiple timelies and webvtt
@@ -62,7 +70,7 @@ Contribs:
 
 
 Changes between 3.0.17.3 and 3.0.17.4:

+--
 
 Service Discovery:
  * Fix UPnP regression on Windows


=
configure.ac
=
@@ -2,12 +2,12 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 1999-2022 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 3.0.18-rc2)
+AC_INIT(vlc, 3.0.18)
 VERSION_MAJOR=3
 VERSION_MINOR=0
 VERSION_REVISION=18
 VERSION_EXTRA=0
-VERSION_DEV=rc2
+VERSION_DEV=
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/535e17ff9faa95a819ab839891aba77d321b4691

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/535e17ff9faa95a819ab839891aba77d321b4691
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: remove cargo-culted short arch

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
cbbd548c by Rémi Denis-Courmont at 2022-10-11T06:35:37+00:00
contrib: remove cargo-culted short arch

The short arch macro is an idiosynchrasy of the Android SDK. It is not
used on any other target in contribs.

- - - - -


1 changed file:

- contrib/bootstrap


Changes:

=
contrib/bootstrap
=
@@ -276,33 +276,16 @@ case "${OS}" in
then
check_macosx_sdk
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" 
"HAVE_BSD"
-
-   case "${HOST}" in
-   *arm64*|*aarch64*)
-   add_make "PLATFORM_SHORT_ARCH := arm64"
-   ;;
-   *x86_64*)
-   add_make "PLATFORM_SHORT_ARCH := x86_64"
-   ;;
-   esac;
else
check_ios_sdk
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" 
"HAVE_FPU"
 
case "${HOST}" in
-   *arm64*|*aarch64*)
-   add_make "PLATFORM_SHORT_ARCH := arm64"
+   *arm64*)
;;
*arm*)
-   add_make "PLATFORM_SHORT_ARCH := armv7"
add_make_enabled "HAVE_ARMV7A"
;;
-   *x86_64*)
-   add_make "PLATFORM_SHORT_ARCH := x86_64"
-   ;;
-   *86*)
-   add_make "PLATFORM_SHORT_ARCH := i386"
-   ;;
esac;
fi
if test "$BUILDFORTVOS"



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/cbbd548c6529a50ca8738dcff118cabd7dd133e7

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] configure: use pkg-config file for sndio

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
4492db0c by Brad Smith at 2022-10-08T16:10:23+03:00
configure: use pkg-config file for sndio

(cherry picked from commit a9406397ed0342b3dae17a31ed54e46b4fb86407)
Signed-off-by: Rémi Denis-Courmont 

Conflicts:
configure.ac

- - - - -


1 changed file:

- configure.ac


Changes:

=
configure.ac
=
@@ -3569,8 +3569,12 @@ AC_ARG_ENABLE([sndio],
 ])
 have_sndio="no"
 AS_IF([test "$enable_sndio" != "no"], [
-  AC_CHECK_HEADER([sndio.h], [
+  PKG_CHECK_MODULES([SNDIO], [sndio], [
 have_sndio="yes"
+  ], [
+AS_IF([test -n "$enable_sndio"], [
+  AC_MSG_ERROR([${SNDIO_PKG_ERRORS}.)])
+])
   ])
 ])
 AM_CONDITIONAL([HAVE_SNDIO], [test "${have_sndio}" = "yes"])



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4492db0c0045cc87c2350206c7d6151479871380

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4492db0c0045cc87c2350206c7d6151479871380
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: qtsvg: remove no longer needed patch

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
5be2ef66 by Johannes Kauffmann at 2022-10-09T11:00:57+00:00
contrib: qtsvg: remove no longer needed patch

>From testing, it seems that the qtsvg build retrieves zlib.h from
$(PREFIX)/include/QtZlib/zlib.h. Its directory is specified with the -I
flag. The $(PREFIX)/include directory is specified with the -isystem
flag, which has lower priority than -I. So $(PREFIX)/include/zlib.h has
the lowest priority, and the patch is not needed anymore.

qtbase also includes plain , but qtbase already has -I flags
pointing directly to the vendored zlib directory in the source tree.

- - - - -


2 changed files:

- − contrib/src/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
- contrib/src/qtsvg/rules.mak


Changes:

=
contrib/src/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch deleted
=
@@ -1,29 +0,0 @@
-From ed55cab9836d8ed9a4738c795855b0b2af6fa6b9 Mon Sep 17 00:00:00 2001
-From: Pierre Lamot 
-Date: Thu, 21 Sep 2017 12:05:15 +0200
-Subject: [PATCH] Force the usage of QtZlib header
-
-  qmake adds -I$(PREFIX)/include before adding
-  -I$(PREFIX)/include/QtZlib in its path while cross
-  compiling which ends up using the definition from the
-  system zlib while linking to QtZlib

- src/svg/qsvgtinydocument.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
-index cc0fd5d..450c2d1 100644
 a/src/svg/qsvgtinydocument.cpp
-+++ b/src/svg/qsvgtinydocument.cpp
-@@ -45,7 +45,7 @@
- #include "qdebug.h"
- 
- #ifndef QT_NO_COMPRESS
--#include 
-+#include 
- #endif
- 
- QT_BEGIN_NAMESPACE
--- 
-2.14.1
-


=
contrib/src/qtsvg/rules.mak
=
@@ -21,7 +21,6 @@ $(TARBALLS)/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz:
 
 qtsvg: qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz .sum-qtsvg
$(UNPACK)
-   $(APPLY) $(SRC)/qtsvg/0001-Force-the-usage-of-QtZlib-header.patch
$(MOVE)
 
 .qtsvg: qtsvg



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5be2ef66c7499a2d75794db0644891ee480d1dce

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5be2ef66c7499a2d75794db0644891ee480d1dce
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: adjust overlay menu icon size

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
6d023670 by Fatih Uzunoglu at 2022-10-09T08:46:56+00:00
qml: adjust overlay menu icon size

- - - - -
5be81b92 by Fatih Uzunoglu at 2022-10-09T08:46:56+00:00
qml: overlay menu don't allow removing items in move mode

- - - - -


2 changed files:

- modules/gui/qt/playlist/qml/PlaylistOverlayMenu.qml
- modules/gui/qt/widgets/qml/OverlayMenu.qml


Changes:

=
modules/gui/qt/playlist/qml/PlaylistOverlayMenu.qml
=
@@ -131,6 +131,7 @@ Widgets.OverlayMenu {
 id: deleteAction
 text: I18n.qtr("Remove Selected")
 onTriggered: listView.onDelete()
+enabled: (root.mode !== PlaylistListView.Mode.Move)
 }
 
 readonly property var rootMenu: ({


=
modules/gui/qt/widgets/qml/OverlayMenu.qml
=
@@ -242,8 +242,8 @@ FocusScope {
 Loader {
 id: icon
 
-Layout.preferredWidth: VLCStyle.icon_small
-Layout.preferredHeight: VLCStyle.icon_small
+Layout.preferredWidth: VLCStyle.icon_normal
+Layout.preferredHeight: VLCStyle.icon_normal
 Layout.alignment: Qt.AlignHCenter
 
 active: (!!modelData.icon.source || 
!!modelData.fontIcon || modelData.tickMark === true)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/ea889029dfb693b37785200f138cd18e2a21b33b...5be81b92b5cd56bfb50a7c49b64e30971037955d

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: remove stray HAVE_NEON

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ea889029 by Rémi Denis-Courmont at 2022-10-08T16:13:29+00:00
contrib: remove stray HAVE_NEON

This was originally added to make builds with and without NEON on
Android. I am not sure why this was at all needed as Android supports
run-time detection using the normal Linux HWCAP mechanism, so a single
build should have been feasible fairly easily.

But anyhow, this is no longer used anywhere.

- - - - -


1 changed file:

- contrib/bootstrap


Changes:

=
contrib/bootstrap
=
@@ -244,7 +244,6 @@ check_android_sdk()
add_make "ANDROID_ABI := ${ANDROID_ABI}"
[ -z "${ANDROID_API}" ] && echo "You should set ANDROID_API environment 
variable (using default android-9)" && ANDROID_API := android-9
add_make "ANDROID_API := ${ANDROID_API}"
-   [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
[ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled 
"HAVE_ARMV6"
@@ -296,7 +295,7 @@ case "${OS}" in
;;
*arm*)
add_make "PLATFORM_SHORT_ARCH := armv7"
-   add_make_enabled "HAVE_NEON" 
"HAVE_ARMV7A"
+   add_make_enabled "HAVE_ARMV7A"
;;
*x86_64*)
add_make "PLATFORM_SHORT_ARCH := x86_64"



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ea889029dfb693b37785200f138cd18e2a21b33b

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] live555: set opus source rate & channels

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
378d1b8d by Francois Cartegnie at 2022-10-08T15:24:07+00:00
live555: set opus source rate & channels

- - - - -


1 changed file:

- modules/access/live555.cpp


Changes:

=
modules/access/live555.cpp
=
@@ -284,6 +284,9 @@ static unsigned char* parseH264ConfigStr( char const* 
configStr,
   unsigned int& configSize );
 static unsigned char* parseVorbisConfigStr( char const* configStr,
 unsigned int& configSize );
+static unsigned char* parseOpusConfigStr( char const* configStr,
+  unsigned int& configSize,
+  audio_format_t& fmt );
 
 static char *passwordLessURL( const vlc_url_t *url );
 
@@ -1046,19 +1049,16 @@ static int SessionsSetup( demux_t *p_demux )
 }
 else if( !strcmp( sub->codecName(), "OPUS" ) )
 {
-int i_extra;
-unsigned char *p_extra;
+unsigned int i_extra;
+void *p_extra = parseOpusConfigStr( sub->fmtp_config(), 
i_extra, tk->fmt.audio );
 tk->fmt.i_codec = VLC_CODEC_OPUS;
-OpusHeader header;
-opus_header_init(&header);
-// "The RTP clock rate in "a=rtpmap" MUST be 48000 and the 
number of channels MUST be 2."
-// See: 
https://datatracker.ietf.org/doc/html/draft-ietf-payload-rtp-opus-11#section-7
-opus_prepare_header( 2, 48000, &header );
-if( opus_write_header( &p_extra, &i_extra, &header, NULL ) 
)
-return VLC_ENOMEM;
-opus_header_clean(&header);
-tk->fmt.i_extra = i_extra;
-tk->fmt.p_extra = p_extra;
+if( p_extra )
+{
+tk->fmt.i_extra = i_extra;
+tk->fmt.p_extra = p_extra;
+}
+else
+msg_Warn( p_demux,"Missing or unsupported opus 
header." );
 }
 }
 else if( !strcmp( sub->mediumName(), "video" ) )
@@ -2418,6 +2418,57 @@ static uint8_t *parseVorbisConfigStr( char const* 
configStr,
 return p_extra;
 }
 
+static unsigned char* parseOpusConfigStr( char const* configStr,
+  unsigned int& configSize,
+  audio_format_t& fmt )
+{
+OpusHeader header;
+opus_header_init( &header );
+header.input_sample_rate = 48000;
+header.channels = 2;
+
+if( configStr )
+{
+char *psz_end;
+/* Get source input rate, from negotiated reply */
+const char *psz_token = strcasestr( configStr, 
"maxcodedaudiobandwidth=" );
+if( psz_token )
+{
+const uint8_t rgi_rateskhz[] = { 8, 12, 16, 24 };
+header.input_sample_rate = strtoul( psz_token + 23, &psz_end, 10 );
+bool b_found = false;
+for( size_t i=0; ihttps://code.videolan.org/videolan/vlc/-/commit/378d1b8d07bd3e42925c329c3d89fd84e6476331

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/378d1b8d07bd3e42925c329c3d89fd84e6476331
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] window: only toggle fullscreen when double clicking with the left mouse button

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ae750acf by Pierre Lamot at 2022-10-08T12:20:19+00:00
window: only toggle fullscreen when double clicking with the left mouse button

fix: #27388

- - - - -


1 changed file:

- src/video_output/video_window.c


Changes:

=
src/video_output/video_window.c
=
@@ -198,7 +198,7 @@ static void vout_display_window_MouseEvent(vlc_window_t 
*window,
 var_SetCoords(vout, "mouse-moved", m->i_x, m->i_y);
 if (vlc_mouse_HasButton(&state->mouse.video, &video_mouse))
 var_SetInteger(vout, "mouse-button-down", m->i_pressed);
-if (m->b_double_click)
+if (m->b_double_click && ev->button_mask == MOUSE_BUTTON_LEFT)
 var_ToggleBool(vout, "fullscreen");
 
 state->mouse.video = video_mouse;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/ae750acfee8f2ed6b31c74cc27fa6894eefcdda7

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 6 commits: qml: limit image size in ArtistTopBanner

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
c5e6f836 by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: limit image size in ArtistTopBanner

- - - - -
912fa84d by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: enable mipmapping in ArtistTopBanner image

- - - - -
1f3ede1b by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: fix image visibility in ArtistTopBanner

- - - - -
f5156782 by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: use FastBlur in ArtistTopBanner

- - - - -
3b588190 by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: some layout adjustments in ArtistTopBanner

- - - - -
d7721bdd by Fatih Uzunoglu at 2022-10-08T11:32:34+00:00
qml: disable unnecessary clipping in ArtistTopBanner

- - - - -


1 changed file:

- modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml


Changes:

=
modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml
=
@@ -27,13 +27,14 @@ import org.videolan.vlc 0.1
 
 import "qrc:///widgets/" as Widgets
 import "qrc:///style/"
+import "qrc:///util/Helpers.js" as Helpers
 
 FocusScope {
 id: root
 
 property var artist: ({})
 
-height: VLCStyle.artistBanner_height
+implicitHeight: VLCStyle.artistBanner_height
 
 function setCurrentItemFocus(reason) {
 playActionBtn.forceActiveFocus(reason);
@@ -41,12 +42,15 @@ FocusScope {
 
 Image {
 id: background
-asynchronous: true
+anchors.fill: parent
 
-width: parent.width
-height: VLCStyle.artistBanner_height
+asynchronous: true
 source: artist.cover || VLCStyle.noArtArtist
+sourceSize: artist.cover ? Qt.size(MainCtx.screen ? 
Helpers.alignUp(MainCtx.screen.availableGeometry.width, 32) : 1024, 0)
+ : undefined
+mipmap: !!artist.cover
 fillMode: artist.cover ? Image.PreserveAspectCrop : Image.Tile
+visible: false
 
 Rectangle {
 anchors.fill: background
@@ -57,11 +61,10 @@ FocusScope {
 }
 }
 
-GaussianBlur {
+FastBlur {
 source: background
 anchors.fill: background
 radius: VLCStyle.dp(4, VLCStyle.scale)
-samples: (radius * 2) + 1
 }
 
 RowLayout {
@@ -71,24 +74,21 @@ FocusScope {
 anchors.topMargin: VLCStyle.margin_xxlarge
 anchors.bottomMargin: VLCStyle.margin_xxlarge
 anchors.leftMargin: VLCStyle.margin_xlarge
+
 spacing: VLCStyle.margin_normal
-clip: true
 
 Item {
-Layout.alignment: Qt.AlignVCenter
-Layout.preferredHeight: VLCStyle.cover_normal
-Layout.preferredWidth: VLCStyle.cover_normal
+implicitHeight: VLCStyle.cover_normal
+implicitWidth: VLCStyle.cover_normal
 
 RoundImage {
 source: artist.cover || VLCStyle.noArtArtist
-height: VLCStyle.cover_normal
-width: VLCStyle.cover_normal
+anchors.fill: parent
 radius: VLCStyle.cover_normal
 }
 
 Rectangle {
-height: VLCStyle.cover_normal
-width: VLCStyle.cover_normal
+anchors.fill: parent
 radius: VLCStyle.cover_normal
 color: "transparent"
 border.width: VLCStyle.dp(1, VLCStyle.scale)
@@ -99,12 +99,13 @@ FocusScope {
 ColumnLayout {
 spacing: 0
 
-Layout.alignment: Qt.AlignVCenter
 Layout.fillWidth: true
 
 Widgets.SubtitleLabel {
 text: artist.name || I18n.qtr("No artist")
 color: "white"
+
+Layout.maximumWidth: parent.width
 }
 
 Widgets.MenuCaption {
@@ -113,6 +114,7 @@ FocusScope {
 opacity: .6
 
 Layout.topMargin: VLCStyle.margin_xxxsmall
+Layout.maximumWidth: parent.width
 }
 
 Widgets.NavigableRow {



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/67d9d280f7bf8bb678b8036c27f04e8793a80128...d7721bdd136fae174ac679bf0dac355fcecdabce

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: gsm: download the tarball to the name of the decompressed folder

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ae995d92 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: download the tarball to the name of the decompressed folder

No need to use a mv command for that. The package download command can download
from one filename and output to another.

Now we can use UNPACK_DIR

- - - - -
72a0b8b2 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: use the build install target

- - - - -
67d9d280 by Steve Lhomme at 2022-10-07T15:53:00+00:00
contrib: gsm: update to 1.0.22

And rework the patching build calls.

- - - - -


4 changed files:

- contrib/src/gsm/SHA512SUMS
- − contrib/src/gsm/gsm-cross.patch
- − contrib/src/gsm/gsm-missing-include.patch
- contrib/src/gsm/rules.mak


Changes:

=
contrib/src/gsm/SHA512SUMS
=
@@ -1 +1 @@
-0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
  libgsm_1.0.13.tar.gz
+f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2
  gsm-1.0-pl22.tar.gz


=
contrib/src/gsm/gsm-cross.patch deleted
=
@@ -1,38 +0,0 @@
-diff -ruN gsm/Makefile gsm.new/Makefile
 gsm/Makefile   2006-04-26 21:14:26.0 +0200
-+++ gsm.new/Makefile   2009-03-29 20:12:39.0 +0200
-@@ -43,10 +43,8 @@
- # CC  = /usr/lang/acc
- # CCFLAGS = -c -O
- 
--CC= gcc -ansi -pedantic
- CCFLAGS   = -c -O2 -DNeedFunctionPrototypes=1
- 
--LD= $(CC)
- 
- # LD  = gcc
- # LDFLAGS =
-@@ -98,14 +96,11 @@
- SHELL = /bin/sh
- LN= ln
- BASENAME  = basename
--AR= ar
- ARFLAGS   = cr
- RMFLAGS   =
- FIND  = find
- COMPRESS  = compress
- COMPRESSFLAGS = 
--# RANLIB  = true
--RANLIB= ranlib
- 
- #
- #You shouldn't have to configure below this line if you're porting.
-@@ -279,7 +274,7 @@
- 
- # Target rules
- 
--all:  $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:  $(LIBGSM)
-   @-echo $(ROOT): Done.
- 
- tst:  $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result


=
contrib/src/gsm/gsm-missing-include.patch deleted
=
@@ -1,11 +0,0 @@
-diff -ru gsm-broken/src/code.c gsm/src/code.c
 gsm-broken/src/code.c  2006-04-26 21:16:50.0 +0200
-+++ gsm/src/code.c 2016-04-05 17:13:19.0 +0200
-@@ -19,6 +19,7 @@
- #include  "private.h"
- #include  "gsm.h"
- #include  "proto.h"
-+#include  
- 
- /* 
-  *  4.2 FIXED POINT IMPLEMENTATION OF THE RPE-LTP CODER 


=
contrib/src/gsm/rules.mak
=
@@ -1,23 +1,35 @@
 # GSM
-GSM_VERSION := 1.0.13
-GSM_URL := http://www.quut.com/gsm/gsm-$(GSM_VERSION).tar.gz
+GSM_MAJVERSION := 1.0
+GSM_MINVERSION := 22
+GSM_URL := 
http://www.quut.com/gsm/gsm-$(GSM_MAJVERSION).$(GSM_MINVERSION).tar.gz
 
-$(TARBALLS)/libgsm_$(GSM_VERSION).tar.gz:
+$(TARBALLS)/gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz:
$(call download_pkg,$(GSM_URL),gsm)
 
-.sum-gsm: libgsm_$(GSM_VERSION).tar.gz
+.sum-gsm: gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz
 
-gsm: libgsm_$(GSM_VERSION).tar.gz .sum-gsm
+gsm: gsm-$(GSM_MAJVERSION)-pl$(GSM_MINVERSION).tar.gz .sum-gsm
$(UNPACK)
-   mv gsm-1.0-* libgsm_$(GSM_VERSION)
-   $(APPLY) $(SRC)/gsm/gsm-cross.patch
-   $(APPLY) $(SRC)/gsm/gsm-missing-include.patch
-   sed -e 's/^CFLAGS.*=/CFLAGS+=/' -i.orig libgsm_$(GSM_VERSION)/Makefile
+   # allow overriding hardcoded compiler variables
+   sed -i.orig 's,^CC  ,#CC,' "$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,^LD  ,#LD,' "$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,^AR  ,#AR,' "$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,^RANLIB  ,#RANLIB,' "$(UNPACK_DIR)/Makefile"
+   # allow overriding hardcoded install variables
+   sed -i.orig 's,GSM_INSTALL_ROOT =,GSM_INSTALL_ROOT ?=,' 
"$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,GSM_INSTALL_INC =,GSM_INSTALL_INC ?=,' 
"$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,GSM_INSTALL_MAN =,GSM_INSTALL_MAN ?=,' 
"$(UNPACK_DIR)/Makefile"
+   # use the default make rules (use CPPFLAGS)
+   sed -i.orig 's,^.c.o:,#.c.o:,' "$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,^$$(CC),#$$(CC),' 
"$(UNPACK_DIR)/Makefile"
+   sed -i.orig 's,^@-mv,#  @-mv,' 
"$(UNPACK_DIR)/Makefile"
$(MOVE)
 
+GSM_ENV := GSM_INSTALL_ROOT="$(PREFIX)" \
+   GSM_INSTALL_INC="$(PREFIX)/include/gsm" \
+   GSM_INSTALL_MAN="$(PREFIX)/share/man/man3"
+
 .gsm: gsm
-   $(HOSTVARS_PIC) $(MAKE) -C $<
-   mkdir -p "$(PREFIX)/include

[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: speexdsp: fix NEON support on Linux

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
e26e077b by Rémi Denis-Courmont at 2022-10-07T17:16:15+03:00
contrib: speexdsp: fix NEON support on Linux

The HAVE_NEON flag is only ever defined on select platforms. That is to
say first Android which had one build with and one without it. Later on,
it was also added to iOS.

It cannot be assumed that NEON is not there just because the flag is
unspecified. This silently broke NEON support on Linux, and literally
any other platform at the time this regression was introduced.

Strictly speaking, we could keep checking the flag on Android or iOS on
ARM or AArch64. But as of now, all four of those platforms always set
HAVE_NEON, so this would not have any effect. We still forcefully
disable NEON on Android-x86, which was the original purpose of this
stanza.

Regression from ef98e81ff014175fd7494c8313de8883d15834b3.

- - - - -
d5ad888a by Rémi Denis-Courmont at 2022-10-07T17:16:15+03:00
contrib: speexdsp: do not disable NEON on AArch64

Support for AArch64 was added in speexdsp 1.2.0~rc5, except on
Windows for which we already have a patch.

- - - - -


1 changed file:

- contrib/src/speexdsp/rules.mak


Changes:

=
contrib/src/speexdsp/rules.mak
=
@@ -20,15 +20,11 @@ speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp
$(MOVE)
 
 SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples
-ifeq ($(ARCH),aarch64)
-# old neon, not compatible with aarch64
+ifeq ($(filter arm aarch64, $(ARCH)),)
+# The configure script checks for NEON C intrinsics only.
+# This leads to false positives on Android-x86.
 SPEEXDSP_CONF += --disable-neon
 endif
-ifeq ($(ARCH),arm)
-ifndef HAVE_NEON
-SPEEXDSP_CONF += --disable-neon
-endif
-endif
 ifndef HAVE_FPU
 SPEEXDSP_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/80489c822c7f6f973780bdc9b24e9137c8b6be1c...d5ad888a6b5c65731156fe82646e9d5a3af56aa8

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: remove autopoint disabling in macOS builds

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
5483b465 by Steve Lhomme at 2022-10-06T10:07:38+00:00
contrib: remove autopoint disabling in macOS builds

It should be there as we require gettext since 
d1d2759d799442baef78d451d53f8790a8e6a325.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=
contrib/src/main.mak
=
@@ -430,11 +430,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
 
-ifdef HAVE_DARWIN_OS
-AUTORECONF = AUTOPOINT=true autoreconf
-else
 AUTORECONF = GTKDOCIZE=true autoreconf
-endif
 RECONF = mkdir -p -- $(PREFIX)/share/aclocal && \
cd $< && $(AUTORECONF) -fiv $(ACLOCAL_AMFLAGS)
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5483b4655454a1b0d609503234026f0b0af4418a

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5483b4655454a1b0d609503234026f0b0af4418a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: replace libjpeg with libjpeg-turbo

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4a1bd36f by Steve Lhomme at 2022-10-05T17:01:56+00:00
contrib: replace libjpeg with libjpeg-turbo

It should be faster and the license is the same type.

- - - - -


3 changed files:

- contrib/src/jpeg/SHA512SUMS
- − contrib/src/jpeg/no_executables.patch
- contrib/src/jpeg/rules.mak


Changes:

=
contrib/src/jpeg/SHA512SUMS
=
@@ -1 +1 @@
-74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
  jpegsrc.v9b.tar.gz
+944004c5aec90695edde02ef88b5950683f006a90f9eb4fac40a3ef5cbfb2767344f962dd6a5342f5ea239e361d30ebd5960d0d16d1d68079602ccd745bcbadc
  libjpeg-turbo-2.0.8-esr.tar.gz


=
contrib/src/jpeg/no_executables.patch deleted
=
@@ -1,11 +0,0 @@
 jpeg/Makefile.am.old   2018-11-20 16:49:53.187918820 +0100
-+++ jpeg/Makefile.am   2018-11-20 16:49:55.179918813 +0100
-@@ -76,7 +76,7 @@
- endif
- 
- # Executables to build
--bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
-+EXTRA_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
- 
- # Executable sources & libs
- cjpeg_SOURCES= cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \


=
contrib/src/jpeg/rules.mak
=
@@ -1,25 +1,26 @@
 # jpeg
 
-JPEG_VERSION := 9b
-JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
+JPEG_VERSION := 2.0.8-esr
+JPEG_URL := 
$(GITHUB)/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/$(JPEG_VERSION).tar.gz
 
-$(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
+$(TARBALLS)/libjpeg-turbo-$(JPEG_VERSION).tar.gz:
$(call download_pkg,$(JPEG_URL),jpeg)
 
-.sum-jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz
+.sum-jpeg: libjpeg-turbo-$(JPEG_VERSION).tar.gz
 
-jpeg: jpegsrc.v$(JPEG_VERSION).tar.gz .sum-jpeg
+jpeg: libjpeg-turbo-$(JPEG_VERSION).tar.gz .sum-jpeg
$(UNPACK)
-   mv jpeg-$(JPEG_VERSION) jpegsrc.v$(JPEG_VERSION)
-   $(APPLY) $(SRC)/jpeg/no_executables.patch
-   $(UPDATE_AUTOCONFIG)
$(MOVE)
 
-.jpeg: jpeg
-   $(RECONF)
-   $(MAKEBUILDDIR)
-   $(MAKECONFIGURE)
-   +$(MAKEBUILD)
-   +$(MAKEBUILD) install
-   if test -e $(PREFIX)/lib/libjpeg.a; then $(RANLIB) 
$(PREFIX)/lib/libjpeg.a; fi
+JPEG_CONF:= -DENABLE_SHARED=OFF -DWITH_TURBOJPEG=OFF
+ifndef HAVE_WIN32
+# this should probably be a global setting for CMake targets
+JPEG_CONF += -DCMAKE_POSITION_INDEPENDENT_CODE:BOOL=TRUE
+endif
+
+.jpeg: jpeg toolchain.cmake
+   $(CMAKECLEAN)
+   $(HOSTVARS_PIC) $(CMAKE) $(JPEG_CONF)
+   +$(CMAKEBUILD)
+   +$(CMAKEBUILD) --target install
touch $@



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4a1bd36fa14a53c42c5f77471c313ec79600a522

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4a1bd36fa14a53c42c5f77471c313ec79600a522
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: ffmpeg: remove no-op --enable-neon

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
657dbcae by Rémi Denis-Courmont at 2022-10-05T15:56:29+00:00
contrib: ffmpeg: remove no-op --enable-neon

This is the default, and has no actual effects. The FFmpeg configure
script will check if NEON is supported *unless* given --disable-neon is
passed.

By comparison, the ARMv6 condition below is correct (at least in this
respect) in forcefully disabling NEON.

- - - - -


1 changed file:

- contrib/src/ffmpeg/rules.mak


Changes:

=
contrib/src/ffmpeg/rules.mak
=
@@ -81,9 +81,6 @@ endif
 # ARM stuff
 ifeq ($(ARCH),arm)
 FFMPEGCONF += --arch=arm
-ifdef HAVE_NEON
-FFMPEGCONF += --enable-neon
-endif
 ifdef HAVE_ARMV7A
 FFMPEGCONF += --cpu=cortex-a8
 endif



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/657dbcae19d307e2ab7b5ea0b4fee9b7b9753635

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/657dbcae19d307e2ab7b5ea0b4fee9b7b9753635
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: speexdsp: disable NEON just once

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ee5cd413 by Rémi Denis-Courmont at 2022-10-05T13:41:18+00:00
contrib: speexdsp: disable NEON just once

On AArch64, NEON is unconditionally disabled right above. This was only
adding it a second time on all AArch64 targets other than iOS and
Android, with no real effects.

On non-ARM architectures, the flag is useless, and HAVE_NEON is
meaningless so ignore it.

On AArch32, HAVE_NEON is still abode by; this patch is a no-op.

- - - - -
885a3fb6 by Rémi Denis-Courmont at 2022-10-05T13:41:18+00:00
contrib: don't set useless HAVE_NEON on AArch64

This was cargo-culted on Android and (desktop) macOS, and had no
actual effects. The only uses of the flag in contribs are:
- in main.mak, and only on iOS, thus no effects on AArch64,
- in the FFmpeg package, explicitly only on AArch32,
- in the speexdsp, effectively only on AArch32 (see previous commit).

On AArch64, NEON is enabled by default. iOS, non-Android Linux and
Windows builds have relied on this from the beginning.

This patch is effectively a no-op. Fixes #27379.

- - - - -


2 changed files:

- contrib/bootstrap
- contrib/src/speexdsp/rules.mak


Changes:

=
contrib/bootstrap
=
@@ -246,7 +246,6 @@ check_android_sdk()
add_make "ANDROID_API := ${ANDROID_API}"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
-   [ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_NEON"
[ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
[ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled 
"HAVE_ARMV6"
 }
@@ -282,7 +281,6 @@ case "${OS}" in
case "${HOST}" in
*arm64*|*aarch64*)
add_make "PLATFORM_SHORT_ARCH := arm64"
-   add_make_enabled "HAVE_NEON"
;;
*x86_64*)
add_make "PLATFORM_SHORT_ARCH := x86_64"


=
contrib/src/speexdsp/rules.mak
=
@@ -23,9 +23,11 @@ ifeq ($(ARCH),aarch64)
 # old neon, not compatible with aarch64
 SPEEXDSP_CONF += --disable-neon
 endif
+ifeq ($(ARCH),arm)
 ifndef HAVE_NEON
 SPEEXDSP_CONF += --disable-neon
 endif
+endif
 ifndef HAVE_FPU
 SPEEXDSP_CONF += --enable-fixed-point
 ifeq ($(ARCH),arm)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/dde50606ee55d36bcc9a2115fa0a360f59fc8684...885a3fb66858381da0c9e110d4607d664281f205

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] aout: replace assert by a if check

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
702b258d by Thomas Guillem at 2022-10-04T17:17:39+00:00
aout: replace assert by a if check

Modules should be able to report headphones while playing mono or
surround.

The Binaural mode must be done only when Stereo + headphones.

- - - - -


1 changed file:

- src/audio_output/output.c


Changes:

=
src/audio_output/output.c
=
@@ -788,9 +788,9 @@ int aout_OutputNew(audio_output_t *aout, vlc_aout_stream 
*stream,
  * request any mode */
 if (aout->current_sink_info.headphones
  && owner->requested_mix_mode == AOUT_VAR_CHAN_UNSET
+ && fmt->i_physical_channels == AOUT_CHANS_STEREO
  && aout_HasMixModeChoice(aout, AOUT_MIX_MODE_BINAURAL))
 {
-assert(fmt->i_physical_channels == AOUT_CHANS_STEREO);
 assert(stereo_mode == AOUT_VAR_CHAN_UNSET);
 aout_UpdateMixMode(aout, AOUT_MIX_MODE_BINAURAL, fmt);
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/702b258dfc7debcf71de3309acdc336505866eae

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/702b258dfc7debcf71de3309acdc336505866eae
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: do not take snapshots from the UI thread

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
1aa5ca65 by Romain Vimont at 2022-10-04T15:28:11+00:00
qt: do not take snapshots from the UI thread

Snapshots are performed via a call to:

var_TriggerCallback("video-snapshot")

causing its callback (SnapshotCallback) to be called synchronously,
executing the following steps:
 - wait for the vout thread to actually capture the (next) frame;
 - encode the picture to PNG;
 - write the result to disk (I/O).

Since var_TriggerCallback("video-snapshot") is called from the UI
thread, all these blocking actions are also performed on the UI thread.

Move the call to a separate thread.

- - - - -
b3ccc7b0 by Romain Vimont at 2022-10-04T15:28:11+00:00
hotkeys: do not take snapshots from the UI thread

Snapshots are performed via a call to:

var_TriggerCallback("video-snapshot")

causing its callback (SnapshotCallback) to be called synchronously,
executing the following steps:
 - wait for the vout thread to actually capture the (next) frame;
 - encode the picture to PNG;
 - write the result to disk (I/O).

Since var_TriggerCallback("video-snapshot") is called from the UI
thread, all these blocking actions are also performed on the UI thread.

Move the call to a separate thread.

- - - - -


2 changed files:

- modules/control/hotkeys.c
- modules/gui/qt/player/player_controller.cpp


Changes:

=
modules/control/hotkeys.c
=
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "math.h"
 
 struct intf_sys_t
@@ -56,6 +57,8 @@ struct intf_sys_t
 vlc_tick_t subtitle_time;
 } subsync;
 enum vlc_vout_order spu_channel_order;
+
+vlc_executor_t *executor;
 };
 
 static void handle_action(intf_thread_t *, vlc_action_id_t);
@@ -758,6 +761,42 @@ PLAYER_ACTION_HANDLER(Aout)
 }
 }
 
+struct snapshot_task
+{
+struct vlc_runnable runnable;
+vout_thread_t *vout;
+};
+
+static void RunSnapshot(void *userdata)
+{
+struct snapshot_task *task = userdata;
+
+var_TriggerCallback(task->vout, "video-snapshot");
+
+vout_Release(task->vout);
+free(task);
+}
+
+static void TakeSnapshotAsync(struct intf_sys_t *sys, vlc_player_t *player)
+{
+if (!sys->executor)
+{
+/* Create the executor only on the first request */
+sys->executor = vlc_executor_New(1);
+if (!sys->executor)
+return;
+}
+
+struct snapshot_task *task = malloc(sizeof(*task));
+if (!task)
+return;
+
+task->vout = vlc_player_vout_Hold(player);
+task->runnable.run = RunSnapshot;
+task->runnable.userdata = task;
+vlc_executor_Submit(sys->executor, &task->runnable);
+}
+
 PLAYER_ACTION_HANDLER(Vouts)
 {
 VLC_UNUSED(intf);
@@ -770,7 +809,7 @@ PLAYER_ACTION_HANDLER(Vouts)
 vlc_player_vout_SetFullscreen(player, false);
 break;
 case ACTIONID_SNAPSHOT:
-vlc_player_vout_Snapshot(player);
+TakeSnapshotAsync(intf->p_sys, player);
 break;
 case ACTIONID_WALLPAPER:
 vlc_player_vout_ToggleWallpaperMode(player);
@@ -1283,6 +1322,9 @@ Open(vlc_object_t *this)
 return VLC_EGENERIC;
 }
 var_AddCallback(vlc_object_instance(intf), "key-action", ActionCallback, 
intf);
+
+sys->executor = NULL;
+
 intf->p_sys = sys;
 return VLC_SUCCESS;
 }
@@ -1302,6 +1344,13 @@ Close(vlc_object_t *this)
 vlc_player_Unlock(player);
 
 var_DelCallback(vlc_object_instance(intf), "key-action", ActionCallback, 
intf);
+
+if (sys->executor)
+{
+vlc_executor_WaitIdle(sys->executor);
+vlc_executor_Delete(sys->executor);
+}
+
 free(sys);
 }
 


=
modules/gui/qt/player/player_controller.cpp
=
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -1791,7 +1792,22 @@ void PlayerController::snapshot()
 {
 VoutPtr vout = getVout();
 if (vout)
-var_TriggerCallback(vout.get(), "video-snapshot");
+{
+/* Passing a lambda directly would require Qt 5.15:
+ * 
+ */
+struct SnapshotTask : public QRunnable
+{
+VoutPtr vout;
+SnapshotTask(VoutPtr vout) : vout(std::move(vout)) {}
+void run() override
+{
+var_TriggerCallback(vout.get(), "video-snapshot");
+}
+};
+
+QThreadPool::globalInstance()->start(new 
SnapshotTask(std::move(vout)));
+}
 }
 
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/e2a10a5cd339ded73b3501cb40e976a34437fa67...b3ccc7b027764b853ff775291769a805226578aa

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/e2a10a5cd339ded73b3501cb40e976a34437fa67...b3ccc7b027764b853ff775291769a805226578aa
You're receiving this email because of yo

[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: ebml: update to 1.4.3

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
f7eb37ed by Steve Lhomme at 2022-10-01T16:52:18+00:00
contrib: ebml: update to 1.4.3

- - - - -
0b13cf8b by Steve Lhomme at 2022-10-01T16:52:18+00:00
contrib: matroska: update to 1.7.0

- - - - -


5 changed files:

- contrib/src/ebml/SHA512SUMS
- − contrib/src/ebml/missing-limits-include.patch
- contrib/src/ebml/rules.mak
- contrib/src/matroska/SHA512SUMS
- contrib/src/matroska/rules.mak


Changes:

=
contrib/src/ebml/SHA512SUMS
=
@@ -1 +1 @@
-b9535b60ba2716053819d48e345f161ad797a74678fdf60797d652da9dfa7cab905669dac744f30a81083341462bac6f2a0e69fa7d80ee59cf7414bffbd667d5
  libebml-1.4.2.tar.xz
+6a7a544f3f5a273eaab8c71aa692492cbfb671b3d73f03ab76438843a9a7a9379f9cffdae0e1452cf064e43c10ad82424645504a23d7f3336eabcd38f2621d0a
  libebml-1.4.3.tar.xz


=
contrib/src/ebml/missing-limits-include.patch deleted
=
@@ -1,36 +0,0 @@
-From f0bfd53647961e799a43d918c46cf3b6bff89806 Mon Sep 17 00:00:00 2001
-From: Moritz Bunkus 
-Date: Sat, 27 Feb 2021 20:36:52 +0100
-Subject: [PATCH] include appropriate header files for std::numeric_limits
-
-Fixes #80.

- ChangeLog | 4 
- src/EbmlString.cpp| 1 +
- src/EbmlUnicodeString.cpp | 1 +
- 3 files changed, 6 insertions(+)
-
-diff --git a/src/EbmlString.cpp b/src/EbmlString.cpp
-index 27e55fd..4c05fcf 100644
 a/src/EbmlString.cpp
-+++ b/src/EbmlString.cpp
-@@ -34,6 +34,7 @@
-   \author Steve Lhomme 
- */
- #include 
-+#include 
- 
- #include "ebml/EbmlString.h"
- 
-diff --git a/src/EbmlUnicodeString.cpp b/src/EbmlUnicodeString.cpp
-index 496a16a..99fc073 100644
 a/src/EbmlUnicodeString.cpp
-+++ b/src/EbmlUnicodeString.cpp
-@@ -36,6 +36,7 @@
- */
- 
- #include 
-+#include 
- 
- #include "ebml/EbmlUnicodeString.h"
- 


=
contrib/src/ebml/rules.mak
=
@@ -1,6 +1,6 @@
 # ebml
 
-EBML_VERSION := 1.4.2
+EBML_VERSION := 1.4.3
 EBML_URL := 
http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.xz
 
 ifeq ($(call need_pkg,"libebml >= 1.3.8"),)
@@ -14,7 +14,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 
 ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
$(UNPACK)
-   $(APPLY) $(SRC)/ebml/missing-limits-include.patch
$(MOVE)
 
 .ebml: ebml toolchain.cmake


=
contrib/src/matroska/SHA512SUMS
=
@@ -1 +1 @@
-271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41
  libmatroska-1.6.3.tar.xz
+e635958113ab57fb6c7e808d4ad51f87c38ec6ff348b202df1789b34d25ca22bc00fbdf1ec4f386bc803ef3da9f57057bae78ecf22deabdf1399755b1c6fdd3e
  libmatroska-1.7.0.tar.xz


=
contrib/src/matroska/rules.mak
=
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.6.3
+MATROSKA_VERSION := 1.7.0
 MATROSKA_URL := 
http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.xz
 
 PKGS += matroska



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/a6dcec33242e131addf60fd8f324256fc2127bb5...0b13cf8b2c58f3e99909c426c2186ac5dfff01fe

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] demux: ogg: set source rate instead of decoded rate

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
251455ff by Francois Cartegnie at 2022-09-30T19:37:52+00:00
demux: ogg: set source rate instead of decoded rate

- - - - -


1 changed file:

- modules/demux/ogg.c


Changes:

=
modules/demux/ogg.c
=
@@ -2887,10 +2887,8 @@ static void Ogg_ReadOpusHeader( logical_stream_t 
*p_stream,
 
 /* All OggOpus streams are timestamped at 48kHz and
  * can be played at 48kHz. */
-p_stream->fmt.audio.i_rate = 48000;
-date_Init( &p_stream->dts, p_stream->fmt.audio.i_rate, 1 );
+date_Init( &p_stream->dts, 48000, 1 );
 p_stream->fmt.i_bitrate = 0;
-
 /* Cheat and get additional info ;) */
 oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
 oggpack_adv( &opb, 64 );
@@ -2898,7 +2896,8 @@ static void Ogg_ReadOpusHeader( logical_stream_t 
*p_stream,
 {
 p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
 p_stream->i_pre_skip = oggpack_read( &opb, 16 );
-oggpack_adv( &opb, 48 );
+p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 );
+oggpack_adv( &opb, 16 );
 switch( oggpack_read( &opb, 8 ) ) /* mapping family */
 {
 case 0: /* RFC7587 */



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/251455ffdd9bc719eb6593c2972df01f732ccdd5

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/251455ffdd9bc719eb6593c2972df01f732ccdd5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 7 commits: contrib: ncurses: more config parameters in a variable

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b1c3b692 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: more config parameters in a variable

- - - - -
7ad929e6 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: enable debug in non-optimized/debug builds

- - - - -
66506f0a by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: remove unknown configuration flags

- - - - -
9ad1f15f by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: disable more things when building

- - - - -
66a2f186 by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: clean configure/make calls

- - - - -
ffe13fcd by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: build out of tree

- - - - -
7331ccbf by Steve Lhomme at 2022-09-27T04:42:39+00:00
contrib: ncurses: add preliminary win32 support

It builds but there are some link issues in VLC.

- - - - -


2 changed files:

- + contrib/src/ncurses/ncurses-win32.patch
- contrib/src/ncurses/rules.mak


Changes:

=
contrib/src/ncurses/ncurses-win32.patch
=
@@ -0,0 +1,11 @@
+--- ncurses/ncurses/tinfo/lib_napms.c.orig.c   2022-09-20 09:42:37.463160900 
+0200
 ncurses/ncurses/tinfo/lib_napms.c  2022-09-20 09:42:45.210335100 +0200
+@@ -50,6 +50,8 @@
+ #if HAVE_SYS_TIME_H
+ #include  /* needed for MacOS X DP3 */
+ #endif
++#elif defined(_NC_WINDOWS)
++#include 
+ #endif
+ 
+ MODULE_ID("$Id: lib_napms.c,v 1.27 2020/08/15 19:45:23 tom Exp $")


=
contrib/src/ncurses/rules.mak
=
@@ -18,11 +18,26 @@ $(TARBALLS)/ncurses-$(NCURSES_VERSION).tar.gz:
 
 ncurses: ncurses-$(NCURSES_VERSION).tar.gz .sum-ncurses
$(UNPACK)
+   $(APPLY) $(SRC)/ncurses/ncurses-win32.patch
$(MOVE)
 
+NCURSES_CONF := --enable-widec --with-terminfo-dirs=/usr/share/terminfo \
+--with-pkg-config=yes --enable-pc-files --without-manpages --without-tests 
\
+--without-ada --without-progs
+ifdef WITH_OPTIMIZATION
+NCURSES_CONF+= --without-debug
+endif
+ifdef HAVE_WIN32
+NCURSES_CONF+= --disable-sigwinch
+endif
+
 .ncurses: ncurses
-   cd $< && mkdir -p "$(PREFIX)/lib/pkgconfig" && $(HOSTVARS) 
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig" ./configure $(patsubst 
--datarootdir=%,,$(HOSTCONF)) --without-debug --enable-widec --without-develop 
--without-shared --with-terminfo-dirs=/usr/share/terminfo --with-pkg-config=yes 
--enable-pc-files
-   cd $< && $(MAKE) -C ncurses -j1 && $(MAKE) -C ncurses install
-   cd $< && $(MAKE) -C include -j1 && $(MAKE) -C include install
-   cd $< && $(MAKE) -C misc pc-files && cp misc/ncursesw.pc 
"$(PREFIX)/lib/pkgconfig"
+   $(MAKEBUILDDIR)
+   $(MAKECONFIGURE) $(NCURSES_CONF)
+   +$(MAKEBUILD) -C ncurses -j1
+   +$(MAKEBUILD) -C ncurses install
+   +$(MAKEBUILD) -C include -j1
+   +$(MAKEBUILD) -C include install
+   +$(MAKEBUILD) -C misc pc-files
+   install $https://code.videolan.org/videolan/vlc/-/compare/fe54d2eb257718eebfef0a5fe624771b7fac5bf0...7331ccbf455c9240c4b9407bccb8e73eb0b80781

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: x264: Update to the latest version from code.videolan.org

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
426ff68e by Martin Storsjö at 2022-09-25T13:15:43+00:00
contrib: x264: Update to the latest version from code.videolan.org

This allows dropping some portability workarounds.

- - - - -


2 changed files:

- contrib/src/x264/SHA512SUMS
- contrib/src/x264/rules.mak


Changes:

=
contrib/src/x264/SHA512SUMS
=
@@ -1 +1 @@
-cc8f47cb553787a294fba11ca5ca05e2448348e3bde1f5d9c9c297901c8b86e11d7a0e18a518f9dc3a47f06fdc557727f9900c209cecd5179596e13e83fef381
  x264-snapshot-20180324-2245.tar.bz2
+3d917a11f4e87d039f3c0549c6824ab8317fce2478872e174426c6b70275937e94234a709a7d43ec2cd0d4d4cd388a362890d0b103d091a3750216b8a7763a22
  x264-e067ab0b530395f90b578f6d05ab0a225e2efdf9.tar.xz


=
contrib/src/x264/rules.mak
=
@@ -1,8 +1,8 @@
 # x264
 
-X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := 
http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180324-2245.tar.bz2
-X264_BASENAME := $(notdir $(X264_SNAPURL))
+X264_HASH := e067ab0b530395f90b578f6d05ab0a225e2efdf9
+X264_VERSION := $(X264_HASH)
+X264_GITURL := https://code.videolan.org/videolan/x264.git
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -34,16 +34,6 @@ X264CONF += --enable-win32thread
 else
 X264CONF += --disable-win32thread
 endif
-ifeq ($(ARCH), arm)
-# This isn't required in newer x264 snapshots, see
-# 3d90057e15abf257320c89bb7146fb0c92687fa6 in x264.
-X264_AS = export AS="../tools/gas-preprocessor.pl -arch arm -as-type clang 
-force-thumb -- $(CC) -mimplicit-it=always";
-endif
-ifeq ($(ARCH),aarch64)
-# Configure defaults to gas-preprocessor + armasm64 for this target,
-# unless overridden. This isn't required in newer x264 snapshots.
-X264_AS = export AS="$(CC)";
-endif
 endif
 ifdef HAVE_CROSS_COMPILE
 ifndef HAVE_DARWIN_OS
@@ -57,24 +47,16 @@ X264CONF += --disable-asm
 endif
 endif
 endif
-ifdef HAVE_DARWIN_OS
-ifeq ($(ARCH),aarch64)
-X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
-endif
-endif
-
-$(TARBALLS)/x264-git.tar.xz:
-   $(call download_git,$(X264_GITURL))
 
-$(TARBALLS)/$(X264_BASENAME):
-   $(call download,$(X264_SNAPURL))
+$(TARBALLS)/x264-$(X264_VERSION).tar.xz:
+   $(call download_git,$(X264_GITURL),,$(X264_HASH))
 
 .sum-x26410b: .sum-x264
touch $@
 
-.sum-x264: $(X264_BASENAME)
+.sum-x264: x264-$(X264_VERSION).tar.xz
 
-x264 x26410b: %: $(X264_BASENAME) .sum-%
+x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-%
$(UNPACK)
$(UPDATE_AUTOCONFIG)
$(APPLY) $(SRC)/x264/x264-winstore.patch
@@ -83,7 +65,7 @@ x264 x26410b: %: $(X264_BASENAME) .sum-%
 .x264: x264
$(REQUIRE_GPL)
$(MAKEBUILDDIR)
-   $(X264_AS) $(MAKECONFIGURE) $(X264CONF)
+   $(MAKECONFIGURE) $(X264CONF)
+$(MAKEBUILD) install
touch $@
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/426ff68ea89c7a98d90b7b20e359e54955a4959e

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/426ff68ea89c7a98d90b7b20e359e54955a4959e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] vout: correctly track ICC updates in vout_display_t

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
5e3f184e by Niklas Haas at 2022-09-23T21:15:35+03:00
vout: correctly track ICC updates in vout_display_t

The line that updated the current `vd->cfg` got accidentally removed in
a previous refactor of this commit, leading to this value being
out-of-date. This broke any vouts which directly looked at
`vd->cfg->icc_profile` instead of taking the current profile from the
callback itself.

Also add a clarifying comment to this function, since it just blindly
copies over a pointer. In practice, the `vout_thread_t` takes care of
this.

- - - - -


2 changed files:

- src/video_output/display.c
- src/video_output/vout_wrapper.h


Changes:

=
src/video_output/display.c
=
@@ -634,6 +634,7 @@ void vout_SetDisplayIccProfile(vout_display_t *vd,
 {
 vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
 
+osys->cfg.icc_profile = (vlc_icc_profile_t *) profile;
 if (vd->ops->set_icc_profile)
 vd->ops->set_icc_profile(vd, profile);
 }


=
src/video_output/vout_wrapper.h
=
@@ -39,6 +39,9 @@ void vout_SetDisplayZoom(vout_display_t *, unsigned num, 
unsigned den);
 void vout_SetDisplayAspect(vout_display_t *, unsigned num, unsigned den);
 void vout_SetDisplayCrop(vout_display_t *, const struct vout_crop *);
 void vout_SetDisplayViewpoint(vout_display_t *, const vlc_viewpoint_t *);
+
+/* The owner/caller is responsible for managing the lifetime of this ICC
+ * profile and always updating the display state to a consistent value */
 void vout_SetDisplayIccProfile(vout_display_t *, const vlc_icc_profile_t *);
 
 #endif /* LIBVLC_VOUT_WRAPPER_H */



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5e3f184e919f5dfced35e1d2b514d59a57d00088

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5e3f184e919f5dfced35e1d2b514d59a57d00088
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] vdpau: remove display plugin

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
aafc91c5 by Rémi Denis-Courmont at 2022-09-23T21:14:39+03:00
vdpau: remove display plugin

There were two purposes to this as a better alternative to XVideo:
 - video surfaces pass-through in GPU in case of hardware decoding,
 - scaled SPU blending in both software and hardware decoding cases.

Both functions are now supported with higher priority by the OpenGL
video output. Also the software case no longer works at all anyway.

- - - - -


4 changed files:

- NEWS
- modules/hw/vdpau/Makefile.am
- − modules/hw/vdpau/display.c
- po/POTFILES.in


Changes:

=
NEWS
=
@@ -83,6 +83,7 @@ Video output:
  * Fix washed out black on NVIDIA cards with Direct3D9
  * On-Screen-Display is off by default in libvlc
  * Remove deprecated Linux framebuffer plugin
+ * Removed VDPAU video output plugin (hardware decoder still present)
 
 Audio filter:
  * Add RNNoise recurrent neural network denoiser


=
modules/hw/vdpau/Makefile.am
=
@@ -34,20 +34,11 @@ libvdpau_chroma_plugin_la_SOURCES = hw/vdpau/chroma.c 
hw/vdpau/picture.c
 libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS)
 libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
 
-libvdpau_display_plugin_la_SOURCES = hw/vdpau/display.c hw/vdpau/picture.c
-libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
-I$(srcdir)/video_output/xcb
-libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(VDPAU_CFLAGS)
-libvdpau_display_plugin_la_LIBADD = libvlc_vdpau.la libvlc_xcb_events.la \
-   $(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
-
 if HAVE_VDPAU
 pkglib_LTLIBRARIES += libvlc_vdpau.la
 vdpau_LTLIBRARIES = libvdpau_instance_plugin.la \
libvdpau_deinterlace_plugin.la libvdpau_adjust_plugin.la \
libvdpau_sharpen_plugin.la libvdpau_chroma_plugin.la
-if HAVE_XCB
-vdpau_LTLIBRARIES += libvdpau_display_plugin.la
-endif
 if HAVE_AVCODEC_VDPAU
 vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
 endif


=
modules/hw/vdpau/display.c deleted
=
@@ -1,514 +0,0 @@
-/**
- * @file display.c
- * @brief VDPAU video display module for VLC media player
- */
-/*
- * Copyright © 2009-2013 Rémi Denis-Courmont
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include 
-#endif
-
-#include 
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-
-#include "vlc_vdpau.h"
-#include "events.h"
-
-static int Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_context 
*context);
-static void Close(vout_display_t *vd);
-
-vlc_module_begin()
-set_shortname(N_("VDPAU"))
-set_description(N_("VDPAU output"))
-set_subcategory(SUBCAT_VIDEO_VOUT)
-set_callback_display(Open, 0)
-
-add_shortcut("vdpau")
-vlc_module_end()
-
-typedef struct vout_display_sys_t
-{
-xcb_connection_t *conn; /**< XCB connection */
-vdp_t *vdp; /**< VDPAU back-end */
-picture_t *current; /**< Currently visible picture */
-
-xcb_window_t window; /**< target window (owned by VDPAU back-end) */
-VdpDevice device; /**< VDPAU device handle */
-VdpPresentationQueueTarget target; /**< VDPAU presentation queue target */
-VdpPresentationQueue queue; /**< VDPAU presentation queue */
-
-unsigned width;
-unsigned height;
-
-vlc_fourcc_t spu_formats[3];
-} vout_display_sys_t;
-
-static void RenderRegion(vout_display_t *vd, VdpOutputSurface target,
- const subpicture_t *subpic,
- const subpicture_region_t *reg)
-{
-vout_display_sys_t *sys = vd->sys;
-VdpBitmapSurface surface;
-VdpRGBAFormat fmt;
-VdpStatus err;
-
-switch (reg->fmt.i_chroma) {
-#ifdef WORDS_BIGENDIAN
-case VLC_CODEC_ARGB:
-fmt = VDP_RGBA_FORMAT_B8G8R8A8;
-break;
-#else
-case VLC_CODEC_RGBA:
-fmt = VDP_RGBA_FORMAT_R8G8B8A8;
-break;
-case VLC_CODEC_BGRA:
-f

[vlc-commits] [Git][videolan/vlc][master] medialibrary: fix heap-use-after-free

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b2daa832 by Thomas Guillem at 2022-09-18T07:43:00+00:00
medialibrary: fix heap-use-after-free

m_deviceLister is listening to media source tree callbacks and need be
cleaned (and callbacks removed) before m_devices, since callbacks read
m_devices.

==1750167==ERROR: AddressSanitizer: heap-use-after-free on address 
0x6112c640 at pc 0x7f8906109b0e bp 0x7f88ef176630 sp 0x7f88ef176628
READ of size 8 at 0x6112c640 thread T22
#0 0x7f8906109b0d in std::__shared_ptr::get() const 
/usr/include/c++/12/bits/shared_ptr_base.h:1666
#1 0x7f8906109b0d in std::__shared_ptr_access::_M_get() const 
/usr/include/c++/12/bits/shared_ptr_base.h:1363
#2 0x7f8906109b0d in std::__shared_ptr_access::operator->() const 
/usr/include/c++/12/bits/shared_ptr_base.h:1357
#3 0x7f8906109b0d in operator() 
../../modules/misc/medialibrary/fs/fs.cpp:195
#4 0x7f8906109cac in 
operator()<__gnu_cxx::__normal_iterator*,
 std::vector > > > 
/usr/include/c++/12/bits/predefined_ops.h:318
#5 0x7f8906109cac in 
__find_if<__gnu_cxx::__normal_iterator*,
 std::vector > >, 
__gnu_cxx::__ops::_Iter_pred&)> > > 
/usr/include/c++/12/bits/stl_algobase.h:2067
#6 0x7f8906109f54 in 
__find_if<__gnu_cxx::__normal_iterator*,
 std::vector > >, 
__gnu_cxx::__ops::_Iter_pred&)> > > 
/usr/include/c++/12/bits/stl_algobase.h:2112
#7 0x7f8906109f54 in 
find_if<__gnu_cxx::__normal_iterator*,
 std::vector > >, 
vlc::medialibrary::SDFileSystemFactory::deviceByUuid(const 
std::string&)::&)> > 
/usr/include/c++/12/bits/stl_algo.h:3877
#8 0x7f890610b532 in 
vlc::medialibrary::SDFileSystemFactory::deviceByUuid(std::__cxx11::basic_string, std::allocator > const&) 
../../modules/misc/medialibrary/fs/fs.cpp:193
#9 0x7f890610c16e in 
vlc::medialibrary::SDFileSystemFactory::onDeviceMounted(std::__cxx11::basic_string, std::allocator > const&, 
std::__cxx11::basic_string, 
std::allocator > const&, bool) 
../../modules/misc/medialibrary/fs/fs.cpp:146
#10 0x7f890610edd1 in 
vlc::medialibrary::DeviceLister::onChildrenAdded(vlc_media_tree*, 
input_item_node_t*, input_item_node_t* const*, unsigned long) 
../../modules/misc/medialibrary/fs/devicelister.cpp:131
#11 0x7f890610f06e in 
vlc::medialibrary::DeviceLister::onChildrenAdded(vlc_media_tree*, 
input_item_node_t*, input_item_node_t* const*, unsigned long, void*) 
../../modules/misc/medialibrary/fs/devicelister.cpp:105
#12 0x7f8908b01f44 in vlc_media_tree_Add 
../../src/media_source/media_tree.c:303
#13 0x7f8908b00dc0 in services_discovery_item_added 
../../src/media_source/media_source.c:81
#14 0x7f8907972be6 in services_discovery_AddItem 
../../include/vlc_services_discovery.h:166
#15 0x7f8907972be6 in entry_item_append ../../modules/access/dsm/sd.c:73
#16 0x7f8907972daf in netbios_ns_discover_on_entry_added 
../../modules/access/dsm/sd.c:117
#17 0x7f8907980930 in netbios_ns_discover_thread 
(/home/tom/work/out/lib/x86_64-linux-gnu/libdsm.so.3+0x5930)
#18 0x7f89086a3d7f in start_thread 
(/lib/x86_64-linux-gnu/libpthread.so.0+0x7d7f)
#19 0x7f89085bdbae in clone (/lib/x86_64-linux-gnu/libc.so.6+0xfabae)

0x6112c640 is located 0 bytes inside of 256-byte region 
[0x6112c640,0x6112c740)
freed by thread T0 here:
#0 0x7f8908cba3c8 in operator delete(void*, unsigned long) 
../../../../src/libsanitizer/asan/asan_new_delete.cpp:164
#1 0x7f890610c7d8 in 
std::__new_allocator 
>::deallocate(std::shared_ptr*, unsigned 
long) /usr/include/c++/12/bits/new_allocator.h:158
#2 0x7f890610c7d8 in 
std::allocator_traits
 > 
>::deallocate(std::allocator
 >&, std::shared_ptr*, unsigned long) 
/usr/include/c++/12/bits/alloc_traits.h:496
#3 0x7f890610c7d8 in 
std::_Vector_base, 
std:

[vlc-commits] [Git][videolan/vlc][master] share: Makefile.am: use $(EGREP) instead of egrep

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
c6ed4170 by Alexandre Janniaux at 2022-09-17T19:36:01+00:00
share: Makefile.am: use $(EGREP) instead of egrep

Fix the following warning:

egrep: warning: egrep is obsolescent; using grep -E

- - - - -


1 changed file:

- share/Makefile.am


Changes:

=
share/Makefile.am
=
@@ -16,7 +16,7 @@ EXTRA_DIST += vlc-openbd.desktop.in vlc-opendvd.desktop.in 
vlc-openvcd.desktop.i
 CLEANFILES += $(desktop_DATA) $(appdata_DATA)
 
 %.desktop: %.desktop.in $(top_builddir)/config.status
-   $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' 
$(srcdir)/vlc.desktop.mimetypes | egrep -v '^$$' | tr "\n" ';')"; \
+   $(AM_V_GEN)mimetypes="$$(sed 's/\s*#.*$$//g' 
$(srcdir)/vlc.desktop.mimetypes | $(EGREP) -v '^$$' | tr "\n" ';')"; \
sed \
-e 's,\@bindir\@,$(bindir),g' \
 -e "s,\@MIMETYPES\@,$$mimetypes,g" < "$<" > tmp-$@



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/c6ed4170a5aa38be847b63bc86daad87358ffb54

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 9 commits: qml: add custom image provider to colorize SVG assets

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
e99b3c40 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: add custom image provider to colorize SVG assets

this allows to template SVG assets with placeholder colors that will be replaced
with theme aware colors at runtime. the substitution is made while reading the
SVG using simple string substitution.

placeholder colors are pre-defined as

color 1 -> #FF00FF
color 2 -> #00

- - - - -
e97b53f1 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: upgrade ImageToolButton

ImageToolButton was unused and incomplete. This aims to provide the same
behavior as IconToolButton but with images instead of icons

- - - - -
e8514ac5 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: update A to B button

* updated artwork
* use partial colorization of the artwork to represent the state instead of
  layering multiple artworks

- - - - -
52e83d00 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qt: remove unused artworks

- - - - -
5a16789d by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: provide qrc:// path for predefined artworks in NetworkSourceModel

this will ease differentiation between predefined artworks and artworks 
actually provided
by the model

- - - - -
bced9c31 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: use image provider to display generic cover in network views

- - - - -
808f5e55 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: use SVG artwork in ServicesHomeDisplay instead of drawing through code

- - - - -
9800e1a0 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qml: set the accent color of the cone according to the theme

- - - - -
3ab306c4 by Pierre Lamot at 2022-09-17T18:47:07+00:00
qt: rescale sd artwork

use the template accent color for coloration

- - - - -


30 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/maininterface/mainui.cpp
- modules/gui/qt/maininterface/qml/BannerSources.qml
- modules/gui/qt/network/networksourcesmodel.cpp
- modules/gui/qt/network/qml/NetworkBrowseDisplay.qml
- modules/gui/qt/network/qml/NetworkCustomCover.qml
- modules/gui/qt/network/qml/NetworkGridItem.qml
- modules/gui/qt/network/qml/NetworkListItem.qml
- modules/gui/qt/network/qml/NetworkThumbnailItem.qml
- modules/gui/qt/network/qml/ServicesHomeDisplay.qml
- modules/gui/qt/pixmaps/VLCIcons.json
- modules/gui/qt/pixmaps/VLCIcons.ttf
- modules/gui/qt/pixmaps/icons/atob.svg
- − modules/gui/qt/pixmaps/icons/atob_bg_a.svg
- − modules/gui/qt/pixmaps/icons/atob_bg_ab.svg
- − modules/gui/qt/pixmaps/icons/atob_bg_b.svg
- − modules/gui/qt/pixmaps/icons/atob_bg_none.svg
- − modules/gui/qt/pixmaps/icons/atob_fg_a.svg
- − modules/gui/qt/pixmaps/icons/atob_fg_ab.svg
- − modules/gui/qt/pixmaps/icons/atob_fg_b.svg
- − modules/gui/qt/pixmaps/icons/atob_noa.svg
- − modules/gui/qt/pixmaps/icons/atob_nob.svg
- modules/gui/qt/pixmaps/misc/cone.svg
- + modules/gui/qt/pixmaps/placeholder/add_service.svg
- modules/gui/qt/pixmaps/sd/appletrailers.svg
- modules/gui/qt/pixmaps/sd/assembleenationale.svg
- modules/gui/qt/pixmaps/sd/capture-card.svg
- modules/gui/qt/pixmaps/sd/directory.svg
- modules/gui/qt/pixmaps/sd/disc.svg
- modules/gui/qt/pixmaps/sd/file.svg


The diff was not included because it is too large.


View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/2b874a86c8ce5269ce569c2b2cd6152eb936d53e...3ab306c40c3dd26596948335591a685645fe8be7

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] codec: aribcaption: fix A/R

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
2b874a86 by Francois Cartegnie at 2022-09-17T18:26:31+00:00
codec: aribcaption: fix A/R

- - - - -


1 changed file:

- modules/codec/arib/libaribcaption.c


Changes:

=
modules/codec/arib/libaribcaption.c
=
@@ -69,6 +69,8 @@ typedef struct
 {
 decoder_sys_t *p_dec_sys;
 vlc_tick_t i_pts;
+unsigned   i_render_area_width;
+unsigned   i_render_area_height;
 aribcc_render_result_t render_result;
 } libaribcaption_spu_updater_sys_t;
 
@@ -102,14 +104,17 @@ static int SubpictureValidate(subpicture_t *p_subpic,
   bool b_dst_changed, const video_format_t 
*p_dst_format,
   vlc_tick_t i_ts)
 {
-VLC_UNUSED(p_src_format);
-
 libaribcaption_spu_updater_sys_t *p_spusys = p_subpic->updater.p_sys;
 decoder_sys_t *p_sys = p_spusys->p_dec_sys;
 
 if (b_src_changed || b_dst_changed) {
 const video_format_t *fmt = p_dst_format;
-aribcc_renderer_set_frame_size(p_sys->p_renderer, 
fmt->i_visible_width, fmt->i_visible_height);
+/* don't let library freely scale using either the min of width or 
height ratio */
+p_spusys->i_render_area_width = fmt->i_visible_width;
+p_spusys->i_render_area_height = p_src_format->i_visible_height * 
fmt->i_visible_width /
+ p_src_format->i_visible_width;
+aribcc_renderer_set_frame_size(p_sys->p_renderer, 
p_spusys->i_render_area_width,
+  
p_spusys->i_render_area_height);
 }
 
 const vlc_tick_t i_stream_date = p_spusys->i_pts + (i_ts - 
p_subpic->i_start);
@@ -166,8 +171,8 @@ static void SubpictureUpdate(subpicture_t *p_subpic,
 aribcc_image_t *p_images = p_spusys->render_result.images;
 uint32_ti_image_count = p_spusys->render_result.image_count;
 
-p_subpic->i_original_picture_width = fmt.i_visible_width;
-p_subpic->i_original_picture_height = fmt.i_visible_height;
+p_subpic->i_original_picture_width = p_spusys->i_render_area_width;
+p_subpic->i_original_picture_height = p_spusys->i_render_area_height;
 
 if (!p_images || i_image_count == 0) {
 return;
@@ -184,6 +189,8 @@ static void SubpictureUpdate(subpicture_t *p_subpic,
 fmt_region.i_visible_width  = image->width;
 fmt_region.i_height =
 fmt_region.i_visible_height = image->height;
+fmt_region.i_sar_num = 1;
+fmt_region.i_sar_den = 1;
 
 subpicture_region_t *region = subpicture_region_New(&fmt_region);
 if (!region)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2b874a86c8ce5269ce569c2b2cd6152eb936d53e

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/2b874a86c8ce5269ce569c2b2cd6152eb936d53e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] kwallet: fix password search for password with either a realm or authtype

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
862c4a2d by Juliane de Sartiges at 2022-09-17T13:45:53+00:00
kwallet: fix password search for password with either a realm or authtype

even without an authtype the "?" widlcard was always added to search 
making
kwallet return no password for that query

- - - - -


1 changed file:

- modules/keystore/kwallet.c


Changes:

=
modules/keystore/kwallet.c
=
@@ -159,10 +159,9 @@ values2key( const char* const* ppsz_values, bool b_search )
 vlc_memstream_printf( &ms, "*" );
 
 /* Realm and authtype section */
-if ( ppsz_values[KEY_REALM] || ppsz_values[KEY_AUTHTYPE] || b_search )
+if ( ppsz_values[KEY_REALM] || ppsz_values[KEY_AUTHTYPE] )
 {
-vlc_memstream_printf( &ms, "?" );
-
+vlc_memstream_printf( &ms, "\?" );
 /* Realm section */
 if ( ppsz_values[KEY_REALM] || b_search )
 {
@@ -198,6 +197,8 @@ values2key( const char* const* ppsz_values, bool b_search )
 }
 
 }
+else if ( b_search )
+vlc_memstream_printf( &ms, "*" );
 
 b_state = true;
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/862c4a2d9d04075f2e88c34cc011b9b06046263a

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/862c4a2d9d04075f2e88c34cc011b9b06046263a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 5 commits: qml: use VLCTick in playlist model instead of formating locally

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
c48ac131 by Pierre Lamot at 2022-09-17T13:19:58+00:00
qml: use VLCTick in playlist model instead of formating locally

- - - - -
67fdbd40 by Pierre Lamot at 2022-09-17T13:19:58+00:00
qt: rename VLCTick.toString to formatHMS

we are going to provide alternative string formatting methods

- - - - -
d552504d by Pierre Lamot at 2022-09-17T13:19:58+00:00
qml: improve duration display formatting

* display time below the second
* round time to the closest unit

- - - - -
d369b7b3 by Pierre Lamot at 2022-09-17T13:19:58+00:00
qt: return VLCTick for duration in medialib models

- - - - -
daf45fef by Pierre Lamot at 2022-09-17T13:19:58+00:00
qml: remove unused time formatter

- - - - -


30 changed files:

- modules/gui/qt/medialibrary/mlalbum.cpp
- modules/gui/qt/medialibrary/mlalbum.hpp
- modules/gui/qt/medialibrary/mlalbumtrack.cpp
- modules/gui/qt/medialibrary/mlalbumtrack.hpp
- modules/gui/qt/medialibrary/mlbookmarkmodel.cpp
- modules/gui/qt/medialibrary/mlfolder.cpp
- modules/gui/qt/medialibrary/mlfolder.hpp
- modules/gui/qt/medialibrary/mlgroup.cpp
- modules/gui/qt/medialibrary/mlgroup.hpp
- modules/gui/qt/medialibrary/mlhelper.cpp
- modules/gui/qt/medialibrary/mlhelper.hpp
- modules/gui/qt/medialibrary/mlplaylist.cpp
- modules/gui/qt/medialibrary/mlplaylist.hpp
- modules/gui/qt/medialibrary/mlplaylistmedia.cpp
- modules/gui/qt/medialibrary/mlplaylistmedia.hpp
- modules/gui/qt/medialibrary/mlrecentsmodel.cpp
- modules/gui/qt/medialibrary/mlrecentsmodel.hpp
- modules/gui/qt/medialibrary/mlrecentsvideomodel.cpp
- modules/gui/qt/medialibrary/mlvideo.cpp
- modules/gui/qt/medialibrary/mlvideo.hpp
- modules/gui/qt/medialibrary/mlvideofoldersmodel.cpp
- modules/gui/qt/medialibrary/mlvideogroupsmodel.cpp
- modules/gui/qt/medialibrary/mlvideomodel.cpp
- modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml
- modules/gui/qt/medialibrary/qml/VideoGridItem.qml
- modules/gui/qt/medialibrary/qml/VideoInfoExpandPanel.qml
- modules/gui/qt/player/qml/ControlBar.qml
- modules/gui/qt/player/qml/SliderBar.qml
- modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
- modules/gui/qt/playlist/playlist_model.cpp


The diff was not included because it is too large.


View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/2639fe0af8d283dfdf2b30f6e2529ddeb96246f2...daf45fefc3a2bfd1cf527e3f1fccdcd6f64d8261

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: ssh2: remove hack for gcc 4.9

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
84990ffa by Steve Lhomme at 2022-09-09T19:10:19+00:00
contrib: ssh2: remove hack for gcc 4.9

VLC 4.0 requires gcc 5.0

- - - - -


1 changed file:

- contrib/src/ssh2/rules.mak


Changes:

=
contrib/src/ssh2/rules.mak
=
@@ -10,10 +10,6 @@ ifeq ($(call need_pkg,"libssh2"),)
 PKGS_FOUND += ssh2
 endif
 
-ifeq ($(shell echo `${CC} -dumpversion | cut -f1-2 -d.`),4.9)
-   BROKEN_GCC_CFLAGS:="CFLAGS=-O1"
-endif
-
 $(TARBALLS)/libssh2-$(LIBSSH2_VERSION).tar.gz:
$(call download_pkg,$(LIBSSH2_URL),ssh2)
 
@@ -33,6 +29,6 @@ DEPS_ssh2 = gcrypt $(DEPS_gcrypt)
 
 .ssh2: ssh2
$(RECONF)
-   cd $< && $(HOSTVARS) ./configure $(BROKEN_GCC_CFLAGS) $(HOSTCONF) 
--disable-examples-build --with-libgcrypt --without-openssl --without-mbedtls
+   cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples-build 
--with-libgcrypt --without-openssl --without-mbedtls
cd $< && $(MAKE) install
touch $@



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/84990ffadaf8bfc3df56298d5473be58cf2a80d8

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/84990ffadaf8bfc3df56298d5473be58cf2a80d8
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] qt: fix interface state locking on MacOS

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4241b31f by Alexandre Janniaux at 2022-09-09T18:33:34+00:00
qt: fix interface state locking on MacOS

On most platforms, the Qt interface is started in its own thread and the
VLC interface startup routine needs to wait for the Qt interface to be
ready before giving the control back to libvlc.

On MacOS, the interface is currently started into the main thread
directly because of the platform constraints of Qt, blocking libvlc and
enforcing the startup of Qt synchronously.

Because of that, the state lock was never given back, and the window,
started from a different thread, was never able to lock it to check that
the interface is correctly started.

The correct fix should be to make the Qt interface start correctly as in
other platforms, but current attempts at making it a reality have
failed. In particular, it doesn't seem possible to dispatch the startup.
The changes here keep the current workaround, allowing application
developers to check the behaviour on MacOS.

- - - - -


1 changed file:

- modules/gui/qt/qt.cpp


Changes:

=
modules/gui/qt/qt.cpp
=
@@ -498,6 +498,7 @@ static int OpenInternal( qt_intf_t *p_intf )
 /* Get the playlist before the lock to avoid a lock-order-inversion */
 vlc_playlist_t *playlist = vlc_intf_GetMainPlaylist(p_intf->intf);
 
+#ifndef Q_OS_MAC
 vlc::threads::mutex_locker locker (lock);
 if (busy || open_state == OPEN_STATE_ERROR)
 {
@@ -505,6 +506,7 @@ static int OpenInternal( qt_intf_t *p_intf )
 msg_Err (p_intf, "cannot start Qt multiple times");
 return VLC_EGENERIC;
 }
+#endif
 
 p_intf->p_mi = NULL;
 
@@ -834,7 +836,6 @@ static void *Thread( void *obj )
 /* Explain how to show a dialog :D */
 p_intf->pf_show_dialog = ShowDialog;
 
-#ifndef Q_OS_MAC
 /* Tell the main LibVLC thread we are ready */
 {
 vlc::threads::mutex_locker locker (lock);
@@ -843,7 +844,7 @@ static void *Thread( void *obj )
 open_state = OPEN_STATE_OPENED;
 wait_ready.signal();
 }
-#else
+#ifdef Q_OS_MAC
 /* We took over main thread, register and start here */
 if( !p_intf->b_isDialogProvider )
 {



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4241b31f00a806bf10a55c6ea33c96d604a05d9f

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/4241b31f00a806bf10a55c6ea33c96d604a05d9f
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: let Meson find CMake packages

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
b4d3804d by Steve Lhomme at 2022-09-09T17:23:23+00:00
contrib: let Meson find CMake packages

libplacebo should be able to find glslang that way since it doesn't export a
pkg-config file.

- - - - -


2 changed files:

- contrib/src/gen-meson-crossfile.py
- contrib/src/main.mak


Changes:

=
contrib/src/gen-meson-crossfile.py
=
@@ -62,3 +62,11 @@ args.file.write("endian = 'little'\n")
 # Get first part of triplet
 cpu = os.environ.get('HOST', '').split('-')[0]
 args.file.write("cpu = '{}'\n".format(cpu))
+
+# CMake section
+args.file.write("\n[cmake]\n")
+_add_environ_val('CMAKE_C_COMPILER', 'CC')
+_add_environ_val('CMAKE_CXX_COMPILER', 'CXX')
+_add_environ_val('CMAKE_SYSTEM_NAME', 'CMAKE_SYSTEM_NAME')
+_add_environ_val('CMAKE_SYSTEM_PROCESSOR', 'ARCH')
+


=
contrib/src/main.mak
=
@@ -487,6 +487,8 @@ ifdef HAVE_CROSS_COMPILE
 MESONFLAGS += --cross-file $(abspath crossfile.meson)
 MESON = env -i PATH="$(PREFIX)/bin:$(PATH)" \
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" \
+   CMAKE="$(command -v cmake)" \
+   CMAKE_PREFIX_PATH="$(PREFIX)" \
meson -Dpkg_config_path="$(PKG_CONFIG_PATH)" \
$(MESONFLAGS)
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/b4d3804dde0d24ff49039bbb4b9b18c0172c2693

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] contrib: silence cppcheck compiler errors

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
400cbaa4 by Jacob Martin at 2022-09-04T17:18:40+00:00
contrib: silence cppcheck compiler errors

This fixes a misleading 'fatal error' message that appears when make
is invoked for contribs.

Since cppcheck only used stdout of $(CC) to begin with, suppressing
stderr in this manner should not change its overall behavior.

- - - - -


1 changed file:

- contrib/src/main.mak


Changes:

=
contrib/src/main.mak
=
@@ -157,7 +157,7 @@ ifneq ($(findstring clang, $(shell $(CC) --version 
2>/dev/null)),)
 HAVE_CLANG := 1
 endif
 
-cppcheck = $(shell printf '$(2)' | $(CC) $(CFLAGS) -E -dM - | grep -E $(1))
+cppcheck = $(shell printf '$(2)' | $(CC) $(CFLAGS) -E -dM - 2>/dev/null | grep 
-E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include
 CPPFLAGS := $(CPPFLAGS) $(EXTRA_CFLAGS)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/400cbaa4aee3d9ea7e0fbd8177874d9b1aad165d

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/400cbaa4aee3d9ea7e0fbd8177874d9b1aad165d
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] macosx: Add a highlight to library view collection view

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
38e17000 by Claudio Cambra at 2022-09-04T15:56:49+00:00
macosx: Add a highlight to library view collection view

Signed-off-by: Claudio Cambra 

- - - - -


4 changed files:

- modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib
- modules/gui/macosx/UI/VLCLibrarySongTableCellView.xib
- modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
- modules/gui/macosx/library/VLCLibraryCollectionViewItem.m


Changes:

=
modules/gui/macosx/UI/VLCLibraryCollectionViewItem.xib
=
@@ -10,6 +10,7 @@
 
 
 
+
 
 
 
@@ -61,6 +62,14 @@
 
 
 
+
+
+
+
+
+
+
+
 
 
 
@@ -110,10 +119,14 @@
 
 
 
+
+
 
 
 
+
 
+
 
 
 


=
modules/gui/macosx/UI/VLCLibrarySongTableCellView.xib
=
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 


=
modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
=
@@ -40,6 +40,7 @@ extern NSString *VLCLibraryCellIdentifier;
 @property (readwrite, assign) IBOutlet NSButton *playInstantlyButton;
 @property (readwrite, assign) IBOutlet NSButton *addToPlaylistButton;
 @property (readwrite, assign) IBOutlet VLCLinearProgressIndicator 
*progressIndicator;
+@property (readwrite, assign) IBOutlet NSBox *highlightBox;
 
 @property (readwrite, retain, nonatomic) id 
representedItem;
 


=
modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
=
@@ -83,6 +83,7 @@ const CGFloat 
VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
 self.unplayedIndicatorTextField.stringValue = _NS("NEW");
 self.unplayedIndicatorTextField.font = [NSFont 
VLClibraryHighlightCellHighlightLabelFont];
 self.unplayedIndicatorTextField.textColor = [NSColor 
VLClibraryHighlightColor];
+self.highlightBox.borderColor = [NSColor VLCOrangeElementColor];
 
 if (@available(macOS 10.14, *)) {
 [[NSApplication sharedApplication] addObserver:self
@@ -134,6 +135,7 @@ const CGFloat 
VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
 _annotationTextField.hidden = YES;
 _progressIndicator.hidden = YES;
 _unplayedIndicatorTextField.hidden = YES;
+_highlightBox.hidden = YES;
 }
 
 - (void)setRepresentedItem:(id)representedItem
@@ -146,6 +148,12 @@ const CGFloat 
VLCLibraryCollectionViewItemMaximumDisplayedProgress = 0.95;
 [self updateRepresentation];
 }
 
+- (void)setSelected:(BOOL)selected
+{
+super.selected = selected;
+_highlightBox.hidden = !selected;
+}
+
 - (void)mediaItemUpdated:(NSNotification *)aNotification
 {
 VLCMediaLibraryMediaItem *updatedMediaItem = aNotification.object;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/38e17000d1eb39327b4adc9a946d1339adc58b33

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/38e17000d1eb39327b4adc9a946d1339adc58b33
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: decklink: fix use after free

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4d5914d0 by Rémi Denis-Courmont at 2022-09-03T09:12:27+00:00
decklink: fix use after free

- - - - -
4a09b885 by Rémi Denis-Courmont at 2022-09-03T09:12:27+00:00
decklink: cut string length check

If the string has at least 5 characters, it is too long. We don't
exactly care how many characters it actually has.

- - - - -


1 changed file:

- modules/video_output/decklink.cpp


Changes:

=
modules/video_output/decklink.cpp
=
@@ -436,11 +436,10 @@ static int OpenDecklink(vout_display_t *vd, 
decklink_sys_t *sys, video_format_t
 
 if(mode)
 {
-size_t len = strlen(mode);
-if (len > 4)
+if (strnlen(mode, 5) > 4)
 {
-free(mode);
 msg_Err(vd, "Invalid mode %s", mode);
+free(mode);
 goto error;
 }
 strncpy(wanted_mode.str, mode, 4);



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/84ef46141584b464a7c3376672cc1b2e7065340b...4a09b885e820cb7e0519994acbdbc56eabc05bf7

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] 4 commits: vocaroo.lua: pass HTTP referrer to media URL request

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
0c8461b9 by Pierre Ynard at 2022-09-03T08:50:38+00:00
vocaroo.lua: pass HTTP referrer to media URL request

Since last month, requests without a valid referrer get rejected with an
HTTP 403 error.

We might want to consider that the lua script API should track and pass
such referrers by itself.

(cherry picked from commit 3c9c32ab3bd0258aa55bd353609c96846ce21373)
Signed-off-by: David Fuhrmann 

- - - - -
3f03bd04 by Pierre Ynard at 2022-09-03T08:50:38+00:00
youtube.lua: fix crash on unexpected "n" descrambling transformation 
code

It was possible, when encountering different code from what was expected
for some known transformations, to void the code parsing pointer instead
of advancing it, resulting in a subsequent crash of the script and total
playback failure. Add a fallback and check, to prevent and gracefully
deal with this, and still allow playback, even if throttled, in case of
descrambling failure.

(cherry picked from commit 149444107513953b46f52675cea0408f324d4c04)
Signed-off-by: David Fuhrmann 

- - - - -
00bd1f2d by Pierre Ynard at 2022-09-03T08:50:38+00:00
youtube.lua: don't silently fail on "n" descrambling script 
parsing

The descrambling script section was updated from a simple and linear
chain of calls, to a complex execution tree with conditional branches.
Failure to recognize and parse this call structure (or lack thereof)
resulted in a silent no-op. Add a check to properly report an error.

Ref #27227

(cherry picked from commit b735ef2cde0e5b982ff157aff59199eeca9b3a71)
Signed-off-by: David Fuhrmann 

- - - - -
33b0b524 by Pierre Ynard at 2022-09-03T08:50:38+00:00
youtube.lua: bump up severity of "n" parameter throttling warning

Due to the severely increased complexity of "n" descrambling code, a
quick fix is unfortunately not foreseeable. For now, let users know more
clearly what's going on and what's to expect or not.

Ref #27227

(cherry picked from commit 90dcfa0e78081770ecbd0a072b96a277aea4a214)
Signed-off-by: David Fuhrmann 

- - - - -


2 changed files:

- share/lua/playlist/vocaroo.lua
- share/lua/playlist/youtube.lua


Changes:

=
share/lua/playlist/vocaroo.lua
=
@@ -1,7 +1,7 @@
 --[[
  $Id$
 
- Copyright © 2016, 2019-2020 the VideoLAN team
+ Copyright © 2016, 2019-2020, 2022 the VideoLAN team
 
  Authors: Pierre Ynard
 
@@ -39,6 +39,6 @@ function parse()
 or "//media.vocaroo.com/mp3/"
 
 local path = vlc.access..":"..cdn..id
-return { { path = path } }
+return { { path = path; options = { 
":http-referrer="..vlc.access.."://"..vlc.path } } }
 end
 


=
share/lua/playlist/youtube.lua
=
@@ -371,7 +371,7 @@ function n_descramble( nparam, js )
 -- as such into a table.
 local data = {}
 datac = datac..","
-while datac ~= "" do
+while datac and datac ~= "" do
 local el = nil
 -- Transformation functions
 if string.match( datac, "^function%(" ) then
@@ -397,6 +397,7 @@ function n_descramble( nparam, js )
el == trans.compound1.func or
el == trans.compound2.func then
 datac = string.match( datac, '^.-},e%.split%(""%)%)},(.*)$' )
+or string.match( datac, "^.-},(.*)$" )
 else
 datac = string.match( datac, "^.-},(.*)$" )
 end
@@ -460,6 +461,10 @@ function n_descramble( nparam, js )
 -- as a second argument. We parse and emulate those calls to follow
 -- the descrambling script.
 -- c[40](c[14],c[2]),c[25](c[48]),c[14](c[1],c[24],c[42]()), [...]
+if not string.match( script, "c%[(%d+)%]%(c%[(%d+)%]([^)]-)%)" ) then
+vlc.msg.dbg( "Couldn't parse and execute YouTube video throttling 
parameter descrambling rules" )
+return nil
+end
 for ifunc, itab, args in string.gmatch( script, 
"c%[(%d+)%]%(c%[(%d+)%]([^)]-)%)" ) do
 local iarg1 = string.match( args, "^,c%[(%d+)%]" )
 local iarg2 = string.match( args, "^,[^,]-,c%[(%d+)%]" )
@@ -704,8 +709,8 @@ function pick_stream( stream_map, js_url )
 if dn then
 url = string.gsub( url, "([?&])n=[^&]+", 
"%1n="..vlc.strings.encode_uri_component( dn ), 1 )
 else
-vlc.msg.dbg( "Couldn't descramble YouTube throttling URL 
parameter: data transfer will get throttled" )
-vlc.msg.err( "Couldn't process youtube video URL, please check for 
updates to this script" )
+vlc.msg.err( "Couldn't descramble YouTube throttling URL 
parameter: data transfer will get throttled" )
+--vlc.msg.err( "Couldn't process youtube video URL, please check 
for updates to this script" )
 end
 end
 



View it on GitLab: 
https://code.videolan.org/videolan/v

[vlc-commits] [Git][videolan/vlc][master] cargo: fix parallel build

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
84ef4614 by Rémi Denis-Courmont at 2022-09-02T18:04:47+00:00
cargo: fix parallel build

See a5b9278ccd655f8108a5647f41cce45230f9047f.

- - - - -


1 changed file:

- contrib/src/cargo/rules.mak


Changes:

=
contrib/src/cargo/rules.mak
=
@@ -33,8 +33,8 @@ endif
cd $< && RUSTUP_INIT_SKIP_PATH_CHECK=yes \
  RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \
  ./rustup-init.sh --no-modify-path -y --default-toolchain 
$(RUST_VERSION)
-   $(RUSTUP) default $(RUST_VERSION)
-   $(RUSTUP) target add $(RUST_TARGET)
+   +$(RUSTUP) default $(RUST_VERSION)
+   +$(RUSTUP) target add $(RUST_TARGET)
unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH CFLAGS CPPFLAGS LDFLAGS; \
$(CARGO) install --locked $(CARGOC_FEATURES) cargo-c --version 
$(CARGOC_VERSION)
touch $@



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/84ef46141584b464a7c3376672cc1b2e7065340b

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/84ef46141584b464a7c3376672cc1b2e7065340b
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: qml: use sourceItem opacity by default in FrostedGlassEffect

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
7d11b0e8 by Fatih Uzunoglu at 2022-09-02T17:37:38+00:00
qml: use sourceItem opacity by default in FrostedGlassEffect

- - - - -
2e7277f6 by Fatih Uzunoglu at 2022-09-02T17:37:38+00:00
qml: add loader to FrostedGlassEffect

- - - - -
e14a0233 by Fatih Uzunoglu at 2022-09-02T17:37:38+00:00
qml: enable layering in stackView when miniPlayer effect is available

- - - - -
65bd3a1a by Fatih Uzunoglu at 2022-09-02T17:37:38+00:00
qml: remove the effect from playlist overlay menu

Visual pleasure the effect provides is not justified due to the side effects 
the effect causes.

- - - - -


5 changed files:

- modules/gui/qt/maininterface/qml/MainDisplay.qml
- modules/gui/qt/player/qml/MiniPlayer.qml
- modules/gui/qt/playlist/qml/PlaylistListView.qml
- modules/gui/qt/widgets/qml/FrostedGlassEffect.qml
- modules/gui/qt/widgets/qml/OverlayMenu.qml


Changes:

=
modules/gui/qt/maininterface/qml/MainDisplay.qml
=
@@ -266,6 +266,27 @@ FocusScope {
 leftMargin: VLCStyle.applicationHorizontalMargin
 }
 
+// This item is the root of a large hierarchy
+// which requires many batches to be rendered.
+// When the miniPlayer effect is active, this
+// item (source item) gets rendered in an offscreen
+// surface. If we don't enable layer here,
+// it (along with children) gets rendered again
+// in the assigned window.
+// If layer is enabled, instead of rendering one
+// more time with many batches, a dynamic texture
+// from the offscreen surface is used. This behavior
+// reduces the amount of batches from 2x to x+1.
+// A side effect is having to draw a large texture
+// with blending on, but this must be cheaper redrawing
+// all the batches.
+// TODO: Reconsider this behavior when batching is 
optimized.
+layer.enabled: miniPlayer.visible && 
miniPlayer.effectAvailable
+
+// Enable clipping so that the effect does not sit
+// on top of the source.
+clip: miniPlayer.visible && miniPlayer.effectAvailable
+
 Loader {
 z: 1
 anchors {


=
modules/gui/qt/player/qml/MiniPlayer.qml
=
@@ -35,6 +35,7 @@ FocusScope {
 
 property alias effectSource: effect.source
 property alias effectSourceRect: effect.sourceRect
+property alias effectAvailable: effect.effectAvailable
 
 state: (Player.playingState === Player.PLAYING_STATE_STOPPED) ? ""
   : "expanded"


=
modules/gui/qt/playlist/qml/PlaylistListView.qml
=
@@ -20,7 +20,6 @@ import QtQuick.Controls 2.4
 import QtQuick.Templates 2.4 as T
 import QtQuick.Layouts 1.11
 import QtQml.Models 2.2
-import QtGraphicalEffects 1.0
 
 import org.videolan.vlc 0.1
 
@@ -144,8 +143,6 @@ Control {
 isRight: true
 rightPadding: VLCStyle.margin_xsmall + 
VLCStyle.applicationHorizontalMargin
 bottomPadding: VLCStyle.margin_large + root.bottomPadding
-
-effectSource: contentItem
 }
 }
 


=
modules/gui/qt/widgets/qml/FrostedGlassEffect.qml
=
@@ -21,75 +21,98 @@ import QtGraphicalEffects 1.0
 
 import "qrc:///style/"
 
-Rectangle {
+Item {
 id: effect
 
-property alias source: effectSource.sourceItem
-property alias sourceRect: effectSource.sourceRect
-property alias recursive: effectSource.recursive
-property alias blurRadius: blurEffect.radius
-property alias tint: effect.color
+property Item source
+property rect sourceRect: mapToItem(source, x, y, width, height)
+
+property bool recursive: false
+property real blurRadius: 64
+property color tint
 
 property real tintStrength: 0.7
 property real noiseStrength: 0.02
 property real exclusionStrength: 0.09
 
-FastBlur {
-id: blurEffect
+readonly property bool effectAvailable: (GraphicsInfo.shaderType === 
GraphicsInfo.GLSL) &&
+(GraphicsInfo.shaderSourceType & 
GraphicsInfo.ShaderSourceString)
+
+opacity: source.opacity
+
+Loader {
+id: loader
 
 anchors.fill: parent
 
-source: ShaderEffectSource {
-id: effectSource
-   

[vlc-commits] [Git][videolan/vlc][3.0.x] On the road to 3.0.18

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
c9ab8c60 by David Fuhrmann at 2022-09-02T11:17:25+00:00
On the road to 3.0.18

- - - - -


2 changed files:

- NEWS
- configure.ac


Changes:

=
NEWS
=
@@ -1,3 +1,13 @@
+Changes between 3.0.18-rc and 3.0.18:
+-
+
+Demux:
+ * Fix build of gme plugin
+
+Video Output:
+ * Fix video placement with caopengllayer
+
+
 Changes between 3.0.17.4 and 3.0.18-rc:
 --
 


=
configure.ac
=
@@ -2,12 +2,12 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 1999-2022 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 3.0.18-rc)
+AC_INIT(vlc, 3.0.18)
 VERSION_MAJOR=3
 VERSION_MINOR=0
 VERSION_REVISION=18
 VERSION_EXTRA=0
-VERSION_DEV=rc
+VERSION_DEV=
 
 PKGDIR="vlc"
 AC_SUBST(PKGDIR)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/c9ab8c60248a3ca898b003d9c7cb26b9eab12f1d

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 3 commits: win32: filesystem: don't add backslash on folder search if it ends with one

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
a716e84a by Steve Lhomme at 2022-08-14T06:55:33+00:00
win32: filesystem: don't add backslash on folder search if it ends with one

- - - - -
c10ea848 by Steve Lhomme at 2022-08-14T06:55:33+00:00
win32: filesystem: optimize the folder search string creation

We can tell the end size faster than asprintf and replace the forward slash
while filling the output string. (it is safe to replace in a UTF-8 string).

- - - - -
cd238cef by Steve Lhomme at 2022-08-14T06:55:33+00:00
win32: use the proper backslash in Windows pathes (bis)

Similar to dec06aeca77546a404461dab98391e1ff2c58816 for UAP builds.

- - - - -


2 changed files:

- src/win32/dirs-uap.c
- src/win32/filesystem.c


Changes:

=
src/win32/dirs-uap.c
=
@@ -152,7 +152,7 @@ char *config_GetSysPath(vlc_sysdir_t type, const char 
*filename)
 return dir;
 
 char *path;
-if (unlikely(asprintf(&path, "%s/%s", dir, filename) == -1))
+if (unlikely(asprintf(&path, "%s\\%s", dir, filename) == -1))
 path = NULL;
 free(dir);
 return path;


=
src/win32/filesystem.c
=
@@ -211,16 +211,55 @@ vlc_DIR *vlc_opendir (const char *dirname)
 p_dir->u.insert_dot_dot = !strcmp (dirname + 1, ":\\");
 
 char *wildcard;
-int res;
+const size_t len = strlen(dirname);
 if (p_dir->u.insert_dot_dot)
+{
 // Prepending the string "\\?\" does not allow access to the root 
directory.
-res = asprintf(&wildcard, "%s\\*", dirname);
+wildcard = malloc(len + 3);
+if (unlikely(wildcard == NULL))
+{
+free (p_dir);
+return NULL;
+}
+else
+{
+memcpy(wildcard, dirname, len);
+size_t j = len;
+wildcard[j++] = '\\';
+wildcard[j++] = '*';
+wildcard[j++] = '\0';
+}
+}
 else
-res = asprintf(&wildcard, "?\\%s\\*", dirname);
-if (res < 0)
 {
-free (p_dir);
-return NULL;
+wildcard = malloc(4 + len + 3);
+if (unlikely(wildcard == NULL))
+{
+free (p_dir);
+return NULL;
+}
+else
+{
+// prepend "\\?\"
+wildcard[0] = '\\';
+wildcard[1] = '\\';
+wildcard[2] = '?';
+wildcard[3] = '\\';
+size_t j = 4;
+for (size_t i=0; iwildcard = ToWide(wildcard);
 free(wildcard);
@@ -229,15 +268,6 @@ vlc_DIR *vlc_opendir (const char *dirname)
 free (p_dir);
 return NULL;
 }
-if (!p_dir->u.insert_dot_dot)
-{
-// remove forward slashes from long pathes to please FindFirstFileExW
-for (size_t i=0; p_dir->wildcard[i]!=L'\0';i++)
-{
-if (unlikely(p_dir->wildcard[i] == L'/'))
-p_dir->wildcard[i] = L'\\';
-}
-}
 
 p_dir->fHandle = FindFirstFileExW(p_dir->wildcard, FindExInfoBasic,
   &p_dir->wdir, (FINDEX_SEARCH_OPS)0,



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/6dea7695a5f97206c82f64757e1e7c7ce9b45ebf...cd238cef65cdebc09a6a8ed0407f47b4749c1c60

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] macosx: Unify the video library view into one collection view with sections

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
db807b51 by Claudio Cambra at 2022-08-02T16:30:16+00:00
macosx: Unify the video library view into one collection view with sections

Signed-off-by: Claudio Cambra 

- - - - -


5 changed files:

- modules/gui/macosx/UI/VLCLibraryWindow.xib
- modules/gui/macosx/library/VLCLibraryVideoDataSource.h
- modules/gui/macosx/library/VLCLibraryVideoDataSource.m
- modules/gui/macosx/library/VLCLibraryWindow.h
- modules/gui/macosx/library/VLCLibraryWindow.m


Changes:

=
modules/gui/macosx/UI/VLCLibraryWindow.xib
=
@@ -699,7 +699,6 @@
 
 
 
-
 
 
 
@@ -707,7 +706,8 @@
 
 
 
-
+
+
 
 
 
@@ -733,48 +733,18 @@
 
 
 
-
-
+
+
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
-
+
 
-
+
 
 
 
-
+
 
 
 
@@ -796,24 +766,13 @@
 
 
 
-
-
+
 
-
 
 
-
 
-
-
-
-
-
-
-
-
-
-
+
+
 
 
 


=
modules/gui/macosx/library/VLCLibraryVideoDataSource.h
=
@@ -22,6 +22,11 @@
 
 #import 
 
+typedef NS_ENUM(NSUInteger, VLCVideoLibrarySection) {
+VLCVideoLibraryRecentsSection = 0,
+VLCVideoLibraryLibrarySection,
+};
+
 NS_ASSUME_NONNULL_BEGIN
 
 @class VLCLibraryModel;
@@ -29,7 +34,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface VLCLibraryVideoDataSource : NSObject 
 
 @property (readwrite, assign) VLCLibraryModel *libraryModel;
-@property (readwrite, assign) NSCollectionView *recentMediaCollectionView;
 @property (readwrite, assign) NSCollectionView *libraryMediaCollectionView;
 
 @end


=
modules/gui/macosx/library/VLCLibraryVideoDataSource.m
=
@@ -38,16 +38,19 @@
 if (!_libraryModel) {
 return 0;
 }
-if (collectionView == self.recentMediaCollectionView) {
-return [_libraryModel numberOfRecentMedia];
-}
 
-return [_libraryModel numberOfVideoMedia];
+switch(section) {
+case VLCVideoLibraryRecentsSection:
+return [_libraryModel numberOfRecentMedia];
+case VLCVideoLibraryLibrarySection:
+default:
+return [_libraryModel numberOfVideoMedia];
+}
 }
 
 - (NSInteger)numberOfSectionsInCollectionView:(NSCollectionView 
*)collectionView
 {
-return 1;
+return 2;
 }
 
 - (NSCollectionViewItem *)collectionView:(NSCollectionView *)collectionView
@@ -56,10 +59,14 @@
 VLCLibraryCollectionViewItem *viewItem = [collectionView 
makeItemWithIdentifier:VLCLibraryCellIdentifier forIndexPath:indexPath];
 
 NSArray *mediaArray;
-if (collectionView == self.recentMediaCollectionView) {
-mediaArray = [_libraryModel listOfRecentMedia];
-} else {
-mediaArray = [_libraryModel listOfVideoMedia];
+switch(indexPath.section) {
+case VLCVideoLibraryRecentsSection:
+mediaArray = [_libraryModel listOfRecentMedia];
+break;
+case VLCVideoLibraryLibrarySection:
+default:
+mediaArray = [_libraryModel listOfVideoMedia];
+break;
 }
 
 viewItem.representedItem = mediaAr

[vlc-commits] [Git][videolan/vlc][master] contrib: live555: remove unused patch

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
d882aa87 by Johannes Kauffmann at 2022-07-21T06:16:24+00:00
contrib: live555: remove unused patch

The currently used live555 version already includes this patch. It
hasn't been applied since 8297724513df61423258c75d4b16a609a8a2eb2c.

- - - - -


1 changed file:

- − contrib/src/live555/no-gettimeofday.patch


Changes:

=
contrib/src/live555/no-gettimeofday.patch deleted
=
@@ -1,21 +0,0 @@
 live555/groupsock/GroupsockHelper.cpp.orig 2016-03-31 10:17:46.284928287 
+0200
-+++ live555/groupsock/GroupsockHelper.cpp  2016-03-31 10:20:20.428341877 
+0200
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include 
- #define initializeWinsockIfNecessary() 1
- #endif
- #if defined(__WIN32__) || defined(_WIN32) || defined(_QNX4)
 live555/groupsock/include/GroupsockHelper.hh.orig  2016-03-31 
10:22:56.667834195 +0200
-+++ live555/groupsock/include/GroupsockHelper.hh   2016-03-31 
10:23:37.411710728 +0200
-@@ -133,6 +133,8 @@
- #if (defined(__WIN32__) || defined(_WIN32)) && !defined(__MINGW32__)
- // For Windoze, we need to implement our own gettimeofday()
- extern int gettimeofday(struct timeval*, int*);
-+#else
-+#include 
- #endif
- 
- // The following are implemented in inet.c:



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/d882aa8718586970f3fdb8f9ffefab823ea10682

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 4 commits: qml: fix topbar side spacing

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
60a41e3f by Pierre Lamot at 2022-07-20T15:57:44+02:00
qml: fix topbar side spacing

- - - - -
ee425b86 by Pierre Lamot at 2022-07-20T15:57:44+02:00
qml: fix pined controls label anchors

- - - - -
9092dc36 by Pierre Lamot at 2022-07-20T15:57:44+02:00
qml: improve layouting of the top player planel when safe area is defined

- - - - -
a874382d by Pierre Lamot at 2022-07-20T15:57:44+02:00
qml: move ResumeDialog within the TopBar

This allows to get the same positionning and layouting as the normal TopBar

- - - - -


3 changed files:

- modules/gui/qt/player/qml/Player.qml
- modules/gui/qt/player/qml/ResumeDialog.qml
- modules/gui/qt/player/qml/TopBar.qml


Changes:

=
modules/gui/qt/player/qml/Player.qml
=
@@ -308,75 +308,46 @@ FocusScope {
 top: parent.top
 left: parent.left
 right: parent.right
-topMargin: VLCStyle.applicationVerticalMargin
-leftMargin: VLCStyle.applicationHorizontalMargin
-rightMargin: VLCStyle.applicationHorizontalMargin
 }
 
 z: 1
 edge: Widgets.DrawerExt.Edges.Top
 state: "visible"
 
-component: FocusScope {
-readonly property bool isResumeDialogVisible: resumeDialog.visible
-
-property alias topbar: topbar
+component: TopBar {
+id: topbar
 
 width: topcontrolView.width
 height: topbar.implicitHeight
-focus: true
-
-TopBar {
-id: topbar
-
-anchors.fill: parent
 
-textWidth: (MainCtx.playlistVisible) ? rootPlayer.width - 
playlistpopup.width
- : rootPlayer.width
+topMargin: VLCStyle.applicationVerticalMargin
+sideMargin: VLCStyle.applicationHorizontalMargin
 
-focus: true
-visible: !resumeDialog.visible
-title: mainPlaylistController.currentItem.title
-colors: rootPlayer.colors
+textWidth: (MainCtx.playlistVisible) ? rootPlayer.width - 
playlistpopup.width
+ : rootPlayer.width
 
-pinControls: rootPlayer.pinVideoControls
-showCSD: MainCtx.clientSideDecoration && 
(MainCtx.intfMainWindow.visibility !== Window.FullScreen)
-showToolbar: MainCtx.hasToolbarMenu && 
(MainCtx.intfMainWindow.visibility !== Window.FullScreen)
+focus: true
+title: mainPlaylistController.currentItem.title
+colors: rootPlayer.colors
 
-Navigation.parentItem: rootPlayer
-Navigation.downItem: playlistpopup.showPlaylist ? 
playlistpopup : (audioControls.visible ? audioControls : controlBarView)
+pinControls: rootPlayer.pinVideoControls
+showCSD: MainCtx.clientSideDecoration && 
(MainCtx.intfMainWindow.visibility !== Window.FullScreen)
+showToolbar: MainCtx.hasToolbarMenu && 
(MainCtx.intfMainWindow.visibility !== Window.FullScreen)
 
-onTogglePlaylistVisibility: 
playlistVisibility.togglePlaylistVisibility()
+Navigation.parentItem: rootPlayer
+Navigation.downItem: playlistpopup.showPlaylist ? playlistpopup : 
(audioControls.visible ? audioControls : controlBarView)
 
-onRequestLockUnlockAutoHide: {
-rootPlayer.lockUnlockAutoHide(lock)
-}
+onTogglePlaylistVisibility: 
playlistVisibility.togglePlaylistVisibility()
 
-onBackRequested: {
-if (MainCtx.hasEmbededVideo && !MainCtx.canShowVideoPIP) {
-   mainPlaylistController.stop()
-}
-History.previous()
-}
+onRequestLockUnlockAutoHide: {
+rootPlayer.lockUnlockAutoHide(lock)
 }
 
-ResumeDialog {
-id: resumeDialog
-
-anchors.fill: parent
-colors: rootPlayer.colors
-Navigation.parentItem: rootPlayer
-
-onHidden: {
-if (activeFocus) {
-topbar.focus = true
-controlBarView.forceActiveFocus()
-}
-}
-
-onVisibleChanged: {
-rootPlayer.lockUnlockAutoHide(visible)
+onBackRequested: {
+if (MainCtx.hasEmbededVideo && !MainCtx.canShowVideoPIP) {
+   mainPlaylistController.stop()
 }
+History.previous()
 }
 }
 }
@@ -536,7 +507,6 @@ FocusScope {
 right: parent.right
 bottom: parent.bottom
 
-topMargin: VLCStyle.applicationVerticalMargin

[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: update nettle to 3.7.3

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
a07879c6 by Marvin Scholz at 2022-07-20T13:42:01+00:00
contrib: update nettle to 3.7.3

(cherry picked from commit 263b3cbbf6c9dcb8978f355f5f28080525d6a856)
Signed-off-by: Thomas Guillem 

- - - - -
06ae3cf5 by Jean-Baptiste Kempf at 2022-07-20T13:42:01+00:00
Contribs: udpate GnuTLS to 3.6.16

(cherry picked from commit f133190aedd7d65d4d34534496a15c41115d10a0)
Signed-off-by: Thomas Guillem 

- - - - -


5 changed files:

- contrib/src/gnutls/SHA512SUMS
- contrib/src/gnutls/rules.mak
- contrib/src/nettle/SHA512SUMS
- − contrib/src/nettle/fix-cc-for-build.patch
- contrib/src/nettle/rules.mak


Changes:

=
contrib/src/gnutls/SHA512SUMS
=
@@ -1 +1 @@
-f757d1532198f44bcad7b73856ce6a05bab43f6fb77fcc81c59607f146202f73023d0796d3e1e7471709cf792c8ee7d436e19407e0601bc0bda2f21512b3b01c
  gnutls-3.6.15.tar.xz
+72c78d7fcb024393c1d15f2a1856608ae4460ba43cc54c29b80508cae6cb822df4638029de2363437d110187e0a3cc19a7288c3b2f44b2f648399a028438
  gnutls-3.6.16.tar.xz


=
contrib/src/gnutls/rules.mak
=
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.6.15
+GNUTLS_VERSION := 3.6.16
 GNUTLS_URL := 
https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK


=
contrib/src/nettle/SHA512SUMS
=
@@ -1 +1 @@
-26aefbbe9927e90e28f271e56d2ba876611831222d0e1e1a58bdb75bbd50934fcd84418a4fe47b845f557e60a9786a72a4de2676c930447b104f2256aca7a54f
  nettle-3.4.1.tar.gz
+9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
  nettle-3.7.3.tar.gz


=
contrib/src/nettle/fix-cc-for-build.patch deleted
=
@@ -1,34 +0,0 @@
-From 91df68136ad1562cf9217599254706d8cfa970ea Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adrien=20B=C3=A9raud?= 
-Date: Sun, 20 Sep 2020 19:35:54 +0200
-Subject: [PATCH] m4: follow GMP changes for GMP_PROG_CC_FOR_BUILD
-

- aclocal.m4 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 513b2df4..e81e0351 100644
 a/aclocal.m4
-+++ b/aclocal.m4
-@@ -369,7 +369,7 @@ cat >conftest.c <= 2.7"),)
@@ -20,7 +20,6 @@ $(TARBALLS)/nettle-$(NETTLE_VERSION).tar.gz:
 
 nettle: nettle-$(NETTLE_VERSION).tar.gz .sum-nettle
$(UNPACK)
-   $(APPLY) $(SRC)/nettle/fix-cc-for-build.patch
$(MOVE)
 
 DEPS_nettle = gmp $(DEPS_gmp)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/05445b74a38d045cb28f71f96ccbe882445a031e...06ae3cf5962550e916e694e42a28bdffbe5ac5a0

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] access: live555: Adapt to 2020.12.11+ API changes

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
70fedf25 by Johannes Kauffmann at 2022-07-17T07:50:58+00:00
access: live555: Adapt to 2020.12.11+ API changes

Since live555 2020.12.11, the API has changed. This should fix builds
with the latest version while still allowing contribs to pass.

Ref !1897.
Fixes #25473.

Co-authored-by: Dominic Mayers 
Co-authored-by: Pei Jia 

- - - - -


1 changed file:

- modules/access/live555.cpp


Changes:

=
modules/access/live555.cpp
=
@@ -866,7 +866,13 @@ static int SessionsSetup( demux_t *p_demux )
 if( !p_sys->b_multicast )
 {
 /* We need different rollover behaviour for multicast */
-p_sys->b_multicast = IsMulticastAddress( 
sub->connectionEndpointAddress() );
+#if LIVEMEDIA_LIBRARY_VERSION_INT <= 1607558400 // 2020.12.10
+netAddressBits addr = sub->connectionEndpointAddress();
+#else
+struct sockaddr_storage addr;
+sub->getConnectionEndpointAddress(addr);
+#endif
+p_sys->b_multicast = IsMulticastAddress( addr );
 }
 
 tk = (live_track_t*)malloc( sizeof( live_track_t ) );



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/70fedf2523a3ae5b3c41234f0bf37cd6e57e01a6

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/70fedf2523a3ae5b3c41234f0bf37cd6e57e01a6
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] qml: fix restore index when media is played from play icon

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
5d956e61 by Prince Gupta at 2022-07-16T08:03:49+00:00
qml: fix restore index when media is played from play icon

- - - - -


2 changed files:

- modules/gui/qt/widgets/qml/GridItem.qml
- modules/gui/qt/widgets/qml/MediaCover.qml


Changes:

=
modules/gui/qt/widgets/qml/GridItem.qml
=
@@ -232,7 +232,12 @@ T.Control {
 Layout.preferredWidth: pictureWidth
 Layout.preferredHeight: pictureHeight
 
-onPlayIconClicked: root.playClicked()
+onPlayIconClicked: {
+// emulate a mouse click before delivering the play signal 
as to select the item
+// this helps in updating the selection and restore of 
initial index in the parent views
+root.itemClicked(picture, mouse.button, mouse.modifiers)
+root.playClicked()
+}
 
 DoubleShadow {
 id: unselectedShadow


=
modules/gui/qt/widgets/qml/MediaCover.qml
=
@@ -49,7 +49,7 @@ Rectangle {
 
 // Signals
 
-signal playIconClicked
+signal playIconClicked(var /* MouseEvent */ mouse)
 
 // Settings
 
@@ -86,7 +86,7 @@ Rectangle {
 sourceComponent: Widgets.PlayCover {
 width: playIconSize
 
-onClicked: playIconClicked()
+onClicked: playIconClicked(mouse)
 }
 
 asynchronous: true



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5d956e61a15ce6ce86b6b2d9424c1aeb766cc41a

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/5d956e61a15ce6ce86b6b2d9424c1aeb766cc41a
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: fix base case and provide documentation for feature

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
060f22e2 by Prince Gupta at 2022-07-16T07:45:46+00:00
qml: fix base case and provide documentation for feature

- - - - -
b4c14482 by Prince Gupta at 2022-07-16T07:45:46+00:00
qml: fix context menu in video group view

- - - - -


2 changed files:

- modules/gui/qt/medialibrary/qml/VideoAll.qml
- modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml


Changes:

=
modules/gui/qt/medialibrary/qml/VideoAll.qml
=
@@ -127,6 +127,11 @@ FocusScope {
 ].filter(function(a) { return a !== "" })
 }
 
+// reimplement function to show "Info Panel" in grid view for the model 
index data
+function isInfoExpandPanelAvailable(modelIndexData) {
+return false
+}
+
 // Events
 
 function onAction(indexes) {


=
modules/gui/qt/medialibrary/qml/VideoAllDisplay.qml
=
@@ -105,6 +105,10 @@ Widgets.PageLoader {
 onCurrentIndexChanged: root._updateHistoryGroup(group)
 onParentIdChanged: root._updateHistoryGroup(group)
 onTitleChanged   : root._updateHistoryGroup(group)
+
+function isInfoExpandPanelAvailable(/* modelIndexData */) {
+return true
+}
 }
 }
 }



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/10e0b4d53816549ea834f503e34ec4ea7624890d...b4c144823020a177357884eaebf6d1cb731764b2

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: fix seek handle not accessible with playlistview

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
fb7f6668 by Prince Gupta at 2022-07-08T14:38:53+00:00
qml: fix seek handle not accessible with playlistview

- - - - -
072a7099 by Prince Gupta at 2022-07-08T14:38:53+00:00
qml: allow to hide texts from control bar component

- - - - -
56a87b96 by Prince Gupta at 2022-07-08T14:38:53+00:00
qml: hide texts when they overlap with playlistview

hides right text of control bar when appropriate

- - - - -


2 changed files:

- modules/gui/qt/player/qml/ControlBar.qml
- modules/gui/qt/player/qml/Player.qml


Changes:

=
modules/gui/qt/player/qml/ControlBar.qml
=
@@ -44,6 +44,7 @@ Control {
 property alias identifier: playerControlLayout.identifier
 property alias sliderHeight: trackPositionSlider.barHeight
 property alias sliderBackgroundColor: trackPositionSlider.backgroundColor
+property bool showRightTimeText: true
 
 signal requestLockUnlockAutoHide(bool lock, var source)
 
@@ -68,9 +69,11 @@ Control {
 function _layout() {
 trackPositionSlider.visible = true
 mediaTime.visible = true
-mediaRemainingTime.visible = true
+
+mediaRemainingTime.visible = Qt.binding(function() { return 
root.showRightTimeText && textPosition !== ControlBar.TimeTextPosition.Hide; })
 mediaTime.font.pixelSize = Qt.binding(function() { return 
VLCStyle.fontSize_normal })
 mediaRemainingTime.font.pixelSize = Qt.binding(function() { return 
VLCStyle.fontSize_normal })
+
 row2.Layout.leftMargin = 0
 row2.Layout.rightMargin = 0
 
@@ -79,7 +82,6 @@ Control {
 row1.children = []
 row2.children = [trackPositionSlider]
 mediaTime.visible = false
-mediaRemainingTime.visible = false
 break;
 
 case ControlBar.TimeTextPosition.AboveSlider:


=
modules/gui/qt/player/qml/Player.qml
=
@@ -564,60 +564,6 @@ FocusScope {
 }
 }
 
-Widgets.DrawerExt {
-id: controlBarView
-
-readonly property int sliderY: rootPlayer.pinVideoControls ? 
contentItem.sliderY - VLCStyle.margin_xxxsmall : contentItem.sliderY
-
-anchors {
-bottom: parent.bottom
-left: parent.left
-right: parent.right
-}
-focus: true
-state: "visible"
-edge: Widgets.DrawerExt.Edges.Bottom
-
-onStateChanged: {
-if (state === "visible")
-contentItem.showChapterMarks()
-}
-
-component: MouseArea {
-id: controllerMouseArea
-
-readonly property alias sliderY: controllerId.sliderY
-
-height: controllerId.implicitHeight + 
controllerId.anchors.bottomMargin
-width: controlBarView.width
-hoverEnabled: true
-
-function showChapterMarks() {
-controllerId.showChapterMarks()
-}
-
-onContainsMouseChanged: 
rootPlayer.lockUnlockAutoHide(containsMouse, topcontrolView)
-
-ControlBar {
-id: controllerId
-focus: true
-anchors.fill: parent
-anchors.leftMargin: VLCStyle.applicationHorizontalMargin
-anchors.rightMargin: VLCStyle.applicationHorizontalMargin
-anchors.bottomMargin: VLCStyle.applicationVerticalMargin
-colors: rootPlayer.colors
-textPosition: rootPlayer.pinVideoControls ? 
ControlBar.TimeTextPosition.LeftRightSlider : 
ControlBar.TimeTextPosition.AboveSlider
-Navigation.parentItem: rootPlayer
-Navigation.upItem: playlistpopup.showPlaylist ? playlistpopup 
: (audioControls.visible ? audioControls : topcontrolView)
-
-onRequestLockUnlockAutoHide: 
rootPlayer.lockUnlockAutoHide(lock, source)
-
-identifier: (Player.hasVideoOutput) ? 
PlayerControlbarModel.Videoplayer
-: 
PlayerControlbarModel.Audioplayer
-}
-}
-}
-
 Widgets.DrawerExt {
 id: playlistpopup
 
@@ -685,6 +631,64 @@ FocusScope {
 }
 }
 
+Widgets.DrawerExt {
+id: controlBarView
+
+readonly property int sliderY: rootPlayer.pinVideoControls ? 
contentItem.sliderY - VLCStyle.margin_xxxsmall : contentItem.sliderY
+
+anchors {
+bottom: parent.bottom
+left: parent.left
+right: parent.right
+}
+focus: true
+state: "visible"
+edge: Widgets.DrawerExt.Edges.Bottom
+
+onStateChanged: {
+if (state === "visible")
+contentItem.showChapterMarks()
+}
+
+component: MouseArea {
+id: controllerMouseArea
+
+readonly property alias sliderY: controllerId.sliderY
+
+  

[vlc-commits] [Git][videolan/vlc][master] 3 commits: sout: add `set_pcr` callback

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
240cf3ca by Alaric Senat at 2022-07-07T20:18:50+00:00
sout: add `set_pcr` callback

This is the first step for the `SetPCR` implementation in stream output.
These callbacks will allow stream outputs to have precise information
about the stream time advancement.

This patchset only provides the basis for now, a correct implementation
for all stream filters will come in a separate merge request.

Refs #27050

Co-authored-by: Alexandre Janniaux 

- - - - -
b405dc1e by Alaric Senat at 2022-07-07T20:18:50+00:00
sout: add SetPCR API wrapper

- - - - -
ea8ffe90 by Alaric Senat at 2022-07-07T20:18:50+00:00
es_out: implement PCR forwarding to sout

Now that the input_decoder thread has been disabled for the stream
output case, forwarding PCR events to the stream output is quite
straightforward as everything is now treated synchronously.

Refs !1847 #26870

- - - - -


25 changed files:

- include/vlc_sout.h
- modules/stream_out/autodel.c
- modules/stream_out/bridge.c
- modules/stream_out/chromaprint.c
- modules/stream_out/chromecast/cast.cpp
- modules/stream_out/cycle.c
- modules/stream_out/delay.c
- modules/stream_out/display.c
- modules/stream_out/dlna/dlna.cpp
- modules/stream_out/dummy.c
- modules/stream_out/duplicate.c
- modules/stream_out/es.c
- modules/stream_out/gather.c
- modules/stream_out/mosaic_bridge.c
- modules/stream_out/record.c
- modules/stream_out/rtp.c
- modules/stream_out/setid.c
- modules/stream_out/smem.c
- modules/stream_out/standard.c
- modules/stream_out/stats.c
- modules/stream_out/transcode/transcode.c
- modules/stream_out/udp.c
- src/input/es_out.c
- src/libvlccore.sym
- src/stream_output/stream_output.c


Changes:

=
include/vlc_sout.h
=
@@ -178,6 +178,7 @@ struct sout_stream_operations {
 int (*send)(sout_stream_t *, void *, block_t *);
 int (*control)( sout_stream_t *, int, va_list );
 void (*flush)( sout_stream_t *, void *);
+void (*set_pcr)(sout_stream_t *, vlc_tick_t);
 };
 
 struct sout_stream_t
@@ -200,6 +201,7 @@ VLC_API void *sout_StreamIdAdd(sout_stream_t *s, const 
es_format_t *fmt);
 VLC_API void sout_StreamIdDel(sout_stream_t *s, void *id);
 VLC_API int sout_StreamIdSend( sout_stream_t *s, void *id, block_t *b);
 VLC_API void sout_StreamFlush(sout_stream_t *s, void *id);
+VLC_API void sout_StreamSetPCR(sout_stream_t *s, vlc_tick_t pcr);
 VLC_API int sout_StreamControlVa(sout_stream_t *s, int i_query, va_list args);
 
 static inline int sout_StreamControl( sout_stream_t *s, int i_query, ... )


=
modules/stream_out/autodel.c
=
@@ -113,7 +113,7 @@ static int Send( sout_stream_t *p_stream, void *_p_es, 
block_t *p_buffer )
 }
 
 static const struct sout_stream_operations ops = {
-Add, Del, Send, NULL, NULL,
+Add, Del, Send, NULL, NULL, NULL,
 };
 
 static int Open( vlc_object_t *p_this )


=
modules/stream_out/bridge.c
=
@@ -302,7 +302,7 @@ static int ControlCommon(sout_stream_t *stream, int query, 
va_list args)
 }
 
 static const struct sout_stream_operations ops_out = {
-AddOut, DelOut, SendOut, ControlCommon, NULL,
+AddOut, DelOut, SendOut, ControlCommon, NULL, NULL,
 };
 
 /*
@@ -628,7 +628,7 @@ static int SendIn( sout_stream_t *p_stream, void *_id, 
block_t *p_buffer )
 }
 
 static const struct sout_stream_operations ops_in = {
-AddIn, DelIn, SendIn, ControlCommon, NULL,
+AddIn, DelIn, SendIn, ControlCommon, NULL, NULL,
 };
 
 /*


=
modules/stream_out/chromaprint.c
=
@@ -88,7 +88,7 @@ struct sout_stream_id_sys_t
 #define BYTESPERSAMPLE 2
 
 static const struct sout_stream_operations ops = {
-Add, Del, Send, NULL, NULL,
+Add, Del, Send, NULL, NULL, NULL,
 };
 
 /*


=
modules/stream_out/chromecast/cast.cpp
=
@@ -313,7 +313,7 @@ static void ProxyFlush(sout_stream_t *p_stream, void *id)
 }
 
 static const struct sout_stream_operations proxy_ops = {
-ProxyAdd, ProxyDel, ProxySend, NULL, ProxyFlush,
+ProxyAdd, ProxyDel, ProxySend, nullptr, ProxyFlush, nullptr,
 };
 
 static int ProxyOpen(vlc_object_t *p_this)
@@ -1223,7 +1223,7 @@ static void on_input_event_cb(void *data, enum 
cc_input_event event, union cc_in
 }
 
 static const struct sout_stream_operations ops = {
-Add, Del, Send, NULL, Flush,
+Add, Del, Send, nullptr, Flush, nullptr
 };
 
 /*


==

[vlc-commits] [Git][videolan/vlc][master] macosx: Unify looping over mediaItems

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
4d9fdbbf by Claudio Cambra at 2022-07-07T20:14:19+00:00
macosx: Unify looping over mediaItems

- - - - -


5 changed files:

- modules/gui/macosx/library/VLCLibraryCollectionViewAlbumItem.m
- modules/gui/macosx/library/VLCLibraryCollectionViewArtistItem.m
- modules/gui/macosx/library/VLCLibraryDataTypes.h
- modules/gui/macosx/library/VLCLibraryDataTypes.m
- modules/gui/macosx/library/VLCLibraryMenuController.m


Changes:

=
modules/gui/macosx/library/VLCLibraryCollectionViewAlbumItem.m
=
@@ -198,14 +198,14 @@ NSString *VLCLibraryAlbumCellIdentifier = 
@"VLCLibraryAlbumCellIdentifier";
 
 // We want to add all the tracks to the playlist but only play the first 
one immediately,
 // otherwise we will skip straight to the last track of the album
-BOOL playImmediately = YES;
-for(VLCMediaLibraryMediaItem* mediaItem in 
_representedAlbum.tracksAsMediaItems) {
+__block BOOL playImmediately = YES;
+[_representedAlbum iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem* 
mediaItem) {
 [_libraryController appendItemToPlaylist:mediaItem 
playImmediately:playImmediately];
 
 if(playImmediately) {
 playImmediately = NO;
 }
-}
+}];
 }
 
 - (IBAction)addToPlaylist:(id)sender
@@ -214,9 +214,9 @@ NSString *VLCLibraryAlbumCellIdentifier = 
@"VLCLibraryAlbumCellIdentifier";
 _libraryController = [[VLCMain sharedInstance] libraryController];
 }
 
-for(VLCMediaLibraryMediaItem* mediaItem in 
_representedAlbum.tracksAsMediaItems) {
+[_representedAlbum iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem* 
mediaItem) {
 [_libraryController appendItemToPlaylist:mediaItem playImmediately:NO];
-}
+}];
 }
 
 -(void)mouseDown:(NSEvent *)theEvent


=
modules/gui/macosx/library/VLCLibraryCollectionViewArtistItem.m
=
@@ -211,16 +211,14 @@ NSString *VLCLibraryArtistCellIdentifier = 
@"VLCLibraryArtistCellIdentifier";
 
 // We want to add all the tracks to the playlist but only play the first 
one immediately,
 // otherwise we will skip straight to the last track of the last album 
from the artist
-BOOL playImmediately = YES;
-for(VLCMediaLibraryAlbum* album in _representedArtist.albums) {
-for(VLCMediaLibraryMediaItem* mediaItem in album.tracksAsMediaItems) {
-[_libraryController appendItemToPlaylist:mediaItem 
playImmediately:playImmediately];
-
-if(playImmediately) {
-playImmediately = NO;
-}
+__block BOOL playImmediately = YES;
+[_representedArtist iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem* 
mediaItem) {
+[_libraryController appendItemToPlaylist:mediaItem 
playImmediately:playImmediately];
+
+if(playImmediately) {
+playImmediately = NO;
 }
-}
+}];
 }
 
 - (IBAction)addToPlaylist:(id)sender
@@ -229,11 +227,9 @@ NSString *VLCLibraryArtistCellIdentifier = 
@"VLCLibraryArtistCellIdentifier";
 _libraryController = [[VLCMain sharedInstance] libraryController];
 }
 
-for(VLCMediaLibraryAlbum* album in _representedArtist.albums) {
-for(VLCMediaLibraryMediaItem* mediaItem in album.tracksAsMediaItems) {
-[_libraryController appendItemToPlaylist:mediaItem 
playImmediately:NO];
-}
-}
+[_representedArtist iterateMediaItemsWithBlock:^(VLCMediaLibraryMediaItem* 
mediaItem) {
+[_libraryController appendItemToPlaylist:mediaItem playImmediately:NO];
+}];
 }
 
 -(void)mouseDown:(NSEvent *)theEvent


=
modules/gui/macosx/library/VLCLibraryDataTypes.h
=
@@ -99,6 +99,7 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 
 + (nullable instancetype)artistWithID:(int64_t)artistID;
 - (instancetype)initWithArtist:(struct vlc_ml_artist_t *)p_artist;
+- (void)iterateMediaItemsWithBlock:(void 
(^)(VLCMediaLibraryMediaItem*))mediaItemBlock;
 
 @property (readonly) int64_t artistID;
 @property (readonly) NSString *name;
@@ -114,6 +115,7 @@ extern const long long int 
VLCMediaLibraryMediaItemDurationDenominator;
 @interface VLCMediaLibraryAlbum : NSObject
 
 - (instancetype)initWithAlbum:(struct vlc_ml_album_t *)p_album;
+- (void)iterateMediaItemsWithBlock:(void 
(^)(VLCMediaLibraryMediaItem*))mediaItemBlock;
 
 @property (readonly) int64_t albumID;
 @property (readonly) NSString *title;


=
modules/gui/macosx/library/VLCLibraryDataTypes.m
=
@@ -233,6 +233,14 @@ NSString *VLCMediaLibraryMediaItemLibraryID = 
@"VLCMediaLibraryMediaItemLibraryI
 return [mutableArray copy];
 }
 
+- (void)iterateMediaItemsWithBlock:(void 
(^)(VLCMediaLibraryMediaItem*))mediaItemBlock;
+{
+for

[vlc-commits] [Git][videolan/vlc][master] 6 commits: interrupt: reorder code

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
ce812ef9 by Rémi Denis-Courmont at 2022-07-03T21:35:07+03:00
interrupt: reorder code

No function changes.

- - - - -
bbf9a6f2 by Rémi Denis-Courmont at 2022-07-03T21:35:07+03:00
interrupt: factor common polling code

- - - - -
2a41077d by Rémi Denis-Courmont at 2022-07-04T12:40:51+03:00
interrupt: prepare to merge identical functions

No functional changes as vlc_poll_file() always returns 1 and has no
side effects.

- - - - -
66bf0d69 by Rémi Denis-Courmont at 2022-07-04T12:43:09+03:00
interrupt: merge identical implementations

No functional changes.

- - - - -
976de0bc by Rémi Denis-Courmont at 2022-07-04T12:51:55+03:00
interrupt: use vlc_writev()

Fixes #27115.

- - - - -
2fdb6af0 by Rémi Denis-Courmont at 2022-07-04T12:52:09+03:00
win32: implement vlc_{recv,send}msg_i11e()

- - - - -


1 changed file:

- src/misc/interrupt.c


Changes:

=
src/misc/interrupt.c
=
@@ -279,6 +279,12 @@ int vlc_interrupt_forward_stop(void *const data[2])
 }
 
 #ifndef _WIN32
+# include 
+# include 
+# ifdef HAVE_SYS_SOCKET_H
+#  include 
+# endif
+
 static void vlc_poll_i11e_wake(void *opaque)
 {
 uint64_t value = 1;
@@ -392,12 +398,89 @@ int vlc_poll_i11e(struct pollfd *fds, unsigned nfds, int 
timeout)
 return ret;
 }
 
-# include 
-# include 
-# ifdef HAVE_SYS_SOCKET_H
-#  include 
-# endif
+static int vlc_poll_file(int fd, unsigned int mask)
+{
+struct pollfd ufd;
+
+ufd.fd = fd;
+ufd.events = mask;
+return vlc_poll_i11e(&ufd, 1, -1);
+}
+
+static int vlc_poll_sock(int sock, unsigned int mask)
+{
+return vlc_poll_file(sock, mask);
+}
+
+#else /* !_WIN32 */
+static void CALLBACK vlc_poll_i11e_wake_self(ULONG_PTR data)
+{
+(void) data; /* Nothing to do */
+}
+
+static void vlc_poll_i11e_wake(void *opaque)
+{
+HANDLE th = opaque;
+QueueUserAPC(vlc_poll_i11e_wake_self, th, 0);
+}
+
+static void vlc_poll_i11e_cleanup(void *opaque)
+{
+vlc_interrupt_t *ctx = opaque;
+HANDLE th = ctx->data;
+
+vlc_interrupt_finish(ctx);
+CloseHandle(th);
+}
+
+int vlc_poll_i11e(struct pollfd *fds, unsigned nfds, int timeout)
+{
+vlc_interrupt_t *ctx = vlc_interrupt_var;
+if (ctx == NULL)
+return vlc_poll(fds, nfds, timeout);
+
+int ret = -1;
+HANDLE th;
+
+if (!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(),
+ GetCurrentProcess(), &th, 0, FALSE,
+ DUPLICATE_SAME_ACCESS))
+{
+errno = ENOMEM;
+return -1;
+}
+
+vlc_interrupt_prepare(ctx, vlc_poll_i11e_wake, th);
+
+vlc_cleanup_push(vlc_poll_i11e_cleanup, ctx);
+ret = vlc_poll(fds, nfds, timeout);
+vlc_cleanup_pop();
+
+if (vlc_interrupt_finish(ctx))
+{
+errno = EINTR;
+ret = -1;
+}
 
+CloseHandle(th);
+return ret;
+}
+
+static int vlc_poll_file(int fd, unsigned int mask)
+{
+(void) fd; (void) mask;
+return 1;
+}
+
+static int vlc_poll_sock(int sock, unsigned int mask)
+{
+struct pollfd ufd;
+
+ufd.fd = sock;
+ufd.events = mask;
+return vlc_poll_i11e(&ufd, 1, -1);
+}
+#endif /* _WIN32 */
 
 /* There are currently no ways to atomically force a non-blocking read or write
  * operations. Even for sockets, the MSG_DONTWAIT flag is non-standard.
@@ -413,12 +496,7 @@ int vlc_poll_i11e(struct pollfd *fds, unsigned nfds, int 
timeout)
  */
 ssize_t vlc_readv_i11e(int fd, struct iovec *iov, int count)
 {
-struct pollfd ufd;
-
-ufd.fd = fd;
-ufd.events = POLLIN;
-
-if (vlc_poll_i11e(&ufd, 1, -1) < 0)
+if (vlc_poll_file(fd, POLLIN) < 0)
 return -1;
 return readv(fd, iov, count);
 }
@@ -432,16 +510,10 @@ ssize_t vlc_readv_i11e(int fd, struct iovec *iov, int 
count)
  */
 ssize_t vlc_writev_i11e(int fd, const struct iovec *iov, int count)
 {
-struct pollfd ufd;
-
-ufd.fd = fd;
-ufd.events = POLLOUT;
-
-if (vlc_poll_i11e(&ufd, 1, -1) < 0)
+if (vlc_poll_file(fd, POLLOUT) < 0)
 return -1;
-return writev(fd, iov, count);
+return vlc_writev(fd, iov, count);
 }
-#endif
 
 /**
  * Wrapper for read() that returns the EINTR error upon VLC I/O interruption.
@@ -466,21 +538,16 @@ ssize_t vlc_write_i11e(int fd, const void *buf, size_t 
count)
 return vlc_writev_i11e(fd, &iov, 1);
 }
 
-#ifndef _WIN32
 ssize_t vlc_recvmsg_i11e(int fd, struct msghdr *msg, int flags)
 {
-struct pollfd ufd;
-
-ufd.fd = fd;
-ufd.events = POLLIN;
-
-if (vlc_poll_i11e(&ufd, 1, -1) < 0)
+if (vlc_poll_sock(fd, POLLIN) < 0)
 return -1;
 /* NOTE: MSG_OOB and MSG_PEEK should work fine here.
  * MSG_WAITALL is not supported at this point. */
 return recvmsg(fd, msg, flags);
 }
 
+#ifndef _WIN32
 ssize_t vlc_recvfrom_i11e(int fd, void *buf, size_t len, int flags,
 struct sockaddr *addr, socklen_t *addrlen)
 {
@@ -497,20 +564,17 @@ ssize

[vlc-commits] [Git][videolan/vlc][master] macosx: Play artists' songs correctly from the collection view

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
95bf8ade by Claudio Cambra at 2022-06-30T18:28:58+00:00
macosx: Play artists' songs correctly from the collection view

Signed-off-by: Claudio Cambra 

- - - - -


9 changed files:

- modules/gui/macosx/Makefile.am
- + modules/gui/macosx/UI/VLCLibraryCollectionViewArtistItem.xib
- modules/gui/macosx/library/VLCLibraryAudioDataSource.m
- + modules/gui/macosx/library/VLCLibraryCollectionViewArtistItem.h
- + modules/gui/macosx/library/VLCLibraryCollectionViewArtistItem.m
- modules/gui/macosx/library/VLCLibraryDataTypes.h
- modules/gui/macosx/library/VLCLibraryDataTypes.m
- modules/gui/macosx/library/VLCLibraryMenuController.h
- modules/gui/macosx/library/VLCLibraryMenuController.m


Changes:

=
modules/gui/macosx/Makefile.am
=
@@ -62,6 +62,8 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/library/VLCLibraryCollectionViewItem.m \
gui/macosx/library/VLCLibraryCollectionViewAlbumItem.h \
gui/macosx/library/VLCLibraryCollectionViewAlbumItem.m \
+   gui/macosx/library/VLCLibraryCollectionViewArtistItem.h \
+   gui/macosx/library/VLCLibraryCollectionViewArtistItem.m \
gui/macosx/library/VLCLibraryCollectionViewItemProtocol.h \
gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.h \
gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.m \
@@ -299,6 +301,7 @@ libmacosx_plugin_la_XIB_SOURCES = \
gui/macosx/UI/VLCPlaylistTableCellView.xib \
gui/macosx/UI/VLCLibraryCollectionViewItem.xib \
gui/macosx/UI/VLCLibraryCollectionViewAlbumItem.xib \
+   gui/macosx/UI/VLCLibraryCollectionViewArtistItem.xib \
gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib \
gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib \
gui/macosx/UI/VLCInformationWindow.xib \


=
modules/gui/macosx/UI/VLCLibraryCollectionViewArtistItem.xib
=
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


=
modules/gui/macosx/library/VLCLibraryAudioDataSource.m
=
@@ -31,6 +31,7 @@
 #import "library/VLCLibraryAlbumTableCellView.h"
 #import "library/VLCLibraryCollectionViewItem.h"
 #import "library/VLCLibraryCollectionViewAlbumItem.h"
+#import "libra

[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: qt: remove write-only field

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
8924d194 by Rémi Denis-Courmont at 2022-06-24T20:03:50+00:00
qt: remove write-only field

- - - - -
958be95e by Rémi Denis-Courmont at 2022-06-24T20:03:50+00:00
qt: add flag to orphan the video

The video widget is normally released when the window provider is
closed. But it can also be released when the main UI is closed, even
though the window provider is still active.

- - - - -
327a9cf0 by Rémi Denis-Courmont at 2022-06-24T20:03:50+00:00
qt: do not normally reparent the video

When the video window is closed normally, there are no needs to
reparent it. In this case, we can retain the pre-3.0.13 behaviour
whence we simply close the video window as a children of the Qt UI.

This fixes a transient visual glitch when stopping playback or
disabling the video track. This also saves one full round-trip through
the X server at that time as XSync().

- - - - -


5 changed files:

- modules/gui/qt/components/interface_widgets.cpp
- modules/gui/qt/components/interface_widgets.hpp
- modules/gui/qt/main_interface.cpp
- modules/gui/qt/main_interface.hpp
- modules/gui/qt/qt.cpp


Changes:

=
modules/gui/qt/components/interface_widgets.cpp
=
@@ -231,7 +231,7 @@ QSize VideoWidget::physicalSize() const
 }
 
 void WindowResized(vout_window_t *, const QSize&);
-void WindowReleased(vout_window_t *);
+void WindowOrphaned(vout_window_t *);
 
 void VideoWidget::reportSize()
 {
@@ -402,13 +402,14 @@ void VideoWidget::mouseDoubleClickEvent( QMouseEvent 
*event )
 }
 
 
-void VideoWidget::release( void )
+void VideoWidget::release( bool forced )
 {
-msg_Dbg( p_intf, "Video is not needed anymore" );
+msg_Dbg( p_intf, "video widget is %s", forced ? "orphaned" : "released" );
 
 if( stable )
 {
-WindowReleased(p_window);
+if( forced )
+WindowOrphaned(p_window);
 layout->removeWidget( stable );
 stable->deleteLater();
 stable = NULL;


=
modules/gui/qt/components/interface_widgets.hpp
=
@@ -60,7 +60,7 @@ public:
 virtual ~VideoWidget();
 
 bool request( struct vout_window_t * );
-void release( void );
+void release( bool forced );
 void sync( void );
 
 protected:


=
modules/gui/qt/main_interface.cpp
=
@@ -205,8 +205,8 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : 
QVLCMW( _p_intf )
 connect( this, SIGNAL(askGetVideo(struct vout_window_t*, unsigned, 
unsigned, bool, bool*)),
  this, SLOT(getVideoSlot(struct vout_window_t*, unsigned, 
unsigned, bool, bool*)),
  Qt::BlockingQueuedConnection );
-connect( this, SIGNAL(askReleaseVideo( void )),
- this, SLOT(releaseVideoSlot( void )),
+connect( this, SIGNAL(askReleaseVideo( bool )),
+ this, SLOT(releaseVideoSlot( bool )),
  Qt::BlockingQueuedConnection );
 CONNECT( this, askVideoOnTop(bool), this, setVideoOnTop(bool));
 
@@ -274,7 +274,7 @@ MainInterface::~MainInterface()
 showTab( bgWidget );
 
 if( videoWidget )
-releaseVideoSlot();
+releaseVideoSlot(true);
 
 /* Be sure to kill the actionsManager... Only used in the MI and control */
 ActionsManager::killInstance();
@@ -771,17 +771,17 @@ void MainInterface::getVideoSlot( struct vout_window_t 
*p_wnd,
 /* Asynchronous call from the WindowClose function */
 void MainInterface::releaseVideo( void )
 {
-emit askReleaseVideo();
+emit askReleaseVideo(false);
 }
 
 /* Function that is CONNECTED to the previous emit */
-void MainInterface::releaseVideoSlot( void )
+void MainInterface::releaseVideoSlot( bool forced )
 {
 /* This function is called when the embedded video window is destroyed,
  * or in the rare case that the embedded window is still here but the
  * Qt interface exits. */
 assert( videoWidget );
-videoWidget->release();
+videoWidget->release( forced );
 setVideoOnTop( false );
 setVideoFullScreen( false );
 hideResumePanel();
@@ -1674,7 +1674,7 @@ void MainInterface::closeEvent( QCloseEvent *e )
 if ( b_minimalView )
 setMinimalView( false );
 if( videoWidget )
-releaseVideoSlot();
+releaseVideoSlot( true );
 emit askToQuit(); /* ask THEDP to quit, so we have a unique method */
 /* Accept session quit. Otherwise we break the desktop mamager. */
 e->accept();


=
modules/gui/qt/main_interface.hpp
=
@@ -217,7 +217,7 @@ public slots:
 /* Manage the Video Functions from the vout threads */
 void getVideoSlot( struct vout_window_t *,
unsigned i_width, unsigned i_height, bool, bool * );
-void releaseVideoSlot( void );
+void releaseVideoSlot( b

[vlc-commits] [Git][videolan/vlc][master] 2 commits: picture: fix reference counting with picture_AttachNewAncillary

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
36c456f7 by Alexandre Janniaux at 2022-06-22T17:57:16+00:00
picture: fix reference counting with picture_AttachNewAncillary

Attaching an ancillary will increment the reference count for it, so it
needs to be decreased afterwards.

Fixes #27080

- - - - -
a753099c by Alexandre Janniaux at 2022-06-22T17:57:16+00:00
test: ancillary: test picture_AttachNewAncillary

- - - - -


2 changed files:

- src/misc/picture.c
- test/src/misc/ancillary.c


Changes:

=
src/misc/picture.c
=
@@ -497,6 +497,8 @@ picture_AttachNewAncillary(picture_t *pic, vlc_ancillary_id 
id, size_t size)
 return NULL;
 }
 
+vlc_ancillary_Release(ancillary);
+
 return data;
 }
 


=
test/src/misc/ancillary.c
=
@@ -90,6 +90,11 @@ int main( void )
 assert(ancillary);
 picture_AttachAncillary(picture, ancillary);
 
+const char test3[] = "test3";
+void *data = picture_AttachNewAncillary(picture, 
VLC_ANCILLARY_ID('t','s','t','3'), sizeof(test3));
+assert(data);
+strcpy(data, test3);
+
 vlc_frame_Release(frame);
 
 /* Check that ancillaries are copied via a picture_Clone(). */
@@ -112,6 +117,10 @@ int main( void )
 assert(ancillary);
 assert(strcmp("test2", vlc_ancillary_GetData(ancillary)) == 0);
 
+ancillary = picture_GetAncillary(copy, VLC_ANCILLARY_ID('t','s','t','3'));
+assert(ancillary);
+assert(strcmp("test3", vlc_ancillary_GetData(ancillary)) == 0);
+
 picture_Release(copy);
 
 return 0;



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/compare/090b5ee9d29cbb55fd9d4d4e34c8bc33b1513d7c...a753099cec0c6f12a48d3a0821f17937c27d8228

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


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][master] doc: libvlc: add the CMakeLists.txt to the tarball

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
090b5ee9 by Steve Lhomme at 2022-06-22T16:51:24+00:00
doc: libvlc: add the CMakeLists.txt to the tarball

- - - - -


1 changed file:

- doc/Makefile.am


Changes:

=
doc/Makefile.am
=
@@ -16,6 +16,7 @@ LIBVLC_SAMPLES = \
libvlc/d3d11_player.cpp \
libvlc/d3d9_player.c \
libvlc/win_player.c \
+   libvlc/CMakeLists.txt \
$(NULL)
 
 nobase_doc_DATA = $(LIBVLC_SAMPLES)



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/090b5ee9d29cbb55fd9d4d4e34c8bc33b1513d7c

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/090b5ee9d29cbb55fd9d4d4e34c8bc33b1513d7c
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] [Git][videolan/vlc][3.0.x] 9 commits: dsm: forward the vlc_interrupt_unregister() return value

[@Courmisch]

Rémi Denis-Courmont pushed to branch 3.0.x at VideoLAN / VLC


Commits:
e85012d0 by Thomas Guillem at 2022-06-22T07:41:38+00:00
dsm: forward the vlc_interrupt_unregister() return value

(cherry picked from commit 26af61217bf0d8cd85aa811a98ec403a0951a29c)
Signed-off-by: Thomas Guillem 

- - - - -
f026d55f by Thomas Guillem at 2022-06-22T07:41:38+00:00
dsm: handle missing smb_session interruptions

(cherry picked from commit bdc351dfe5df180dcacda06e54527f9c8d04226d)
Signed-off-by: Thomas Guillem 

- - - - -
0a912764 by Thomas Guillem at 2022-06-22T07:41:38+00:00
dsm: abort if netbios_ns_inverse is interrupted

(cherry picked from commit 30eb1b27cde532d8c9ab6dee2f4cc6cdd1cdcf41)
Signed-off-by: Thomas Guillem 

- - - - -
6136d0e5 by Thomas Guillem at 2022-06-22T07:41:38+00:00
contrib: libdsm: update to 0.4.3

Fix connect() not interruptible on Linux.

Fixes #27027

(cherry picked from commit 7ea6ce343341a4170234364f80987bbd7f64d005)
Signed-off-by: Thomas Guillem 

- - - - -
f7ff0361 by Thomas Guillem at 2022-06-22T07:41:38+00:00
smb2: vlc_smb2_resolve: return an error code

(cherry picked from commit cbf16982cfa4457bd2f319e5d399e0455c512a16)
Signed-off-by: Thomas Guillem 

- - - - -
a2d42008 by Thomas Guillem at 2022-06-22T07:41:38+00:00
smb2: forward the vlc_interrupt_unregister() return value

(cherry picked from commit 99a4deaf06ae57383fc887ec976f1e510aef6978)
Signed-off-by: Thomas Guillem 

- - - - -
9c3dacd9 by Thomas Guillem at 2022-06-22T07:41:38+00:00
smb2: vlc_smb2_resolve: return -EINTR when interrupted

(cherry picked from commit bb33734cdf2a0f1f5ea19e42b6596208395ea1f3)
Signed-off-by: Thomas Guillem 

- - - - -
20374d30 by Thomas Guillem at 2022-06-22T07:41:38+00:00
smb2: handle vlc_smb2_resolve interruption

(cherry picked from commit fea7a18a91cee9edaf629589980bff5ea0192573)
Signed-off-by: Thomas Guillem 

- - - - -
68e5d977 by Thomas Guillem at 2022-06-22T07:41:38+00:00
smb2: explicitly handle -EINTR

Even if it is redundant with vlc_killed() (but not all APIs return
-EINTR when killed).

(cherry picked from commit 797e1f3b979fca463030608db1513a81228c624c)
Signed-off-by: Thomas Guillem 

- - - - -


4 changed files:

- contrib/src/libdsm/SHA512SUMS
- contrib/src/libdsm/rules.mak
- modules/access/dsm/access.c
- modules/access/smb2.c


Changes:

=
contrib/src/libdsm/SHA512SUMS
=
@@ -1 +1 @@
-9ee82c8812a807054ebe3ceb2a6ba37c36d188052cfbd7f5ba5b435ede8f6bee09690fb0d0c94e1e4d0022bbbdfa2837f09c69ccc00d17f79efe002cc158825a
  libdsm-0.4.2.tar.xz
+4abe2318aa5d63397404ce87fc42be30d364dffef3bdf6e081a2bb3ac4f011f39fa8acb5ba06361e94795a308df321b077e7a3cf2ec10d5e1e6c9b912cbbd8ba
  libdsm-0.4.3.tar.xz


=
contrib/src/libdsm/rules.mak
=
@@ -1,6 +1,6 @@
 # libdsm
 
-LIBDSM_VERSION := 0.4.2
+LIBDSM_VERSION := 0.4.3
 LIBDSM_URL := 
https://github.com/videolabs/libdsm/releases/download/v$(LIBDSM_VERSION)/libdsm-$(LIBDSM_VERSION).tar.xz
 
 ifeq ($(call need_pkg,"libdsm >= 0.2.0"),)


=
modules/access/dsm/access.c
=
@@ -149,10 +149,10 @@ smb_session_interrupt_register( access_sys_t *sys )
 vlc_interrupt_register( smb_session_interrupt_callback, sys->p_session );
 }
 
-static inline void
+static inline int
 smb_session_interrupt_unregister( void )
 {
-vlc_interrupt_unregister();
+return vlc_interrupt_unregister();
 }
 
 static void
@@ -167,18 +167,37 @@ netbios_ns_interrupt_register( netbios_ns *ns )
 vlc_interrupt_register( netbios_ns_interrupt_callback, ns );
 }
 
-static inline void
+static inline int
 netbios_ns_interrupt_unregister( void )
 {
-vlc_interrupt_unregister();
+return vlc_interrupt_unregister();
 }
 
 #else
 
-#define smb_session_interrupt_register( sys ) do {} while (0)
-#define smb_session_interrupt_unregister() do {} while(0)
-#define netbios_ns_interrupt_register( ns ) do {} while (0)
-#define netbios_ns_interrupt_unregister() do {} while (0)
+static inline void
+smb_session_interrupt_register( access_sys_t *sys )
+{
+(void) sys;
+}
+
+static inline int
+smb_session_interrupt_unregister( void )
+{
+return 0;
+}
+
+static inline void
+netbios_ns_interrupt_register( netbios_ns *ns )
+{
+(void) ns;
+}
+
+static inline int
+netbios_ns_interrupt_unregister( void )
+{
+return 0;
+}
 
 #endif
 
@@ -239,11 +258,13 @@ static int Open( vlc_object_t *p_this )
 if( smb_stat_get( st, SMB_STAT_ISDIR ) )
 {
 smb_fclose( p_sys->p_session, p_sys->i_fd );
-smb_session_interrupt_unregister();
+if (smb_session_interrupt_unregister() == EINTR)
+goto error;
 return BrowserInit( p_access );
 }
 
-smb_session_interrupt_unregister();
+if (smb_session_interrupt_unreg

[vlc-commits] [Git][videolan/vlc][master] macosx: Play albums works correctly from the collection view

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
73a248c0 by Claudio Cambra at 2022-06-21T15:20:03+00:00
macosx: Play albums works correctly from the collection view

Signed-off-by: Claudio Cambra 

- - - - -


10 changed files:

- modules/gui/macosx/Makefile.am
- + modules/gui/macosx/UI/VLCLibraryCollectionViewAlbumItem.xib
- modules/gui/macosx/library/VLCLibraryAudioDataSource.m
- + modules/gui/macosx/library/VLCLibraryCollectionViewAlbumItem.h
- + modules/gui/macosx/library/VLCLibraryCollectionViewAlbumItem.m
- modules/gui/macosx/library/VLCLibraryCollectionViewItem.h
- modules/gui/macosx/library/VLCLibraryCollectionViewItem.m
- + modules/gui/macosx/library/VLCLibraryCollectionViewItemProtocol.h
- modules/gui/macosx/library/VLCLibraryMenuController.h
- modules/gui/macosx/library/VLCLibraryMenuController.m


Changes:

=
modules/gui/macosx/Makefile.am
=
@@ -60,6 +60,9 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/library/VLCLibraryAudioDataSource.m \
gui/macosx/library/VLCLibraryCollectionViewItem.h \
gui/macosx/library/VLCLibraryCollectionViewItem.m \
+   gui/macosx/library/VLCLibraryCollectionViewAlbumItem.h \
+   gui/macosx/library/VLCLibraryCollectionViewAlbumItem.m \
+   gui/macosx/library/VLCLibraryCollectionViewItemProtocol.h \
gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.h \
gui/macosx/library/VLCLibraryCollectionViewSupplementaryElementView.m \
gui/macosx/library/VLCLibraryController.h \
@@ -293,6 +296,7 @@ libmacosx_plugin_la_XIB_SOURCES = \
gui/macosx/UI/VLCLibraryTableCellView.xib \
gui/macosx/UI/VLCPlaylistTableCellView.xib \
gui/macosx/UI/VLCLibraryCollectionViewItem.xib \
+   gui/macosx/UI/VLCLibraryCollectionViewAlbumItem.xib \
gui/macosx/UI/VLCMediaSourceCollectionViewItem.xib \
gui/macosx/UI/VLCMediaSourceDeviceCollectionViewItem.xib \
gui/macosx/UI/VLCInformationWindow.xib \


=
modules/gui/macosx/UI/VLCLibraryCollectionViewAlbumItem.xib
=
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+


=
modules/gui/macosx/library/VLCLibraryAudioDataSource.m
=
@@ -30,6 +30,7 @@
 #import "library/VLCLibraryTableCellView.h"
 #import "librar

[vlc-commits] [Git][videolan/vlc][master] rtp: raw: fix use-after-free

[@Courmisch]

Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
138b4676 by Alexandre Janniaux at 2022-06-21T14:32:21+00:00
rtp: raw: fix use-after-free

- - - - -


1 changed file:

- modules/access/rtp/raw.c


Changes:

=
modules/access/rtp/raw.c
=
@@ -158,8 +158,8 @@ static int rtp_raw_open(vlc_object_t *obj, struct 
vlc_rtp_pt *pt,
  || vlc_sdp_fmtp_get(desc, "width", &sys->width)
  || vlc_sdp_fmtp_get(desc, "height", &sys->height)
  || vlc_sdp_fmtp_get(desc, "depth", &sys->depth)) {
+vlc_error(obj->logger, "missing parameters for raw video");
 free(sys);
-vlc_error(sys->log, "missing parameters for raw video");
 return VLC_EINVAL;
 }
 



View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/138b46764c8679687c0d62cd0c82d9dde0a4f226

-- 
View it on GitLab: 
https://code.videolan.org/videolan/vlc/-/commit/138b46764c8679687c0d62cd0c82d9dde0a4f226
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits