rpm/vlc
SHA256
1
0
Fork 0
forked from pool/vlc
Code Pull Requests Activity

Accepting request 1038057 from multimedia:libs

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1038057
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vlc?expand=0&rev=130
This commit is contained in:
Dominique Leuenberger 2022-11-25 13:08:13 +00:00 committed by Git OBS Bridge
commit 71a71fe72a
10 changed files with 60 additions and 1811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1506
867.patch
View File

File diff suppressed because it is too large Load Diff

3
vlc-3.0.17.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133
size 26567148

6
vlc-3.0.17.4.tar.xz.asc
View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCYl5PrwAKCRBxgHE75Y0a
3KysAKChxVGs1OfgOWnNhgMXfcmOAQL/cwCaA1UZsSUAXP6NdDnW+IzbDuQMG4I=
=HyZW
-----END PGP SIGNATURE-----

3
vlc-3.0.18.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57094439c365d8aa8b9b41fa3080cc0eef2befe6025bb5cef722accc625aedec
size 26631372

6
vlc-3.0.18.tar.xz.asc Normal file
View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRl98a0IGvQV6frc3hxgHE75Y0a3AUCY2p88AAKCRBxgHE75Y0a
3NVXAJ9KEpkaxZlPKUulzGU2vmtStRmR5ACfVFOOv1Upi/l53AFRtvmxF5DrFE4=
=OQPo
-----END PGP SIGNATURE-----

99
vlc-caca-fix-to-0-99-beta20-version.patch
View File

