@@ -37,8 +37,6 @@

 Source1:        %name.changes

 Source3:        %name-rpmlintrc

 Patch0:         vlc-beta.patch

-Patch1:         vlc.a52dec.patch

-Patch2:         vlc.hostname.patch

 %ifarch x86_64 aarch64

 Requires:       libqtquickcontrols2plugin.so()(64bit)

@@ -171,10 +169,8 @@

 BuildRequires:  pkgconfig(libswscale) >= 5

 BuildRequires:  pkgconfig(libpostproc) >= 55

 BuildRequires:  pkgconfig(faad2)

-%if 0%{?suse_version} > 1500

 BuildRequires:  pkgconfig(rav1e)

-%endif

-BuildRequires:  pkgconfig(dav1d) >= 0.5.0

+BuildRequires:  pkgconfig(dav1d) >= 1.0.0

 BuildRequires:  pkgconfig(vpx) >= 1.5.0

 BuildRequires:  pkgconfig(twolame)

 %if %{with fdk_aac}

@@ -408,11 +404,8 @@

    --enable-postproc \

    --enable-faad \

    --disable-aom \

-%if 0%{?suse_version} > 1500

    --enable-rav1e \

-%endif

    --enable-dav1d \

-   --disable-vpx \

    --enable-vpx \

    --enable-twolame \

 %if %{with fdk_aac}

​

@@ -1,9 +1,15 @@

-control/cli/cli.c: In function 'Run':

-control/cli/cli.c:541:1: error: no return statement in function returning non-void -Werror=return-type

-

 --- a/configure.ac

 +++ b/configure.ac

-@@ -2105,7 +2105,7 @@ AS_IF(test "$SYS" = "linux" -a "${enabl

+@@ -10,7 +10,7 @@ VERSION_EXTRA=0

+ VERSION_DEV=dev

+ 

+ # libvlc .so version values

+-LIBVLC_ABI_MAJOR=12

++LIBVLC_ABI_MAJOR=123

+ LIBVLC_ABI_MINOR=0

+ LIBVLC_ABI_MICRO=0

+ 

+@@ -2054,7 +2054,7 @@ AS_IF(test "$SYS" = "linux" -a "${enable_linsys}" != "no", 

  dnl

  dnl dvdread module: check for libdvdread

  dnl

@@ -12,7 +18,7 @@

  dnl

  dnl libdvdnav plugin

-@@ -2443,7 +2443,7 @@ AC_ARG_ENABLE(mod,

+@@ -2369,7 +2369,7 @@ AC_ARG_ENABLE(mod,

    AS_HELP_STRING(--disable-mod,

      do not use libmodplug (default auto)))

  if test "${enable_mod}" != "no" ; then

@@ -21,9 +27,40 @@

            VLC_ADD_PLUGIN(mod)

            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)

            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

+@@ -4658,7 +4658,7 @@ AS_IF(test -z "$VLC_COMPILE_HOST",

+    VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`

+ )

+ AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)

+-AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", compiler)

++AC_DEFINE_UNQUOTED(VLC_COMPILER, "gcc", compiler)

+ dnl

+ dnl  Handle substvars that use $(top_srcdir)

+ dnl

+--- a/include/vlc/libvlc_version.h

++++ b/include/vlc/libvlc_version.h

+@@ -54,7 +54,7 @@

+ 

+ 

+ /** LibVLC ABI major version number, updated when incompatible changes are added */

+-# define LIBVLC_ABI_VERSION_MAJOR  (12)

++# define LIBVLC_ABI_VERSION_MAJOR  (123)

+ 

+ /** LibVLC ABI minor version number, updated when compatible changes are added */

+ # define LIBVLC_ABI_VERSION_MINOR  (0)

+--- a/modules/codec/a52.c

++++ b/modules/codec/a52.c

+@@ -300,7 +300,7 @@ static int Open( vlc_object_t *p_this )

+     p_sys->i_flags |= A52_ADJUST_LEVEL;

+ 

+     /* Initialize liba52 */

+-    p_sys->p_liba52 = a52_init( 0 );

++    p_sys->p_liba52 = a52_init();

+     if( p_sys->p_liba52 == NULL )

+     {

+         msg_Err( p_this, "unable to initialize liba52" );

 --- a/modules/control/cli/cli.c

 +++ b/modules/control/cli/cli.c

-@@ -529,9 +529,8 @@ static void cli_client_delete(struct cli

+@@ -537,9 +537,8 @@ static void cli_client_delete(struct cli_client *cl)

      free(cl);

  }

@@ -34,7 +71,7 @@

      intf_sys_t *sys = intf->p_sys;

      vlc_thread_set_name("vlc-cli-server");

-@@ -566,6 +565,13 @@ static void *Run(void *data)

+@@ -576,6 +575,13 @@ static void *Run(void *data)

      }

  }

@@ -48,3 +85,14 @@

  #else

  static void msg_vprint(intf_thread_t *p_intf, const char *psz_fmt, va_list args)

  {

+--- a/src/Makefile.am

++++ b/src/Makefile.am

+@@ -559,7 +559,7 @@ libvlccore_la_LDFLAGS = \

+   $(LDFLAGS_libvlccore) \

+   -no-undefined \

+   -export-symbols $(srcdir)/libvlccore.sym \

+-  -version-info 9:0:0

++  -version-info 123:0:0

+ libvlccore_la_DEPENDENCIES = libvlccore.sym

+ if HAVE_WIN32

+ libvlccore_la_DEPENDENCIES += libvlccore_win32_rc.$(OBJEXT)

​

@@ -1,11 +0,0 @@

---- a/modules/codec/a52.c

-+++ b/modules/codec/a52.c

-@@ -302,7 +302,7 @@ static int Open( vlc_object_t *p_this )

-     p_sys->i_flags |= A52_ADJUST_LEVEL;

- 

-     /* Initialize liba52 */

--    p_sys->p_liba52 = a52_init( 0 );

-+    p_sys->p_liba52 = a52_init();

-     if( p_sys->p_liba52 == NULL )

-     {

-         msg_Err( p_this, "unable to initialize liba52" );

​

@@ -1,11 +0,0 @@

---- a/configure.ac

-+++ b/configure.ac

-@@ -4208,7 +4208,7 @@ AC_SUBST(VERSION_MINOR)

-    VLC_COMPILE_HOST=`hostname -f 2>/dev/null || hostname`

- )

- AC_DEFINE_UNQUOTED(VLC_COMPILE_HOST, "$VLC_COMPILE_HOST", host which ran configure)

--AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1 | sed -e 's/ *$//'`", compiler)

-+AC_DEFINE_UNQUOTED(VLC_COMPILER, "gcc", compiler)

- dnl

- dnl  Handle substvars that use $(top_srcdir)

- dnl

​

@@ -1,376 +0,0 @@

-/*****************************************************************************

- * vlc_dshow.h : DirectShow access module for vlc

- *****************************************************************************

- * Copyright (C) 2002, 2004, 2010-2011 VLC authors and VideoLAN

- *

- * Author: Gildas Bazin <gbazin@videolan.org>

- *

- * 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.

- *****************************************************************************/

-

-/*****************************************************************************

- * Preamble

- *****************************************************************************/

-#ifndef VLC_DSHOW_H

-#define VLC_DSHOW_H

-

-#ifdef __MINGW32__

-# include <_mingw.h>

-#endif

-

-#include <wtypes.h>

-#include <unknwn.h>

-#include <ole2.h>

-#include <limits.h>

-#include <strmif.h>

-#include <ksmedia.h>

-#include <wmcodecdsp.h>

-#include <ddraw.h>

-

-#ifndef __MINGW64_VERSION_MAJOR

-

-#include <dshow.h>

-

-namespace dshow {

-

-/*****************************************************************************

- * DirectShow GUIDs.

- *****************************************************************************/

-

-/* IAM */

-DEFINE_GUID(IID_IAMBufferNegotiation ,0x56ed71a0, 0xaf5f, 0x11d0, 0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5);

-DEFINE_GUID(IID_IAMTVAudio      ,0x83EC1C30, 0x23D1, 0x11d1, 0x99, 0xE6, 0x00, 0xA0, 0xC9, 0x56, 0x02, 0x66);

-DEFINE_GUID(IID_IAMCrossbar     ,0xC6E13380, 0x30AC, 0x11d0, 0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56);

-DEFINE_GUID(IID_IAMTVTuner      ,0x211A8766, 0x03AC, 0x11d1, 0x8D, 0x13, 0x00, 0xAA, 0x00, 0xBD, 0x83, 0x39);

-

-/* Video Format

-MEDIASUBTYPEs and FORMAT */

-DEFINE_GUID(MEDIASUBTYPE_ARGB32 ,0x773c9ac0, 0x3274, 0x11d0, 0xb7, 0x24, 0x0, 0xaa, 0x0, 0x6c, 0x1a, 0x1);

-/* Packed YUV formats */

-DEFINE_GUID(MEDIASUBTYPE_YUYV ,0x56595559, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);

-/* Planar YUV formats */

-DEFINE_GUID(MEDIASUBTYPE_IYUV ,0x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); /* identical to YV12 */

-DEFINE_GUID(MEDIASUBTYPE_I420 ,0x30323449, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);

-/* MPEG2 formats */

-DEFINE_GUID(MEDIASUBTYPE_MPEG2_VIDEO     ,0xe06d8026, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);

-DEFINE_GUID(MEDIASUBTYPE_MPEG2_PROGRAM   ,0xe06d8022, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);

-DEFINE_GUID(MEDIASUBTYPE_MPEG2_TRANSPORT ,0xe06d8023, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);

-DEFINE_GUID(FORMAT_MPEG2Video            ,0xe06d80e3, 0xdb46, 0x11cf, 0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea);

-

-/* float */

-DEFINE_GUID(MEDIASUBTYPE_IEEE_FLOAT ,0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);

-

-

-/****************************************************************************

- * The following should be in ks.h and ksmedia.h, but since they are not in

- * the current version of Mingw, we will be defined here.

- ****************************************************************************/

-

-/* http://msdn.microsoft.com/en-us/library/ff567297%28VS.85%29.aspx */

-typedef enum  {

-        KS_AnalogVideo_None          = 0x00000000,

-        KS_AnalogVideo_NTSC_M        = 0x00000001,

-        KS_AnalogVideo_NTSC_M_J      = 0x00000002,

-        KS_AnalogVideo_NTSC_433      = 0x00000004,

-        KS_AnalogVideo_PAL_B         = 0x00000010,

-        KS_AnalogVideo_PAL_D         = 0x00000020,

-        KS_AnalogVideo_PAL_G         = 0x00000040,

-        KS_AnalogVideo_PAL_H         = 0x00000080,

-        KS_AnalogVideo_PAL_I         = 0x00000100,

-        KS_AnalogVideo_PAL_M         = 0x00000200,

-        KS_AnalogVideo_PAL_N         = 0x00000400,

-        KS_AnalogVideo_PAL_60        = 0x00000800,

-        KS_AnalogVideo_SECAM_B       = 0x00001000,

-        KS_AnalogVideo_SECAM_D       = 0x00002000,

-        KS_AnalogVideo_SECAM_G       = 0x00004000,

-        KS_AnalogVideo_SECAM_H       = 0x00008000,

-        KS_AnalogVideo_SECAM_K       = 0x00010000,

-        KS_AnalogVideo_SECAM_K1      = 0x00020000,

-        KS_AnalogVideo_SECAM_L       = 0x00040000,

-        KS_AnalogVideo_SECAM_L1      = 0x00080000,

-        KS_AnalogVideo_PAL_N_COMBO   = 0x00100000

-} KS_AnalogVideoStandard;

-

-/* http://msdn.microsoft.com/en-us/library/ff567800%28VS.85%29.aspx and following */

-typedef enum {

-    KSPROPERTY_TUNER_CAPS,              // R  -overall device capabilities

-    KSPROPERTY_TUNER_MODE_CAPS,         // R  -capabilities in this mode

-    KSPROPERTY_TUNER_MODE,              // RW -set a mode (TV, FM, AM, DSS)

-    KSPROPERTY_TUNER_STANDARD,          // R  -get TV standard (only if TV mode)

-    KSPROPERTY_TUNER_FREQUENCY,         // RW -set/get frequency

-    KSPROPERTY_TUNER_INPUT,             // RW -select an input

-    KSPROPERTY_TUNER_STATUS,            // R  -tuning status

-

-    /* Optional */

-    KSPROPERTY_TUNER_IF_MEDIUM,         // R O-Medium for IF or Transport Pin

-

-    /* Mandatory for Vista and + */

-    KSPROPERTY_TUNER_SCAN_CAPS,         // R  -overall device capabilities for scanning

-

-    /* Optional ones */

-    KSPROPERTY_TUNER_SCAN_STATUS,       // R  -status of scan

-    KSPROPERTY_TUNER_STANDARD_MODE,     // RW -autodetect mode for signal standard

-    KSPROPERTY_TUNER_NETWORKTYPE_SCAN_CAPS // R -network type specific tuner capabilities

-} KSPROPERTY_TUNER;

-

-/* http://msdn.microsoft.com/en-us/library/ff567689%28v=VS.85%29.aspx */

-typedef enum {

-    KS_TUNER_TUNING_EXACT = 1,        // Tunes directly to the right freq

-    KS_TUNER_TUNING_FINE,             // Comprehensive search to the right freq

-    KS_TUNER_TUNING_COARSE,           // Fast search

-}KS_TUNER_TUNING_FLAGS;

-

-/* http://msdn.microsoft.com/en-us/library/ff567687%28v=VS.85%29.aspx */

-typedef enum {

-    KS_TUNER_STRATEGY_PLL             = 0X01, // Phase locked loop (PLL) offset tuning

-    KS_TUNER_STRATEGY_SIGNAL_STRENGTH = 0X02, // Signal strength tuning

-    KS_TUNER_STRATEGY_DRIVER_TUNES    = 0X04, // Driver tunes

-}KS_TUNER_STRATEGY;

-

-/* http://msdn.microsoft.com/en-us/library/ff562676%28VS.85%29.aspx */

-typedef struct {

-    union {

-        struct {

-            GUID    Set;

-            ULONG   Id;

-            ULONG   Flags;

-        };

-        LONGLONG    Alignment;

-    };

-} KSIDENTIFIER, *PKSIDENTIFIER;

-

-typedef KSIDENTIFIER KSPROPERTY, *PKSPROPERTY;

-

-/* http://msdn.microsoft.com/en-us/library/ff565872%28v=VS.85%29.aspx */

-typedef struct {

-    KSPROPERTY Property;

-    ULONG  Mode;                        // KSPROPERTY_TUNER_MODE_*

-    ULONG  StandardsSupported;          // KS_AnalogVideo_* (if Mode is TV or DSS)

-    ULONG  MinFrequency;                // Hz

-    ULONG  MaxFrequency;                // Hz

-    ULONG  TuningGranularity;           // Hz

-    ULONG  NumberOfInputs;              // number of inputs

-    ULONG  SettlingTime;                // milliSeconds

-    ULONG  Strategy;                    // KS_TUNER_STRATEGY

-} KSPROPERTY_TUNER_MODE_CAPS_S, *PKSPROPERTY_TUNER_MODE_CAPS_S;

-

-/* http://msdn.microsoft.com/en-us/library/ff565839%28v=VS.85%29.aspx */

-typedef struct {

-    KSPROPERTY Property;

-    ULONG  Frequency;                   // Hz

-    ULONG  LastFrequency;               // Hz (last tuned)

-    ULONG  TuningFlags;                 // KS_TUNER_TUNING_FLAGS

-    ULONG  VideoSubChannel;             // DSS

-    ULONG  AudioSubChannel;             // DSS

-    ULONG  Channel;                     // VBI decoders

-    ULONG  Country;                     // VBI decoders

-} KSPROPERTY_TUNER_FREQUENCY_S, *PKSPROPERTY_TUNER_FREQUENCY_S;

-

-/* http://msdn.microsoft.com/en-us/library/ff565918%28v=VS.85%29.aspx */

-typedef struct {

-    KSPROPERTY Property;

-    ULONG  Standard;                    // KS_AnalogVideo_*

-} KSPROPERTY_TUNER_STANDARD_S, *PKSPROPERTY_TUNER_STANDARD_S;

-/* End of ks */

-

-

-/* Define missing interfaces from wine's header */

-/* http://msdn.microsoft.com/en-us/library/dd373441%28v=vs.85%29.aspx */

-typedef enum tagAMTunerModeType {

-    AMTUNER_MODE_DEFAULT    = 0x0000,

-    AMTUNER_MODE_TV         = 0x0001,

-    AMTUNER_MODE_FM_RADIO   = 0x0002,

-    AMTUNER_MODE_AM_RADIO   = 0x0004,

-    AMTUNER_MODE_DSS        = 0x0008

-} AMTunerModeType;

-

-#define AMPROPERTY_PIN_CATEGORY 0

​

@@ -1,91 +0,0 @@

-/*****************************************************************************

- * preparser.h

- *****************************************************************************

- * Copyright (C) 1999-2008 VLC authors and VideoLAN

- *

- * Authors: Samuel Hocevar <sam@zoy.org>

- *          Clément Stenac <zorglub@videolan.org>

- *

- * 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 _INPUT_PREPARSER_H

-#define _INPUT_PREPARSER_H 1

-

-#include <vlc_input_item.h>

-/**

- * Preparser opaque structure.

- *

- * The preparser object will retrieve the meta data of any given input item in

- * an asynchronous way.

- * It will also issue art fetching requests.

- */

-typedef struct input_preparser_t input_preparser_t;

-

-/**

- * This function creates the preparser object and thread.

- */

-input_preparser_t *input_preparser_New( vlc_object_t * );

-

-/**

- * This function enqueues the provided item to be preparsed.

- *

- * The input item is retained until the preparsing is done or until the

- * preparser object is deleted.

- *

- * @param timeout maximum time allowed to preparse the item. If -1, the default

- * "preparse-timeout" option will be used as a timeout. If 0, it will wait

- * indefinitely. If > 0, the timeout will be used (in milliseconds).

- * @param id unique id provided by the caller. This is can be used to cancel

- * the request with input_preparser_Cancel()

- * @returns VLC_SUCCESS if the item was scheduled for preparsing, an error code

- * otherwise

- * If this returns an error, the on_preparse_ended will *not* be invoked

- */

-int input_preparser_Push( input_preparser_t *, input_item_t *,

-                           input_item_meta_request_option_t,

-                           const input_preparser_callbacks_t *cbs,

-                           void *cbs_userdata,

-                           int timeout, void *id );

-

-void input_preparser_fetcher_Push( input_preparser_t *, input_item_t *,

-                                   input_item_meta_request_option_t,

-                                   const input_fetcher_callbacks_t *cbs,

-                                   void *cbs_userdata );

-

-/**

- * This function cancel all preparsing requests for a given id

- *

- * @param id unique id given to input_preparser_Push()

- */

-void input_preparser_Cancel( input_preparser_t *, void *id );

-

-/**

- * This function destroys the preparser object and thread.

- *

- * All pending input items will be released.

- */

-void input_preparser_Delete( input_preparser_t * );

-

-/**

- * This function deactivates the preparser

- *

- * All pending requests will be removed, and it will block until the currently

- * running entity has finished (if any).

- */

-void input_preparser_Deactivate( input_preparser_t * );

-

-#endif

-

​

@@ -56,9 +56,7 @@

 #elif defined(HAVE_MEMALIGN)

     return memalign(align, size);

-#elif defined (_WIN32) && defined(__MINGW32__)

-    return __mingw_aligned_malloc(size, align);

-#elif defined (_WIN32) && defined(_MSC_VER)

+#elif defined (_WIN32)

     return _aligned_malloc(size, align);

 #else

     /* align must be valid/supported */

​

@@ -1,1 +1,1 @@

-c3c2717103ba87264550fd5bebfd36ffaab00325f764dadd8229bc9aae6fe4e5ef195da23a263e2e4d8505f8b690dd440346b014a4c556428fe8fac5fb64eaa5  rav1e-0.6.3.tar.gz

+49c003e2ab978072467264cfd0d4f10b4ada486785d53fd58ab3a1e69392b2547634c8d024802634f59a4d635ed5d08c3d988726f21f9c69271d5fbfe8706291  rav1e-0.6.4.tar.gz

​

@@ -1,6 +1,6 @@

 # rav1e

-RAV1E_VERSION := 0.6.3

+RAV1E_VERSION := 0.6.4

 RAV1E_URL := https://crates.io/api/v1/crates/rav1e/$(RAV1E_VERSION)/download

 ifdef BUILD_RUST

​

@@ -0,0 +1,21 @@

+diff --git a/cmake/Modules/FindSIMD32.cmake b/cmake/Modules/FindSIMD32.cmake

+index 9e4237358f..580e9ca87b 100644

+--- a/cmake/Modules/FindSIMD32.cmake   

++++ b/cmake/Modules/FindSIMD32.cmake   

+@@ -24,6 +24,16 @@ elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")

+       return !vgetq_lane_u32(vceqq_f32(a,b),0);

+     }

+   ")

++elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")

++  set (TRIAL_C_FLAGS

++    " ")

++  set (TEST_C_SOURCE "

++    #include <arm_neon.h>

++    int main(int c, char * * v) {

++      float32x4_t a = vdupq_n_f32((float)c), b = vdupq_n_f32((float)!!v);

++      return !vgetq_lane_u32(vceqq_f32(a,b),0);

++    }

++  ")

+ else ()

+   if (WIN32) # Safety for when mixed lib/app compilers (but performance hit)

+     set (GCC_WIN32_SIMD32_OPTS "-mincoming-stack-boundary=2")

​

@@ -22,6 +22,7 @@

    $(APPLY) $(SRC)/soxr/0004-arm-fix-SIGILL-when-doing-divisions-on-some-old-arch.patch

    $(APPLY) $(SRC)/soxr/find_ff_pkgconfig.patch

    $(APPLY) $(SRC)/soxr/soxr-check-function.patch

+   $(APPLY) $(SRC)/soxr/aarch64.patch

    $(call pkg_static,"src/soxr.pc.in")

    $(MOVE)

​

@@ -13,7 +13,7 @@

 #include <windows.h>

 #include <d3d11.h>

 #include <d3dcompiler.h>

-#include <assert.h>

+#include <cassert>

 #include <d3d11_1.h>

 #include <dxgi1_2.h>

​

@@ -383,6 +383,7 @@

     after_script:

         - export VLC_CONTRIB_SHA="$(extras/ci/get-contrib-sha.sh)"

         - mv extras/package/snap/parts/vlc/build/contrib/vlc-contrib-*.tar.bz2 contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true

+    allow_failure: true

     variables: *variables-snap

 snap:

​

@@ -423,7 +423,6 @@

     done

     printf "\

-#include \"config.h\"\\n\

 #include <vlc_common.h>\\n\

 #include <vlc_plugin.h>\\n\

 %b\\n\

​

@@ -79,6 +79,8 @@

        5317FE04294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */; };

        5325C57D29302E6800B2B63A /* VLCLibraryAudioViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5325C57B29302E6800B2B63A /* VLCLibraryAudioViewController.m */; };

        534E8E3A29A06325009503F8 /* VLCMainVideoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 534E8E3929A06325009503F8 /* VLCMainVideoViewController.m */; };

+       5352B37329DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 5352B37229DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m */; };