@ -1,99 +0,0 @@
Index: vlc-3.0.17.4/modules/video_output/caca.c
===================================================================
--- vlc-3.0.17.4.orig/modules/video_output/caca.c
+++ vlc-3.0.17.4/modules/video_output/caca.c
@@ -74,9 +74,9 @@ static void Place(vout_display_t *, vout
/* */
struct vout_display_sys_t {
- cucul_canvas_t *cv;
+ caca_canvas_t *cv;
caca_display_t *dp;
- cucul_dither_t *dither;
+ caca_dither_t *dither;
picture_pool_t *pool;
vout_display_event_thread_t *et;
@@ -153,9 +153,9 @@ static int Open(vlc_object_t *object)
if (!sys)
goto error;
- sys->cv = cucul_create_canvas(0, 0);
+ sys->cv = caca_create_canvas(0, 0);
if (!sys->cv) {
- msg_Err(vd, "cannot initialize libcucul");
+ msg_Err(vd, "cannot initialize libcaca");
goto error;
}
@@ -209,11 +209,11 @@ error:
if (sys->pool)
picture_pool_Release(sys->pool);
if (sys->dither)
- cucul_free_dither(sys->dither);
+ caca_free_dither(sys->dither);
if (sys->dp)
caca_free_display(sys->dp);
if (sys->cv)
- cucul_free_canvas(sys->cv);
+ caca_free_canvas(sys->cv);
free(sys);
}
@@ -235,9 +235,9 @@ static void Close(vlc_object_t *object)
if (sys->pool)
picture_pool_Release(sys->pool);
if (sys->dither)
- cucul_free_dither(sys->dither);
+ caca_free_dither(sys->dither);
caca_free_display(sys->dp);
- cucul_free_canvas(sys->cv);
+ caca_free_canvas(sys->cv);
#if defined(_WIN32)
FreeConsole();
@@ -266,7 +266,7 @@ static void Prepare(vout_display_t *vd,
if (!sys->dither) {
/* Create the libcaca dither object */
- sys->dither = cucul_create_dither(32,
+ sys->dither = caca_create_dither(32,
vd->source.i_visible_width,
vd->source.i_visible_height,
picture->p[0].i_pitch,
@@ -284,12 +284,12 @@ static void Prepare(vout_display_t *vd,
vout_display_place_t place;
Place(vd, &place);
- cucul_set_color_ansi(sys->cv, CUCUL_COLOR_DEFAULT, CUCUL_COLOR_BLACK);
- cucul_clear_canvas(sys->cv);
+ caca_set_color_ansi(sys->cv, CACA_DEFAULT, CACA_BLACK);
+ caca_clear_canvas(sys->cv);
const int crop_offset = vd->source.i_y_offset * picture->p->i_pitch +
vd->source.i_x_offset * picture->p->i_pixel_pitch;
- cucul_dither_bitmap(sys->cv, place.x, place.y,
+ caca_dither_bitmap(sys->cv, place.x, place.y,
place.width, place.height,
sys->dither,
&picture->p->p_pixels[crop_offset]);
@@ -328,7 +328,7 @@ static int Control(vout_display_t *vd, i
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
if (sys->dither)
- cucul_free_dither(sys->dither);
+ caca_free_dither(sys->dither);
sys->dither = NULL;
return VLC_SUCCESS;
@@ -366,8 +366,8 @@ static void Place(vout_display_t *vd, vo
vout_display_PlacePicture(place, &vd->source, vd->cfg, false);
- const int canvas_width = cucul_get_canvas_width(sys->cv);
- const int canvas_height = cucul_get_canvas_height(sys->cv);
+ const int canvas_width = caca_get_canvas_width(sys->cv);
+ const int canvas_height = caca_get_canvas_height(sys->cv);
const int display_width = caca_get_display_width(sys->dp);
const int display_height = caca_get_display_height(sys->dp);

148
vlc-dav1d-1.0.patch
View File

@ -1,148 +0,0 @@
From 2202c892c8dc1381b596c53c2ebd3ca680061f95 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Fri, 18 Mar 2022 11:42:49 +0100
Subject: [PATCH] dav1d: fix compilation with (upcoming) dav1d 1.0
(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited)
edited:
- 3.0 has the 128 pixels padding elsewhere
- 3.0 has an extra parameter for add_integer_with_range()
- 3.0 was setting i_extra_picture_buffers further down in the code
- 3.0 uses 16 threads max
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
---
modules/codec/dav1d.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
index 039165f52ec..cfabbc27cb3 100644
--- a/modules/codec/dav1d.c
+++ b/modules/codec/dav1d.c
@@ -63,10 +63,16 @@ vlc_module_begin ()
set_category(CAT_INPUT)
set_subcategory(SUBCAT_INPUT_VCODEC)
+#if DAV1D_API_VERSION_MAJOR >= 6
+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
+#else
add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
+#endif
vlc_module_end ()
/*****************************************************************************
@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this)
return VLC_ENOMEM;
dav1d_default_settings(&p_sys->s);
+#if DAV1D_API_VERSION_MAJOR >= 6
+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
+ if (p_sys->s.n_threads == 0)
+ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
+#else
p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
if (p_sys->s.n_tile_threads == 0)
p_sys->s.n_tile_threads =
@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this)
p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
if (p_sys->s.n_frame_threads == 0)
p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
+#endif
p_sys->s.allocator.cookie = dec;
p_sys->s.allocator.alloc_picture_callback = NewPicture;
p_sys->s.allocator.release_picture_callback = FreePicture;
@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this)
return VLC_EGENERIC;
}
+#if DAV1D_API_VERSION_MAJOR >= 6
+ msg_Dbg(p_this, "Using dav1d version %s with %d threads",
+ dav1d_version(), p_sys->s.n_threads);
+
+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
+#else
msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
+#endif
+
dec->pf_decode = Decode;
dec->pf_flush = FlushDecoder;
- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
--
GitLab
From d38ddd7270ffaea705981b6a48086778850d3c96 Mon Sep 17 00:00:00 2001
From: Steve Lhomme <robux4@ycbcr.xyz>
Date: Mon, 21 Mar 2022 15:53:52 +0100
Subject: [PATCH] dav1d: limit the number of extra frames needed by the decoder
The i_extra_picture_buffers is used to add pictures to the pool that the core
will allocate. dav1d is actually using n_threads frames. And the core is
allocating 10 frames per default for AV1. So we need to add the missing ones.
(cherry picked from commit a32031dc0f5f32083fc54a21397bce732742ccbe) (rebased)
rebased:
- the code dav1d 1.0.0 in 3.0 uses different max versions
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
---
modules/codec/dav1d.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
index cfabbc27cb3..8a439ce4ff4 100644
--- a/modules/codec/dav1d.c
+++ b/modules/codec/dav1d.c
@@ -304,7 +304,28 @@ static int OpenDecoder(vlc_object_t *p_this)
p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
if (p_sys->s.n_threads == 0)
p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
-#else
+
+#if DAV1D_API_VERSION_MAJOR > 6 || DAV1D_API_VERSION_MINOR >= 7
+ // after dav1d 1.0.0
+ p_sys->s.max_frame_delay = dav1d_get_frame_delay( &p_sys->s );
+#else // 1.0.0
+ // corresponds to c->n_fc when max_frame_delay is 0 in dav1d 1.0.0
+ static const uint8_t fc_lut[49] = {
+ 1, /* 1 */
+ 2, 2, 2, /* 2- 4 */
+ 3, 3, 3, 3, 3, /* 5- 9 */
+ 4, 4, 4, 4, 4, 4, 4, /* 10-16 */
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, /* 17-25 */
+ 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, /* 26-36 */
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, /* 37-49 */
+ };
+ if (p_sys->s.n_threads >= 50)
+ p_sys->s.max_frame_delay = 8;
+ else
+ p_sys->s.max_frame_delay = fc_lut[p_sys->s.n_threads - 1];
+#endif
+
+#else // before dav1d 1.0.0
p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
if (p_sys->s.n_tile_threads == 0)
p_sys->s.n_tile_threads =
@@ -329,7 +350,7 @@ static int OpenDecoder(vlc_object_t *p_this)
msg_Dbg(p_this, "Using dav1d version %s with %d threads",
dav1d_version(), p_sys->s.n_threads);
- dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
+ dec->i_extra_picture_buffers = p_sys->s.max_frame_delay;
#else
msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
--
GitLab

31
vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch
View File

@ -1,31 +0,0 @@
Index: vlc-3.0.16/modules/access/live555.cpp
===================================================================
--- vlc-3.0.16.orig/modules/access/live555.cpp
+++ vlc-3.0.16/modules/access/live555.cpp
@@ -59,6 +59,7 @@
#include <liveMedia.hh>
#include <liveMedia_version.hh>
#include <Base64.hh>
+#include <NetAddress.hh>
extern "C" {
#include "../access/mms/asf.h" /* Who said ugly ? */
@@ -730,6 +731,8 @@ static int SessionsSetup( demux_t *p_dem
const char *p_sess_lang = NULL;
const char *p_lang;
+ struct sockaddr_storage addr;
+
b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
var_GetBool( p_demux, "rtsp-http" );
i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
@@ -852,7 +855,8 @@ static int SessionsSetup( demux_t *p_dem
if( !p_sys->b_multicast )
{
/* We need different rollover behaviour for multicast */
- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
+ sub->getConnectionEndpointAddress( addr );
+ p_sys->b_multicast = IsMulticastAddress( addr );
}
tk = (live_track_t*)malloc( sizeof( live_track_t ) );

51
vlc.changes
View File

@ -1,7 +1,56 @@
-------------------------------------------------------------------
Fri Nov 25 07:17:41 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 3.0.18:
+ macOS: Fix audio device listing with non-latin names.
+ Misc: Fix rendering and performance issue with older GPUs.
+ Updated translations.
- Changes from version 3.0.18-rc2:
+ Codec/Demux:
- Add support for Y16 chroma.
- Fix build of gme plugin.
+ Lua:
- Fix script for vocaroo.
- Fix script for youtube to allow throttled playback.
+ Service Discovery: Fix UPnP regression on Windows.
+ Video Output: Fix video placement with caopengllayer.
+ Misc: Fix password search in kwallet module.
- Changes from version 3.0.18-rc:
+ Demux:
- Major adaptive streaming update, notably for multiple
timelies and webvtt.
- Fix seeking with some fragmented MP4 files.
- Add support for DVBSub inside MKV.
- Fix some Flac files that could not be played.
- Improve seeking in Ogg files.
+ Decoders:
- Fix DxVA/D3D11 crashes on HEVC files with bogus references.
- Fix libass storage size and crash.
- Fix decoding errors on macOS hw decoding on some HEVC files.
+ Video Output:
- Fix color regression with VAAPI/iOS and OpenGL output.
- Fix some resizing issues with OpenGL on GLX/EGL/X11/XV.
- Fix Direct3d9 texture stretching.
- Fix 10-bit accelerated video filters on macOS.
+ Playlist: Avoid playlist liveloop on failed/tiny items
(temporize EOS bursts).
+ Misc:
- Misc fixes for the extension UI on macOS.
- Improve SMBv1 and SMBv2 behaviours.
- Improve FTP compatibility.
- Support RISC-V.
- Fix AVI muxing for Windows Media Player compatibility.
- Fix seeking speed on macOS.
- Drop vlc-dav1d-1.0.patch and 867.patch: fixed upstream.
- Drop vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch:
fixed upstream (commit 05445b74).
- Drop vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch:
fixed upstream (commit b689202d).
-------------------------------------------------------------------
Thu Nov 17 10:55:57 UTC 2022 - Valentin Lefebvre <valentin.lefebvre@suse.com>
- add vlc-caca-fix-to-0-99-beta20-version.patch: build with libcaca-0.99.beta20
- add vlc-caca-fix-to-0-99-beta20-version.patch: build with libcaca-0.99.beta20
-------------------------------------------------------------------
Tue Nov 8 14:49:10 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>

18
vlc.spec
View File

@ -33,7 +33,7 @@
%bcond_with faad
%bcond_with fdk_aac
Name: vlc
Version: 3.0.17.4
Version: 3.0.18
Release: 0
Summary: Graphical media player
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@ -49,19 +49,12 @@ Patch0: vlc.a52.patch
Patch1: vlc-allow-deprecated-fribidi.patch
# PATCH-FIX-UPSTREAM vlc-lua-5.3.patch dimstar@opensuse.org -- Replace lua_optlong with lua_optinteger
Patch2: vlc-lua-5.3.patch
Patch3: 867.patch
# PATCH-FIX-UPSTREAM fix-build-with-fdk-2.0.patch -- Fix building vlc with libfdk-aac v2
Patch4: fix-build-with-fdk-2.0.patch
# PATCH-FIX-UPSTREAM vlc-dav1d-1.0.patch -- Fix build with dav1d 1.0
Patch5: vlc-dav1d-1.0.patch
# PATCH-FEATURE-OPENSUSE vlc-projectM-qt5.patch -- Build against projectM-qt5; openSUSE provides projectM as -qt and -qt5 variant
Patch100: vlc-projectM-qt5.patch
# PATCH-FIX-UPSTREAM -- Use OpenCV C++ API
Patch103: 0001-Port-OpenCV-facedetect-example-to-C-API.patch
# PATCH-FIX-UPSTREAM https://trac.videolan.org/vlc/ticket/25473 dominic.mayers@meditationstudies.org -- The maintainers of live555 changed connectionEndpointAddresss to getConnectionEndpointAddress, which now provides the address value by reference.
Patch107: vlc-get-addr-by-ref-from-getConnectionEndpointAddress.patch
# PATCH-FIX-UPSTREAM vlc-caca-fix-to-0-99-beta20-version.patch -- Migrate to new API of libcaca in v0.99.beta20
Patch108: vlc-caca-fix-to-0-99-beta20-version.patch
BuildRequires: Mesa-devel
BuildRequires: aalib-devel
BuildRequires: alsa-devel >= 1.0.24
@ -409,23 +402,14 @@ OpenCV based video filters and a face detection example.
%patch0 -p1
%patch1 -p1
%patch4 -p1
%patch5 -p1
%if 0%{?suse_version} > 1320 && 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200
%patch100 -p1
%endif
%patch103 -p1
### Since live555-2020.12.11, connectionEndpointAddress() member function
### use a "struct sockaddr_storage" in preparation for eventual support of IPv6:
### http://www.live555.com/liveMedia/public/changelog.txt
if pkg-config --atleast-version 2020.12.11 live555; then
%patch107 -p1
fi
%patch108 -p1
### And LUA 5.3.1 has some more API changes
if pkg-config --atleast-version 5.3.1 lua; then
%patch2 -p1
%patch3 -p1
fi
# We do not rely on contrib but make use of system libraries