+       5352B37629E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 5352B37529E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m */; };

        5362550D293FD639005D64FA /* VLCLibraryWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5362550C293FD639005D64FA /* VLCLibraryWindowController.m */; };

        536283F0291146BC00640C15 /* VLCLibraryTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283DE291146BC00640C15 /* VLCLibraryTableView.m */; };

        536283F1291146BC00640C15 /* VLCLibraryAlbumTracksDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 536283DF291146BC00640C15 /* VLCLibraryAlbumTracksDataSource.m */; };

@@ -98,6 +100,7 @@

        538A7EDA29A63EE40068AD4F /* VLCFullVideoViewWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 538A7ED929A63EE40068AD4F /* VLCFullVideoViewWindow.m */; };

        53903D3A29576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 53903D3929576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m */; };

        539BA79F298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 539BA79E298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m */; };

+       539F114B29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 539F114A29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m */; };

        53B447CA2939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447C92939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m */; };

        53B447F6293BB47B00857588 /* VLCLibraryVideoCollectionViewContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447EC293BB47A00857588 /* VLCLibraryVideoCollectionViewContainerView.m */; };

        53B447F7293BB47B00857588 /* VLCLibraryVideoCollectionViewContainerViewDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 53B447ED293BB47A00857588 /* VLCLibraryVideoCollectionViewContainerViewDataSource.m */; };

@@ -258,6 +261,10 @@

        534E8E3729A04F95009503F8 /* VLCMainVideoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = VLCMainVideoView.xib; sourceTree = "<group>"; };

        534E8E3829A06325009503F8 /* VLCMainVideoViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMainVideoViewController.h; sourceTree = "<group>"; };

        534E8E3929A06325009503F8 /* VLCMainVideoViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMainVideoViewController.m; sourceTree = "<group>"; };

+       5352B37129DF29BF0011CE03 /* VLCMainVideoViewControlsBar.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCMainVideoViewControlsBar.h; sourceTree = "<group>"; };

+       5352B37229DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCMainVideoViewControlsBar.m; sourceTree = "<group>"; };

+       5352B37429E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowPersistentPreferences.h; sourceTree = "<group>"; };

+       5352B37529E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowPersistentPreferences.m; sourceTree = "<group>"; };

        5362550B293FD639005D64FA /* VLCLibraryWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryWindowController.h; sourceTree = "<group>"; };

        5362550C293FD639005D64FA /* VLCLibraryWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryWindowController.m; sourceTree = "<group>"; };

        536283DC291146BC00640C15 /* VLCLibraryAlbumTracksDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCLibraryAlbumTracksDataSource.h; sourceTree = "<group>"; };

@@ -301,6 +308,8 @@

        53903D3929576ED500D0B308 /* VLCLibraryAudioGroupDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAudioGroupDataSource.m; sourceTree = "<group>"; };

        539BA79D298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCAspectRatioRetainingVideoWindow.h; sourceTree = "<group>"; };

        539BA79E298C726200918C36 /* VLCAspectRatioRetainingVideoWindow.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCAspectRatioRetainingVideoWindow.m; sourceTree = "<group>"; };

+       539F114929E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTwoPaneSplitViewDelegate.h; sourceTree = "<group>"; };

+       539F114A29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryTwoPaneSplitViewDelegate.m; sourceTree = "<group>"; };

        53B447C82939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibrarySongsTableViewSongPlayingTableCellView.h; sourceTree = "<group>"; };

        53B447C92939823E00857588 /* VLCLibrarySongsTableViewSongPlayingTableCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibrarySongsTableViewSongPlayingTableCellView.m; sourceTree = "<group>"; };

        53B447EC293BB47A00857588 /* VLCLibraryVideoCollectionViewContainerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryVideoCollectionViewContainerView.m; sourceTree = "<group>"; };

@@ -321,9 +330,9 @@

        53ED472A29C8FF9D00795DB1 /* VLCLibraryAlbumTracksTableViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryAlbumTracksTableViewDelegate.m; sourceTree = "<group>"; };

        53ED472C29C907C200795DB1 /* VLCLibraryVideoTableViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryVideoTableViewDelegate.h; sourceTree = "<group>"; };

        53ED472D29C907C200795DB1 /* VLCLibraryVideoTableViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryVideoTableViewDelegate.m; sourceTree = "<group>"; };

-       53ED473729CAF67F00795DB1 /* VLCLibraryTableCellViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTableCellViewProtocol.h; sourceTree = "<group>"; };

        53ED473429CA4F3400795DB1 /* VLCLibraryTableViewDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTableViewDelegate.h; sourceTree = "<group>"; };

        53ED473529CA4F3400795DB1 /* VLCLibraryTableViewDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VLCLibraryTableViewDelegate.m; sourceTree = "<group>"; };

+       53ED473729CAF67F00795DB1 /* VLCLibraryTableCellViewProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCLibraryTableCellViewProtocol.h; sourceTree = "<group>"; };

        53ED473A29CBC64200795DB1 /* NSPasteboardItem+VLCAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSPasteboardItem+VLCAdditions.h"; sourceTree = "<group>"; };

        53ED473B29CBC64200795DB1 /* NSPasteboardItem+VLCAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSPasteboardItem+VLCAdditions.m"; sourceTree = "<group>"; };

        53F0E92B299B002300491D49 /* VLCInputNodePathControlItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VLCInputNodePathControlItem.h; sourceTree = "<group>"; };

@@ -1034,6 +1043,8 @@

            children = (

                1C1ED51D2205AC6B00811EC0 /* VLCControlsBarCommon.h */,

                E0382C01160BA09E0031D7FF /* VLCControlsBarCommon.m */,

+               5352B37129DF29BF0011CE03 /* VLCMainVideoViewControlsBar.h */,

+               5352B37229DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m */,

                7D5678EE1D5BA397002698F3 /* VLCMainWindowControlsBar.h */,

                7D5678EF1D5BA397002698F3 /* VLCMainWindowControlsBar.m */,

            );

@@ -1200,10 +1211,14 @@

                536283DE291146BC00640C15 /* VLCLibraryTableView.m */,

                53ED473429CA4F3400795DB1 /* VLCLibraryTableViewDelegate.h */,

                53ED473529CA4F3400795DB1 /* VLCLibraryTableViewDelegate.m */,

+               539F114929E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.h */,

+               539F114A29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m */,

                7D713D302201AE350042BEB7 /* VLCLibraryWindow.h */,

                7D713D312201AE350042BEB7 /* VLCLibraryWindow.m */,

                5362550B293FD639005D64FA /* VLCLibraryWindowController.h */,

                5362550C293FD639005D64FA /* VLCLibraryWindowController.m */,

+               5352B37429E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.h */,

+               5352B37529E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m */,

                5317FE02294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.h */,

                5317FE03294E3DD3001702F0 /* VLCLibraryCollectionViewDelegate.m */,

                5317FE05294E8D1A001702F0 /* VLCLibraryCollectionViewDataSource.h */,

@@ -1897,6 +1912,7 @@

                7D61DCE4236C1937008133CF /* VLCCustomWindowButton.m in Sources */,

                7DFFF90123682D4800C8B0C9 /* VLCDetachedAudioWindow.m in Sources */,

                7D66D4392200C5B80040D04A /* VLCVideoFilterHelper.m in Sources */,

+               5352B37329DF29BF0011CE03 /* VLCMainVideoViewControlsBar.m in Sources */,

                7D445D812202524000263D34 /* VLCPlaylistController.m in Sources */,

                7DFBDCBE226CED7200B700A5 /* VLCMediaSource.m in Sources */,

                536283F2291146BC00640C15 /* VLCLibraryCollectionViewAlbumSupplementaryDetailView.m in Sources */,

@@ -1982,6 +1998,7 @@

                7DD2F5C52081B73B007EE187 /* VLCRemoteControlService.m in Sources */,

                1C31139F1E508C6900D4DD76 /* VLCMainWindowControlsBar.m in Sources */,

                1C3113A11E508C6900D4DD76 /* VLCConvertAndSaveWindowController.m in Sources */,

+               5352B37629E149AC0011CE03 /* VLCLibraryWindowPersistentPreferences.m in Sources */,

                7DBB7639227F3FBC002649E1 /* VLCLibraryCollectionViewSupplementaryElementView.m in Sources */,

                1C3113A31E508C6900D4DD76 /* VLCCoreDialogProvider.m in Sources */,

                6B2EFC631F281A0900F3C0EA /* VLCVolumeSliderCell.m in Sources */,

@@ -2019,6 +2036,7 @@

                6BBB05DA1EEFEA29003A1019 /* VLCHUDOutlineView.m in Sources */,

                7D445D842202524D00263D34 /* VLCPlaylistItem.m in Sources */,

                1C3113CF1E508C6900D4DD76 /* prefs_widgets.m in Sources */,

+               539F114B29E83A4200F13460 /* VLCLibraryTwoPaneSplitViewDelegate.m in Sources */,

                7D0F63FF2201F63400FDB91F /* VLCPlaylistTableCellView.m in Sources */,

                1C3113D11E508C6900D4DD76 /* prefs.m in Sources */,

                1C3113D31E508C6900D4DD76 /* VLCResumeDialogController.m in Sources */,

​

@@ -150,7 +150,7 @@

 check_nasm 2.14

 check gettext

 check help2man

-check meson 0.60.0

+check meson 1.0.0

 check_ninja

 DEPS_ONLY="help2man"

​

@@ -85,6 +85,7 @@

     'vlc_playlist.h',

     'vlc_playlist_export.h',

     'vlc_plugin.h',

+    'vlc_preparser.h',

     'vlc_probe.h',

     'vlc_rand.h',

     'vlc_renderer_discovery.h',

​

@@ -147,29 +147,29 @@

     /**

      * Parse media if it's a local file

      */

-    libvlc_media_parse_local    = 0x00,

+    libvlc_media_parse_local    = 0x01,

     /**

      * Parse media even if it's a network file

      */

-    libvlc_media_parse_network  = 0x01,

+    libvlc_media_parse_network  = 0x02,

+    /**

+     * Force parsing the media even if it would be skipped.

+     */

+    libvlc_media_parse_forced   = 0x04,

     /**

      * Fetch meta and cover art using local resources

      */

-    libvlc_media_fetch_local    = 0x02,

+    libvlc_media_fetch_local    = 0x08,

     /**

      * Fetch meta and cover art using network resources

      */

-    libvlc_media_fetch_network  = 0x04,

+    libvlc_media_fetch_network  = 0x10,

     /**

      * Interact with the user (via libvlc_dialog_cbs) when preparsing this item

      * (and not its sub items). Set this flag in order to receive a callback

      * when the input is asking for credentials.

      */

-    libvlc_media_do_interact    = 0x08,

-    /**

-     * Force parsing the media even if it would be skipped.

-     */

-    libvlc_media_no_skip        = 0x10,

+    libvlc_media_do_interact    = 0x20,

 } libvlc_media_parse_flag_t;

 /**

​

@@ -79,6 +79,7 @@

 #define vlc_block_callbacks vlc_frame_callbacks

 #define block_Init vlc_frame_Init

+#define block_New vlc_frame_New

 #define block_Alloc vlc_frame_Alloc

 #define block_TryRealloc vlc_frame_TryRealloc

 #define block_Realloc vlc_frame_Realloc

​

@@ -108,7 +108,7 @@

 /* C++11 says there's no need to define __STDC_*_MACROS when including

  * inttypes.h and stdint.h. */

-#if defined (__cplusplus) && (defined(__MINGW32__) || defined(__UCLIBC__))

+#if defined (__cplusplus) && defined(__UCLIBC__)

 # ifndef __STDC_FORMAT_MACROS

 #  define __STDC_FORMAT_MACROS 1

 # endif

@@ -396,9 +396,7 @@

 } /* extern "C" */

 #endif

-#if defined (_WIN32) && defined(__MINGW32__)

-#define aligned_free(ptr)  __mingw_aligned_free(ptr)

-#elif defined (_WIN32) && defined(_MSC_VER)

+#if defined (_WIN32)

 #define aligned_free(ptr)  _aligned_free(ptr)

 #else

 #define aligned_free(ptr)  free(ptr)

@@ -456,11 +454,18 @@

 /* Socket stuff */

 #ifndef HAVE_INET_PTON

+# ifdef __cplusplus

+}

+# endif

 # ifndef _WIN32

 #  include <sys/socket.h>

 #else

 typedef int socklen_t;

 # endif

+# ifdef __cplusplus

+extern "C" {

+# endif

+

 int inet_pton(int, const char *, void *);

 const char *inet_ntop(int, const void *, char *, socklen_t);

 #endif

@@ -493,7 +498,13 @@

 #endif

 #ifndef HAVE_IF_NAMEINDEX

+# ifdef __cplusplus

+}

+# endif

 #include <errno.h>

+# ifdef __cplusplus

+extern "C" {

+# endif

 # ifndef HAVE_STRUCT_IF_NAMEINDEX

 struct if_nameindex

 {

@@ -531,7 +542,13 @@

 };

 # ifndef HAVE_IF_NAMETOINDEX

+#  ifdef __cplusplus

+}

+#  endif

 #  include <stdlib.h> /* a define may change from the real atoi declaration */

+#  ifdef __cplusplus

+extern "C" {

+#  endif

 static inline int if_nametoindex(const char *name)

 {

     return atoi(name);

@@ -748,7 +765,13 @@

 #ifdef __APPLE__

 # define fdatasync fsync

+# ifdef __cplusplus

+}

+# endif

 # include <time.h>

+# ifdef __cplusplus

+extern "C" {

+# endif

 # ifndef TIMER_ABSTIME

 #  define TIMER_ABSTIME 0x01

 # endif

@@ -768,7 +791,13 @@

 #ifndef _WIN32

 # ifndef HAVE_CLOCK_NANOSLEEP

+#  ifdef __cplusplus

+}

+#  endif

 # include <time.h>

+#  ifdef __cplusplus

+extern "C" {

+#  endif

 int clock_nanosleep(clockid_t clock_id, int flags,

         const struct timespec *rqtp, struct timespec *rmtp);

 # endif

​

@@ -93,6 +93,7 @@

 #define VLC_CODEC_TRUEMOTION2     VLC_FOURCC('T','M','2','0')

 #define VLC_CODEC_QTRLE           VLC_FOURCC('r','l','e',' ')

 #define VLC_CODEC_QDRAW           VLC_FOURCC('q','d','r','w')

+#define VLC_CODEC_QOI             VLC_FOURCC('q','o','i','f')

 #define VLC_CODEC_QPEG            VLC_FOURCC('Q','P','E','G')

 #define VLC_CODEC_ULTI            VLC_FOURCC('U','L','T','I')

 #define VLC_CODEC_VIXL            VLC_FOURCC('V','I','X','L')

​

@@ -160,6 +160,24 @@

                                     void *base, size_t length);

 /**

+ * Creates a custom frame.

+ *

+ * This function initialize a frame of timed data allocated by custom means.

+ * This allows passing data without copying even if the data has been allocated

+ * with unusual means or outside of LibVLC.

+ *

+ * Normally, frames are allocated and initialized by vlc_frame_Alloc() instead.

+ *

+ * @param cbs structure of custom callbacks to handle the frame IN

+ * @param base start address of the frame data

+ * @param length byte length of the frame data

+ *

+ * @return the created frame, or NULL on memory error.

+ */

+VLC_API vlc_frame_t *vlc_frame_New(const struct vlc_frame_callbacks *cbs,

+                                   void *base, size_t length);

+

+/**

  * Allocates a frame.

  *

  * Creates a new frame with the requested size.

​

@@ -38,7 +38,6 @@

 typedef struct input_item_opaque input_item_opaque_t;

 typedef struct input_item_slave input_item_slave_t;

-typedef struct input_preparser_callbacks_t input_preparser_callbacks_t;

 struct info_t

 {

@@ -478,12 +477,14 @@

     META_REQUEST_OPTION_NONE          = 0x00,

     META_REQUEST_OPTION_SCOPE_LOCAL   = 0x01,

     META_REQUEST_OPTION_SCOPE_NETWORK = 0x02,

-    META_REQUEST_OPTION_SCOPE_ANY     = 0x03,

-    META_REQUEST_OPTION_FETCH_LOCAL   = 0x04,

-    META_REQUEST_OPTION_FETCH_NETWORK = 0x08,

-    META_REQUEST_OPTION_FETCH_ANY     = 0x0C,

-    META_REQUEST_OPTION_DO_INTERACT   = 0x10,

-    META_REQUEST_OPTION_NO_SKIP       = 0x20,

+    META_REQUEST_OPTION_SCOPE_ANY     =

+        META_REQUEST_OPTION_SCOPE_LOCAL|META_REQUEST_OPTION_SCOPE_NETWORK,

+    META_REQUEST_OPTION_SCOPE_FORCED  = 0x04,

+    META_REQUEST_OPTION_FETCH_LOCAL   = 0x08,

+    META_REQUEST_OPTION_FETCH_NETWORK = 0x10,

+    META_REQUEST_OPTION_FETCH_ANY     =

+        META_REQUEST_OPTION_FETCH_LOCAL|META_REQUEST_OPTION_FETCH_NETWORK,

+    META_REQUEST_OPTION_DO_INTERACT   = 0x20,

 } input_item_meta_request_option_t;

 /* status of the on_preparse_ended() callback */

@@ -495,24 +496,17 @@

     ITEM_PREPARSE_DONE

 };

-typedef struct input_preparser_callbacks_t {

+struct vlc_metadata_cbs {

     void (*on_preparse_ended)(input_item_t *, enum input_item_preparse_status status, void *userdata);

-    void (*on_subtree_added)(input_item_t *, input_item_node_t *subtree, void *userdata);

-} input_preparser_callbacks_t;

-

-typedef struct input_fetcher_callbacks_t {

     void (*on_art_fetch_ended)(input_item_t *, bool fetched, void *userdata);

-} input_fetcher_callbacks_t;

+    void (*on_subtree_added)(input_item_t *, input_item_node_t *subtree, void *userdata);

+};

 VLC_API int libvlc_MetadataRequest( libvlc_int_t *, input_item_t *,

                                     input_item_meta_request_option_t,

-                                    const input_preparser_callbacks_t *cbs,

+                                    const struct vlc_metadata_cbs *cbs,

                                     void *cbs_userdata,

                                     int, void * );

-VLC_API int libvlc_ArtRequest(libvlc_int_t *, input_item_t *,

-                              input_item_meta_request_option_t,

-                              const input_fetcher_callbacks_t *cbs,

-                              void *cbs_userdata );

 VLC_API void libvlc_MetadataCancel( libvlc_int_t *, void * );

 /******************

​

@@ -27,6 +27,7 @@

 #include <assert.h>

 #include <vlc_atomic.h>

+#include <vlc_es.h>

 #ifdef __cplusplus

 extern "C" {

@@ -43,8 +44,6 @@

  * This file defines picture structures and functions in vlc

  */

-#include <vlc_es.h>

-

 /** Description of a planar graphic field */

 typedef struct plane_t

 {

​

@@ -24,6 +24,8 @@

 #ifndef LIBVLC_MODULES_MACROS_H

 # define LIBVLC_MODULES_MACROS_H 1

+#include <stdint.h>

+

 /**

  * \file

  * This file implements plugin (module) macros used to define a vlc module.

​

@@ -0,0 +1,109 @@

+/*****************************************************************************

+ * preparser.h

+ *****************************************************************************

+ * Copyright (C) 1999-2023 VLC authors and VideoLAN

+ *

+ * Authors: Samuel Hocevar <sam@zoy.org>

+ *          Clément Stenac <zorglub@videolan.org>

+ *

+ * 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 VLC_PREPARSER_H

+#define VLC_PREPARSER_H 1

+

+#include <vlc_input_item.h>

+

+/**

+ * @defgroup vlc_preparser Preparser

+ * @ingroup input

+ * @{

+ * @file

+ * VLC Preparser API

+ */

+

+/**

+ * Preparser opaque structure.

+ *

+ * The preparser object will retrieve the meta data of any given input item in

+ * an asynchronous way.

+ * It will also issue art fetching requests.

+ */

+typedef struct vlc_preparser_t vlc_preparser_t;

+

+/**

+ * This function creates the preparser object and thread.

+ *

+ * @param obj the parent object

+ * @return a valid preparser object or NULL in case of error

+ */

+VLC_API vlc_preparser_t *vlc_preparser_New( vlc_object_t *obj );

+

+/**

+ * This function enqueues the provided item to be preparsed or fetched.

+ *

+ * The input item is retained until the preparsing is done or until the

+ * preparser object is deleted.

+ *

+ * @param preparser the preparser object

+ * @param item a valid item to preparse

+ * @param option preparse flag, cf @ref input_item_meta_request_option_t

+ * @param cbs callback to listen to events (can't be NULL)

+ * @param cbs_userdata opaque pointer used by the callbacks

+ * @param timeout maximum time allowed to preparse the item. If -1, the default

+ * "preparse-timeout" option will be used as a timeout. If 0, it will wait

+ * indefinitely. If > 0, the timeout will be used (in milliseconds).

+ * @param id unique id provided by the caller. This is can be used to cancel

+ * the request with vlc_preparser_Cancel()

+ * @returns VLC_SUCCESS if the item was scheduled for preparsing, an error code

+ * otherwise

+ * If this returns an error, the on_preparse_ended will *not* be invoked

+ */

+VLC_API int vlc_preparser_Push( vlc_preparser_t *preparser, input_item_t *item,

+                                input_item_meta_request_option_t option,

+                                const struct vlc_metadata_cbs *cbs,

+                                void *cbs_userdata,

+                                int timeout, void *id );

+

+/**

+ * This function cancel all preparsing requests for a given id

+ *

+ * @param preparser the preparser object

+ * @param id unique id given to vlc_preparser_Push()

+ */

+VLC_API void vlc_preparser_Cancel( vlc_preparser_t *preparser, void *id );

+

+/**

+ * This function destroys the preparser object and thread.

+ *

+ * @param preparser the preparser object

+ * All pending input items will be released.

+ */

+VLC_API void vlc_preparser_Delete( vlc_preparser_t *preparser );

+

+/**

+ * This function deactivates the preparser

+ *

+ * All pending requests will be removed, and it will block until the currently

+ * running entity has finished (if any).

+ *

+ * @param preparser the preparser object

+ */

+VLC_API void vlc_preparser_Deactivate( vlc_preparser_t *preparser );

+

+/** @} vlc_preparser */

+

+#endif

+

​

@@ -27,14 +27,14 @@

 #ifndef VLC_SOUT_H_

 #define VLC_SOUT_H_

-#ifdef __cplusplus

-extern "C" {

-#endif

-

 #include <sys/types.h>

 #include <vlc_es.h>

 #include <vlc_clock.h>

+#ifdef __cplusplus

+extern "C" {

+#endif

+

 /**

  * \defgroup sout Stream output

  * \ingroup output

​

@@ -820,7 +820,7 @@

     return 1;

 }

-static const input_preparser_callbacks_t input_preparser_callbacks = {

+static const struct vlc_metadata_cbs preparser_callbacks = {

     .on_preparse_ended = input_item_preparse_ended,

     .on_subtree_added = input_item_subtree_added,

 };

@@ -839,7 +839,7 @@

     libvlc_int_t *libvlc = inst->p_libvlc_int;

     input_item_t *item = media->p_input_item;

-    input_item_meta_request_option_t parse_scope = META_REQUEST_OPTION_SCOPE_LOCAL;

+    input_item_meta_request_option_t parse_scope = 0;

     int ret;

     unsigned int ref = atomic_load_explicit(&media->worker_count,

                                             memory_order_relaxed);

@@ -853,19 +853,21 @@

                                                   memory_order_relaxed,

                                                   memory_order_relaxed));

+    if (parse_flag & libvlc_media_parse_local)

+        parse_scope |= META_REQUEST_OPTION_SCOPE_LOCAL;

     if (parse_flag & libvlc_media_parse_network)

         parse_scope |= META_REQUEST_OPTION_SCOPE_NETWORK;

+    if (parse_flag & libvlc_media_parse_forced)

+        parse_scope |= META_REQUEST_OPTION_SCOPE_FORCED;

     if (parse_flag & libvlc_media_fetch_local)

         parse_scope |= META_REQUEST_OPTION_FETCH_LOCAL;

     if (parse_flag & libvlc_media_fetch_network)

         parse_scope |= META_REQUEST_OPTION_FETCH_NETWORK;

     if (parse_flag & libvlc_media_do_interact)

         parse_scope |= META_REQUEST_OPTION_DO_INTERACT;

-    if (parse_flag & libvlc_media_no_skip)

-        parse_scope |= META_REQUEST_OPTION_NO_SKIP;

     ret = libvlc_MetadataRequest(libvlc, item, parse_scope,

-                                 &input_preparser_callbacks, media,

+                                 &preparser_callbacks, media,

                                  timeout, media);

     if (ret != VLC_SUCCESS)

     {

​

@@ -108,7 +108,8 @@

     libvlc_picture_t *pic = malloc( sizeof( *pic ) );

     if ( unlikely( pic == NULL ) )

         return NULL;

-    pic->converted = malloc( sizeof( *pic->converted ) );

+    pic->converted = block_New(&block_cbs, attachment->p_data,

+                               attachment->i_data);

     if ( unlikely( pic->converted == NULL ) )

     {

         free(pic);

@@ -117,8 +118,6 @@

     vlc_atomic_rc_init( &pic->rc );

     pic->attachment = vlc_input_attachment_Hold( attachment );

     pic->time = VLC_TICK_INVALID;

-    block_Init( pic->converted, &block_cbs, attachment->p_data,

-                attachment->i_data);

     video_format_Init( &pic->fmt, fcc );

     switch ( fcc )

     {

​

@@ -173,6 +173,8 @@

 if intl_dep.found()

     cdata.set('HAVE_GETTEXT', 1)