[vlc-commits] Use new libvlc media API
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Tue Jun
21 16:07:15 2022 +0200| [737bf3b757d8bada84699306fd148ae45fa01627] | committer:
Hugo Beauzée-Luyssen
Use new libvlc media API
> https://code.videolan.org/videolan/npapi-vlc/commit/737bf3b757d8bada84699306fd148ae45fa01627
---
common/vlc_player.cpp | 4 ++--
vlcpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/vlc_player.cpp b/common/vlc_player.cpp
index 500f48c..77c84e6 100644
--- a/common/vlc_player.cpp
+++ b/common/vlc_player.cpp
@@ -57,7 +57,7 @@ int vlc_player::add_item(const char * mrl, unsigned int optc,
const char **optv)
{
VLC::Media media;
try {
-media = VLC::Media( _libvlc_instance, mrl, VLC::Media::FromLocation );
+media = VLC::Media( mrl, VLC::Media::FromLocation );
}
catch ( std::runtime_error& ) {
return -1;
@@ -123,7 +123,7 @@ int vlc_player::preparse_item_sync(unsigned int idx, int
options, unsigned int t
SetEvent( barrier );
});
-media->parseWithOptions( VLC::Media::ParseFlags( options ), timeout );
+media->parseRequest( _libvlc_instance, VLC::Media::ParseFlags( options ),
timeout );
DWORD waitResult = WaitForSingleObject( barrier, INFINITE );
switch ( waitResult ) {
diff --git a/vlcpp b/vlcpp
index 42b58a1..0c7d396 16
--- a/vlcpp
+++ b/vlcpp
@@ -1 +1 @@
-Subproject commit 42b58a17ab8aa0e1d30ec358d03d5ba6ca32efb7
+Subproject commit 0c7d3968010f1b27b36e78c11e07e4d7f6fe756b
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump CI images
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Tue Jun 21 16:13:53 2022 +0200| [228dacb8332e1243a7bc255b3afca234348c4985] | committer: Hugo Beauzée-Luyssen Bump CI images > https://code.videolan.org/videolan/npapi-vlc/commit/228dacb8332e1243a7bc255b3afca234348c4985 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94a2fb1..e496817 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: normal - WIN32_IMAGE: registry.videolan.org/medialibrary-win32:20220502075714 - WIN64_IMAGE: registry.videolan.org/medialibrary-win64:20220616131601 + WIN32_IMAGE: registry.videolan.org/medialibrary-win32:20220620092626 + WIN64_IMAGE: registry.videolan.org/medialibrary-win64:20220620085314 PKG_CONFIG_LIBDIR: /prefix/lib/pkgconfig .common_build: ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Add a minimal CI
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Tue Jun 21 15:21:03 2022 +0200| [eb252ce9237b82360e6f930fa1e77794271f3855] | committer: Hugo Beauzée-Luyssen Add a minimal CI > https://code.videolan.org/videolan/npapi-vlc/commit/eb252ce9237b82360e6f930fa1e77794271f3855 --- .gitlab-ci.yml | 29 + 1 file changed, 29 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000..94a2fb1 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,29 @@ +variables: + GIT_SUBMODULE_STRATEGY: normal + WIN32_IMAGE: registry.videolan.org/medialibrary-win32:20220502075714 + WIN64_IMAGE: registry.videolan.org/medialibrary-win64:20220616131601 + PKG_CONFIG_LIBDIR: /prefix/lib/pkgconfig + +.common_build: + rules: +- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' +- if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH@videolan/npapi-vlc"' + tags: +- docker +- amd64 + script: +- ./autogen.sh +- ./configure --host=$ARCH-w64-mingw32 --disable-shared +- make -j4 + +build-win32: + extends: .common_build + image: $WIN32_IMAGE + variables: +ARCH: i686 + +build-win64: + extends: .common_build + image: $WIN64_IMAGE + variables: +ARCH: x86_64 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump vlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Mon May 2 09:14:37 2022 +0200| [1019b05f79989d309ab382230c2e5e3a5223803e] | committer: Hugo Beauzée-Luyssen Bump vlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/1019b05f79989d309ab382230c2e5e3a5223803e --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index acb78a2..42b58a1 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit acb78a24d95029f7b4a5e5e68cbf464bbc76c63d +Subproject commit 42b58a17ab8aa0e1d30ec358d03d5ba6ca32efb7 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump vlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Wed Mar 16 14:07:27 2022 +0100| [d3f2ef1eba1e86ac9ec143f42717b15df773ba07] | committer: Hugo Beauzée-Luyssen Bump vlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/d3f2ef1eba1e86ac9ec143f42717b15df773ba07 --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index 3f6cc93..acb78a2 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 3f6cc938c237bd3be79e66bbe8400f8b62a7ad50 +Subproject commit acb78a24d95029f7b4a5e5e68cbf464bbc76c63d ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Use onStopping instead of onEndReached
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Mon Mar
14 08:59:56 2022 +0100| [390dcb0f14c9715c02f5763a316415c8dc887475] | committer:
Hugo Beauzée-Luyssen
Use onStopping instead of onEndReached
> https://code.videolan.org/videolan/npapi-vlc/commit/390dcb0f14c9715c02f5763a316415c8dc887475
---
activex/plugin.cpp | 2 +-
common/win32_fullscreen.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 80cca1a..4a70dae 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -1421,7 +1421,7 @@ void VLCPlugin::player_register_events()
em.onBackward([this] {
fireOnMediaPlayerBackwardEvent();
});
-em.onEndReached([this] {
+em.onStopping([this] {
fireOnMediaPlayerEndReachedEvent();
});
em.onEncounteredError([this] {
diff --git a/common/win32_fullscreen.cpp b/common/win32_fullscreen.cpp
index d94d552..79851f3 100644
--- a/common/win32_fullscreen.cpp
+++ b/common/win32_fullscreen.cpp
@@ -421,7 +421,7 @@ void VLCControlsWnd::RegisterToVLCEvents()
PostMessage(hVideoPosScroll, (UINT) PBM_SETPOS, (WPARAM)0, 0);
});
-VP()->get_mp().eventManager().onEndReached([this] {
+VP()->get_mp().eventManager().onStopping([this] {
PostMessage(hPlayPauseButton, BM_SETIMAGE, (WPARAM) IMAGE_BITMAP,
(LPARAM) RC().hPlayBitmap);
PostMessage(hVideoPosScroll, (UINT) PBM_SETPOS, (WPARAM)0, 0);
});
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump vlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Mon Mar 14 08:47:52 2022 +0100| [e21e570fde199b3b21604615fd1c97cd23b6b7cf] | committer: Hugo Beauzée-Luyssen Bump vlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/e21e570fde199b3b21604615fd1c97cd23b6b7cf --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index 2ac1809..3f6cc93 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 2ac1809f626d25200f731d857fc1b2f354e20de6 +Subproject commit 3f6cc938c237bd3be79e66bbe8400f8b62a7ad50 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump vlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Wed Feb 9 10:00:59 2022 +0100| [30495ce30903fe6db7aa64f9a1671096ac5f0f05] | committer: Hugo Beauzée-Luyssen Bump vlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/30495ce30903fe6db7aa64f9a1671096ac5f0f05 --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index 833d14a..7810bd1 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 833d14aaa1eb8ead8f754d57665f01a6e77b4e07 +Subproject commit 7810bd1317c1f24f3bb14963616a974a265983ce ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump vlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Tue Feb 8 09:29:03 2022 +0100| [7e6151f5251a048e5fce6f8fe624739c726d7bc2] | committer: Hugo Beauzée-Luyssen Bump vlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/7e6151f5251a048e5fce6f8fe624739c726d7bc2 --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index 4ac2be9..833d14a 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 4ac2be9c5a9ae83dfba5fa605400491310ca2279 +Subproject commit 833d14aaa1eb8ead8f754d57665f01a6e77b4e07 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.16
Hugo Beauzée-Luyssen pushed new tag 3.0.16 at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.16 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] Update NEWS
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC Commits: 5e70837d by Hugo Beauzée-Luyssen at 2021-06-18T17:39:50+02:00 Update NEWS - - - - - 1 changed file: - NEWS Changes: = NEWS = @@ -4,6 +4,9 @@ Changes between 3.0.15 and 3.0.16: Video Output: * Fix a D3D11 crash on Windows 8/8.1 +Access: + * Fix RTSP server timeout handling + Interfaces: * macOS: Add touchbar support View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5e70837d8d766db6ca5052a2d4f503ad37243d9c -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5e70837d8d766db6ca5052a2d4f503ad37243d9c You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: Update NEWS
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC Commits: 8f4f4b19 by Hugo Beauzée-Luyssen at 2021-06-16T10:24:18+02:00 Update NEWS - - - - - e43321ef by Hugo Beauzée-Luyssen at 2021-06-16T10:24:18+02:00 On the road to 3.0.16 - - - - - 2 changed files: - NEWS - configure.ac Changes: = NEWS = @@ -1,3 +1,15 @@ +Changes between 3.0.15 and 3.0.16: +-- + +Video Output: + * Fix a D3D11 crash on Windows 8/8.1 + +Interfaces: + * macOS: Add touchbar support + +Misc + * Multiple settings improvements + Changes between 3.0.14 and 3.0.15: -- = configure.ac = @@ -2,10 +2,10 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2021 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.15) +AC_INIT(vlc, 3.0.16) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=15 +VERSION_REVISION=16 VERSION_EXTRA=0 VERSION_DEV= View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2d5997118d7f0078827682c3dca155235ecf1454...e43321ef93adc41a67632c86182c086281ab4848 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/2d5997118d7f0078827682c3dca155235ecf1454...e43321ef93adc41a67632c86182c086281ab4848 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.15
Hugo Beauzée-Luyssen pushed new tag 3.0.15 at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.15 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] Update NEWS
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC Commits: d3094196 by Hugo Beauzée-Luyssen at 2021-06-08T15:54:31+02:00 Update NEWS - - - - - 1 changed file: - NEWS Changes: = NEWS = @@ -1,6 +1,12 @@ Changes between 3.0.14 and 3.0.15: -- +Core: + * Add Opus & Alac wave format mappings + +Access: + * Fix opening DVD folders with non-ascii characters + Demux: * Fix asf regression with broadcast streams * MP4: Fix audio drop on seek View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d3094196acd53fe8c231cb90e067d2f99c4b7d00 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d3094196acd53fe8c231cb90e067d2f99c4b7d00 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] CI: Target 3.0.x branch instead of the old dedicated repo
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC Commits: d2f26a21 by Hugo Beauzée-Luyssen at 2021-06-08T14:23:05+02:00 CI: Target 3.0.x branch instead of the old dedicated repo - - - - - 1 changed file: - extras/ci/gitlab-ci.yml Changes: = extras/ci/gitlab-ci.yml = @@ -75,7 +75,7 @@ variables: only: refs: - merge_requests -- master@videolan/vlc-3.0 +- 3.0.x@videolan/vlc except: - schedules artifacts: View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d2f26a210ca7e4f193d4c2847164b72598cec1ee -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/d2f26a210ca7e4f193d4c2847164b72598cec1ee You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: access: libdvdread 6.1.2 supports UTF-8 paths in Windows.
Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC
Commits:
02b784c0 by Petri Hintukainen at 2021-06-08T12:01:31+02:00
access: libdvdread 6.1.2 supports UTF-8 paths in Windows.
(cherry picked from commit 262b546066c6fde1458beb467966bbc1972a24d8)
Signed-off-by: Hugo Beauzée-Luyssen h...@beauzee.fr
- - - - -
7516a4f4 by Jean-Baptiste Kempf at 2021-06-08T12:30:49+02:00
iso-639: add iw old code for hebrew for old DVDs
Close #23602
(cherry picked from commit e411f5f993489616229ef9f4a8803ff298c5ea26)
Signed-off-by: Hugo Beauzée-Luyssen h...@beauzee.fr
- - - - -
3 changed files:
- modules/access/dvdnav.c
- modules/access/dvdread.c
- src/text/iso-639_def.h
Changes:
=
modules/access/dvdnav.c
=
@@ -371,7 +371,14 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
goto bailout;
/* Open dvdnav */
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
+/* In libdvdread prior to 6.1.2, UTF8 is not supported for windows and
+ * requires a prior conversion.
+ * For non win32/os2 platforms, this is just a no-op */
psz_path = ToLocale( psz_file );
+#else
+psz_path = psz_file;
+#endif
#if DVDNAV_VERSION >= 60100
dvdnav_logger_cb cbs;
cbs.pf_log = DvdNavLog;
@@ -390,8 +397,10 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
bailout:
free( psz_file );
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
if( psz_path )
LocaleFree( psz_path );
+#endif
return i_ret;
}
=
modules/access/dvdread.c
=
@@ -212,7 +212,14 @@ static int Open( vlc_object_t *p_this )
}
/* Open dvdread */
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
+/* In libdvdread prior to 6.1.2, UTF8 is not supported for windows and
+ * requires a prior conversion.
+ * For non win32/os2 platforms, this is just a no-op */
const char *psz_path = ToLocale( psz_file );
+#else
+const char *psz_path = psz_file;
+#endif
#if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
dvd_logger_cb cbs;
cbs.pf_log = DvdReadLog;
@@ -220,7 +227,9 @@ static int Open( vlc_object_t *p_this )
#else
dvd_reader_t *p_dvdread = DVDOpen( psz_path );
#endif
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
LocaleFree( psz_path );
+#endif
if( p_dvdread == NULL )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
=
src/text/iso-639_def.h
=
@@ -99,6 +99,7 @@ static const iso639_lang_t p_languages[] =
{ N_( "Indonesian" ), "id", "ind", "ind" },
{ N_( "Inupiaq" ),"ik", "ipk", "ipk" },
{ N_( "Italian" ),"it", "ita", "ita" },
+{ N_( "Hebrew" ), "iw", "heb", "heb" },
{ N_( "Javanese" ), "jv", "jaw", "jav" },
{ N_( "Japanese" ), "ja", "jpn", "jpn" },
{ N_( "Greenlandic, Kalaallisut" ), "kl", "kal", "kal" },
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/e30973a45e8c4f075cf5a6094f500cd3100665f5...7516a4f4103012f98596cf251d5ee9b5ab00b421
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/e30973a45e8c4f075cf5a6094f500cd3100665f5...7516a4f4103012f98596cf251d5ee9b5ab00b421
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] iso-639: add iw old code for hebrew for old DVDs
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
e411f5f9 by Jean-Baptiste Kempf at 2021-06-08T09:55:40+00:00
iso-639: add iw old code for hebrew for old DVDs
Close #23602
- - - - -
1 changed file:
- src/text/iso-639_def.h
Changes:
=
src/text/iso-639_def.h
=
@@ -98,6 +98,7 @@ static const iso639_lang_t p_languages[] =
{ N_( "Indonesian" ), "id", "ind", "ind" },
{ N_( "Inupiaq" ),"ik", "ipk", "ipk" },
{ N_( "Italian" ),"it", "ita", "ita" },
+{ N_( "Hebrew" ), "iw", "heb", "heb" },
{ N_( "Javanese" ), "jv", "jaw", "jav" },
{ N_( "Japanese" ), "ja", "jpn", "jpn" },
{ N_( "Greenlandic, Kalaallisut" ), "kl", "kal", "kal" },
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e411f5f993489616229ef9f4a8803ff298c5ea26
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/e411f5f993489616229ef9f4a8803ff298c5ea26
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] access: libdvdread 6.1.2 supports UTF-8 paths in Windows.
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
262b5460 by Petri Hintukainen at 2021-06-08T09:54:47+00:00
access: libdvdread 6.1.2 supports UTF-8 paths in Windows.
- - - - -
2 changed files:
- modules/access/dvdnav.c
- modules/access/dvdread.c
Changes:
=
modules/access/dvdnav.c
=
@@ -420,7 +420,14 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
goto bailout;
/* Open dvdnav */
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
+/* In libdvdread prior to 6.1.2, UTF8 is not supported for windows and
+ * requires a prior conversion.
+ * For non win32/os2 platforms, this is just a no-op */
psz_path = ToLocale( psz_file );
+#else
+psz_path = psz_file;
+#endif
#if DVDNAV_VERSION >= 60100
dvdnav_logger_cb cbs = { .pf_log = DvdNavLog };
if( dvdnav_open2( _dvdnav, p_demux, , psz_path ) !=
DVDNAV_STATUS_OK )
@@ -438,8 +445,10 @@ static int AccessDemuxOpen ( vlc_object_t *p_this )
bailout:
free( psz_file );
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
if( psz_path )
LocaleFree( psz_path );
+#endif
return i_ret;
}
=
modules/access/dvdread.c
=
@@ -202,14 +202,23 @@ static int Open( vlc_object_t *p_this )
}
/* Open dvdread */
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
+/* In libdvdread prior to 6.1.2, UTF8 is not supported for windows and
+ * requires a prior conversion.
+ * For non win32/os2 platforms, this is just a no-op */
const char *psz_path = ToLocale( psz_file );
+#else
+const char *psz_path = psz_file;
+#endif
#if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
dvd_logger_cb cbs = { .pf_log = DvdReadLog };
dvd_reader_t *p_dvdread = DVDOpen2( p_demux, , psz_path );
#else
dvd_reader_t *p_dvdread = DVDOpen( psz_path );
#endif
+#if DVDREAD_VERSION < DVDREAD_VERSION_CODE(6, 1, 2)
LocaleFree( psz_path );
+#endif
if( p_dvdread == NULL )
{
msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/262b546066c6fde1458beb467966bbc1972a24d8
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/262b546066c6fde1458beb467966bbc1972a24d8
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] uikit-inhibit: fix threading issue
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
3c23501e by Alexandre Janniaux at 2021-06-05T14:28:58+00:00
uikit-inhibit: fix threading issue
The UIKit functions must be called from the main thread, whereas the
functions from the inhibiter can be called from the vout thread. It
didnt seem to have any consequence on iPad, or the testing I did was
not triggering the crash, but its leading to a crash on tvOS when
running with VLCKit.
- - - - -
1 changed file:
- modules/misc/inhibit/uikit-inhibit.m
Changes:
=
modules/misc/inhibit/uikit-inhibit.m
=
@@ -34,8 +34,10 @@
static void UpdateInhibit(vlc_inhibit_t *ih, unsigned mask)
{
-[UIApplication sharedApplication].idleTimerDisabled =
-(mask & VLC_INHIBIT_DISPLAY) == VLC_INHIBIT_DISPLAY;
+dispatch_async(dispatch_get_main_queue(), ^{
+[UIApplication sharedApplication].idleTimerDisabled =
+(mask & VLC_INHIBIT_DISPLAY) == VLC_INHIBIT_DISPLAY;
+});
}
static int OpenInhibit(vlc_object_t *obj)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/3c23501ed48b215fe1c14aac64adbda03f0381bd
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/3c23501ed48b215fe1c14aac64adbda03f0381bd
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 4 commits: libvlc-module: Remove trailing whitespace
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
48e6a427 by Hugo Beauzée-Luyssen at 2021-06-04T13:44:01+00:00
libvlc-module: Remove trailing whitespace
- - - - -
a170af4a by Hugo Beauzée-Luyssen at 2021-06-04T13:44:01+00:00
libvlc-module: Clarify restore-playback-pos option
- - - - -
4df0bd1d by Hugo Beauzée-Luyssen at 2021-06-04T13:44:01+00:00
qt: prefs: Expose restore-playback-pos instead of qt-continue
- - - - -
3b833f09 by Hugo Beauzée-Luyssen at 2021-06-04T13:44:01+00:00
qt: Deprecate qt-continue option
- - - - -
3 changed files:
- modules/gui/qt/dialogs/preferences/simple_preferences.cpp
- modules/gui/qt/qt.cpp
- src/libvlc-module.c
Changes:
=
modules/gui/qt/dialogs/preferences/simple_preferences.cpp
=
@@ -928,7 +928,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget
*_parent,
ui.recentlyPlayedFilters, setEnabled( bool ) );
ui.recentlyPlayedFilters->setEnabled( false );
CONFIG_BOOL( "qt-recentplay", saveRecentlyPlayed );
-CONFIG_GENERIC( "qt-continue", IntegerList,
ui.continuePlaybackLabel, continuePlaybackComboBox );
+CONFIG_GENERIC( "restore-playback-pos", IntegerList,
ui.continuePlaybackLabel, continuePlaybackComboBox );
CONFIG_GENERIC( "qt-recentplay-filter", String, ui.filterLabel,
recentlyPlayedFilters );
CONFIG_GENERIC( "qt-auto-raise", IntegerList, ui.autoRaiseLabel,
autoRaiseComboBox );
=
modules/gui/qt/qt.cpp
=
@@ -241,20 +241,12 @@ static void ShowDialog ( intf_thread_t *, int, int,
intf_dialog_args_t * );
#define FULLSCREEN_CONTROL_PIXELS N_( "Fullscreen controller mouse
sensitivity" )
-#define CONTINUE_PLAYBACK_TEXT N_("Continue playback?")
-
static const int i_notification_list[] =
{ NOTIFICATION_NEVER, NOTIFICATION_MINIMIZED, NOTIFICATION_ALWAYS };
static const char *const psz_notification_list_text[] =
{ N_("Never"), N_("When minimized"), N_("Always") };
-static const int i_continue_list[] =
-{ 0, 1, 2 };
-
-static const char *const psz_continue_list_text[] =
-{ N_("Never"), N_("Ask"), N_("Always") };
-
static const int i_raise_list[] =
{ MainInterface::RAISE_NEVER, MainInterface::RAISE_VIDEO, \
MainInterface::RAISE_AUDIO, MainInterface::RAISE_AUDIOVIDEO, };
@@ -310,8 +302,7 @@ vlc_module_begin ()
nullptr, false )
add_string( "qt-recentplay-filter", "",
RECENTPLAY_FILTER_TEXT, RECENTPLAY_FILTER_LONGTEXT, false )
-add_integer( "qt-continue", 1, CONTINUE_PLAYBACK_TEXT, nullptr, false )
-change_integer_list(i_continue_list, psz_continue_list_text )
+add_obsolete_integer( "qt-continue" )
#ifdef UPDATE_CHECK
add_bool( "qt-updates-notif", true, UPDATER_TEXT,
=
src/libvlc-module.c
=
@@ -199,7 +199,7 @@ static const char *const ppsz_stereo_mode_texts[] = {
N_("Unset"),
};
#define MIX_MODE_TEXT N_("Audio mix mode")
-static const int pi_mix_mode_values[] = {
+static const int pi_mix_mode_values[] = {
AOUT_MIX_MODE_UNSET, AOUT_MIX_MODE_STEREO, AOUT_MIX_MODE_BINAURAL,
AOUT_MIX_MODE_4_0, AOUT_MIX_MODE_5_1, AOUT_MIX_MODE_7_1,
};
@@ -706,7 +706,20 @@ static const char *const ppsz_prefres[] = {
"the form \"{name=bookmark-name,time=optional-time-offset," \
"bytes=optional-byte-offset},{...}\"")
-#define RESTORE_PLAYBACK_POS_TEXT N_("Continue playback?")
+#define RESTORE_PLAYBACK_POS_TEXT N_("Continue playback")
+#define RESTORE_PLAYBACK_POS_LONGTEXT N_("Should the playback resume where " \
+"it was left off?")
+
+static const int pi_restore_playback_values[] = {
+VLC_PLAYER_RESTORE_PLAYBACK_POS_NEVER,
+VLC_PLAYER_RESTORE_PLAYBACK_POS_ASK,
+VLC_PLAYER_RESTORE_PLAYBACK_POS_ALWAYS
+};
+static const char* const ppsz_restore_playback_desc[] = {
+N_( "Never resume playback where it was left off" ),
+N_( "Ask when the playback starts" ),
+N_( "Always resume playback where it was left off" ),
+};
#define RESTORE_PLAYBACK_STATE_TEXT N_("Resume last playback states")
#define RESTORE_PLAYBACK_STATE_LONGTEXT N_("This will resume the last playback
" \
@@ -1851,7 +1864,9 @@ vlc_module_begin ()
change_safe ()
add_integer( "restore-playback-pos", VLC_PLAYER_RESTORE_PLAYBACK_POS_ASK,
- RESTORE_PLAYBACK_POS_TEXT, NULL, false )
+ RESTORE_PLAYBACK_POS_TEXT, RESTORE_P
[vlc-commits] [Git][videolan/vlc][master] qml:previous button related fixes
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
851d7f33 by Huang Jie at 2021-06-04T09:48:06+00:00
qml:previous button related fixes
fixes #25780
- - - - -
1 changed file:
- modules/gui/qt/maininterface/qml/MainInterface.qml
Changes:
=
modules/gui/qt/maininterface/qml/MainInterface.qml
=
@@ -93,15 +93,14 @@ Rectangle {
function setInitialView() {
//set the initial view
-if (!mainPlaylistController.empty)
-history.push(["player"])
+var loadPlayer = !mainPlaylistController.empty;
+if (medialib)
+history.push(["mc", "video"], loadPlayer ? History.Stay :
History.Go)
else
-{
-if (medialib)
-history.push(["mc", "video"])
-else
-history.push(["mc", "home"])
-}
+history.push(["mc", "home"], loadPlayer ? History.Stay :
History.Go)
+
+if (loadPlayer)
+history.push(["player"])
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/851d7f33234385a6879cb5d45b6c57d6a34a0cda
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/851d7f33234385a6879cb5d45b6c57d6a34a0cda
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] ftp: Fix typo: connexion => connection
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
215f04e9 by Yaron Shahrabani at 2021-06-04T09:46:49+00:00
ftp: Fix typo: connexion = connection
- - - - -
2 changed files:
- modules/access/ftp.c
- modules/access/sftp.c
Changes:
=
modules/access/ftp.c
=
@@ -77,7 +77,7 @@ static void OutClose( vlc_object_t * );
#define LOGIN_DIALOG_TITLE _("FTP authentication")
#define LOGIN_DIALOG_TEXT _("Please enter a valid login and password for " \
-"the ftp connexion to %s")
+"the FTP connection to %s")
vlc_module_begin ()
set_shortname( "FTP" )
=
modules/access/sftp.c
=
@@ -420,7 +420,7 @@ static int Open( vlc_object_t* p_this )
} while( vlc_credential_get( , p_access, "sftp-user",
"sftp-pwd",
_("SFTP authentication"),
_("Please enter a valid login and password for
"
-"the sftp connexion to %s"), url.psz_host ) );
+"the SFTP connection to %s"), url.psz_host ) );
/* Create the sftp session */
p_sys->sftp_session = libssh2_sftp_init( p_sys->ssh_session );
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/215f04e9edcc87cdc51bb693172e1dd7cb99f24e
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/215f04e9edcc87cdc51bb693172e1dd7cb99f24e
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] qml: reset to last subcategory of the views
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
9181dc49 by Prince Gupta at 2021-06-04T08:38:27+00:00
qml: reset to last subcategory of the views
closes #25581
- - - - -
1 changed file:
- modules/gui/qt/maininterface/qml/MainDisplay.qml
Changes:
=
modules/gui/qt/maininterface/qml/MainDisplay.qml
=
@@ -39,9 +39,10 @@ Widgets.NavigableFocusScope {
property alias g_mainDisplay: root
property bool _inhibitMiniPlayer: false
property bool _showMiniPlayer: false
+property var _defaultPages: ({}) // saves last page of view
onViewChanged: {
-viewProperties = ({})
+viewProperties = _defaultPages[root.view] !== undefined ?
({"defaultPage": _defaultPages[root.view]}) : ({})
loadView()
}
onViewPropertiesChanged: loadView()
@@ -54,6 +55,8 @@ Widgets.NavigableFocusScope {
function loadView() {
var found = stackView.loadView(root.pageModel, root.view,
root.viewProperties)
+if (stackView.currentItem.view !== undefined)
+_defaultPages[root.view] = stackView.currentItem.view
stackView.currentItem.navigationParent = medialibId
stackView.currentItem.navigationUpItem = sourcesBanner
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9181dc49ad7ad9a182a777ef431b5e8c5c936f96
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9181dc49ad7ad9a182a777ef431b5e8c5c936f96
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] qml: fix segmentation fault on component destruction
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
f3e0752f by Fatih Uzunoglu at 2021-06-04T08:05:30+00:00
qml: fix segmentation fault on component destruction
intends to be a temporary solution for #25599, #25776.
- - - - -
1 changed file:
- modules/gui/qt/widgets/qml/KeyNavigableTableView.qml
Changes:
=
modules/gui/qt/widgets/qml/KeyNavigableTableView.qml
=
@@ -95,6 +95,35 @@ NavigableFocusScope {
Accessible.role: Accessible.Table
+function _qtAvoidSectionUpdate() {
+// Qt SEG. FAULT WORKAROUND
+
+// There exists a Qt bug that tries to access null
+// pointer while updating sections. Qt does not
+// check if
`QQmlEngine::contextForObject(sectionItem)->parentContext()`
+// is null and when it's null which might be the case for
+// views during destruction it causes segmentation fault.
+
+// As a workaround, when section delegate is set to null
+// during destruction, Qt does not proceed with updating
+// the sections so null pointer access is avoided. Updating
+// sections during destruction should not make sense anyway.
+
+// Setting section delegate to null seems to has no
+// negative impact and safely could be used as a fix.
+// However, the problem lying beneath prevails and
+// should be taken care of sooner than later.
+
+// Affected Qt versions are 5.11.3, and 5.15.2 (not
+// limited).
+
+section.delegate = null
+}
+
+Component.onDestruction: {
+_qtAvoidSectionUpdate()
+}
+
function positionViewAtIndex(index, mode) {
view.positionViewAtIndex(index, mode)
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f3e0752f50652e3af7b40ed35978b9a4d457c2f5
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/f3e0752f50652e3af7b40ed35978b9a4d457c2f5
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] configure: remove redundant PIE flags for sanitizers
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
8d47e5a8 by Marvin Scholz at 2021-06-04T07:12:50+00:00
configure: remove redundant PIE flags for sanitizers
As per the Clang documentation, some sanitizers
only work with position independent executables,
so it is implied already by the sanitizer flag:
Non-position-independent executables are not supported.
Therefore, the fsanitize=thread flag will cause Clang
to act as though the -fPIE flag had been supplied if
compiling without -fPIC, and as though the -pie flag
had been supplied if linking an executable.
https://clang.llvm.org/docs/ThreadSanitizer.html#limitations
- - - - -
1 changed file:
- configure.ac
Changes:
=
configure.ac
=
@@ -1183,14 +1183,6 @@ AS_VAR_IF(with_sanitizer, no, [], [
AX_APPEND_COMPILE_FLAGS([-fsanitize-address-use-after-scope
-fno-omit-frame-pointer -fsanitize=pointer-compare -fsanitize=pointer-subtract])
AX_APPEND_COMPILE_FLAGS([-fsanitize-address-use-after-scope
-fno-omit-frame-pointer -fsanitize=pointer-compare
-fsanitize=pointer-subtract], [CXXFLAGS])
])
-AS_IF([test -z "${with_sanitizer##*memory*}" ], [
-AX_APPEND_COMPILE_FLAGS([-fPIE -pie])
-AX_APPEND_COMPILE_FLAGS([-fPIE -pie], [CXXFLAGS])
-])
-AS_IF([test -z "${with_sanitizer##*thread*}" ], [
-AX_APPEND_COMPILE_FLAGS([-fPIE -pie])
-AX_APPEND_COMPILE_FLAGS([-fPIE -pie], [CXXFLAGS])
-])
])
dnl
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/8d47e5a8bad83ba567668f9f2c37a16b05e19faf
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/8d47e5a8bad83ba567668f9f2c37a16b05e19faf
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] contrib: harfbuzz: Don't treat -Wunused as an error, fix building with Clang 13
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Commits: 37cdeb67 by Martin Storsjö at 2021-06-03T12:41:33+00:00 contrib: harfbuzz: Dont treat -Wunused as an error, fix building with Clang 13 This fixes building with the very latest nightly of Clang. - - - - - 2 changed files: - + contrib/src/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch - contrib/src/harfbuzz/rules.mak Changes: = contrib/src/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch = @@ -0,0 +1,47 @@ +From 130296d079a65b26b15acb9d0a69ef9497fad701 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= +Date: Wed, 2 Jun 2021 09:49:24 +0300 +Subject: [PATCH 4/4] Don't treat -Wunused as an error + +This is a fragile warning - newer compilers can add warnings to cases +that weren't there before. + +Clang 13 got support for the -Wunused-but-set-variable warning, which +gets enabled implicitly via -Wunused, and it warns on one variable +like this: + +hb-subset-cff1.cc:405:33: error: variable 'supp_size' set but not used [-Werror, +-Wunused-but-set-variable] +unsigned int size0, size1, supp_size; +^ +--- + src/hb.hh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/hb.hh b/src/hb.hh +index e46aa0b6e..b0beaaa81 100644 +--- a/src/hb.hh b/src/hb.hh +@@ -86,10 +86,8 @@ + #pragma GCC diagnostic error "-Wswitch-enum" + #pragma GCC diagnostic error "-Wtautological-overlap-compare" + #pragma GCC diagnostic error "-Wunneeded-internal-declaration" +-#pragma GCC diagnostic error "-Wunused" + #pragma GCC diagnostic error "-Wunused-local-typedefs" + #pragma GCC diagnostic error "-Wunused-value" +-#pragma GCC diagnostic error "-Wunused-variable" + #pragma GCC diagnostic error "-Wvla" + #pragma GCC diagnostic error "-Wwrite-strings" + #endif +@@ -107,6 +105,8 @@ + #pragma GCC diagnostic warning "-Wmaybe-uninitialized" + #pragma GCC diagnostic warning "-Wmissing-format-attribute" + #pragma GCC diagnostic warning "-Wundef" ++#pragma GCC diagnostic warning "-Wunused" ++#pragma GCC diagnostic warning "-Wunused-variable" + #endif + + /* Ignored currently, but should be fixed at some point. */ +-- +2.25.1 + = contrib/src/harfbuzz/rules.mak = @@ -17,6 +17,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.xz .sum-harfbuzz $(APPLY) $(SRC)/harfbuzz/0001-fix-OSAtomic-calls-for-AArch64.patch $(APPLY) $(SRC)/harfbuzz/0002-Update-the-bundled-ax_pthread.m4.patch $(APPLY) $(SRC)/harfbuzz/0003-Fix-winstore-app-detection-with-mingw64.patch + $(APPLY) $(SRC)/harfbuzz/0004-Don-t-treat-Wunused-as-an-error.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37cdeb672ed47ced022316ddf9f9e85c49f68913 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37cdeb672ed47ced022316ddf9f9e85c49f68913 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] vlc_codecs: add missing Opus and alac waveformats
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
4f7eeafa by Francois Cartegnie at 2021-06-03T10:03:46+00:00
vlc_codecs: add missing Opus and alac waveformats
= Win10
refs #25794
- - - - -
1 changed file:
- include/vlc_codecs.h
Changes:
=
include/vlc_codecs.h
=
@@ -237,10 +237,12 @@ ATTR_PACKED
#define WAVE_FORMAT_AAC_ADTS0x1600 /* AAC/ADTS */
#define WAVE_FORMAT_AAC_2 0x1601 /* Other AAC */
#define WAVE_FORMAT_AAC_LATM0x1602 /* AAC/LATM */
-#define WAVE_FORMAT_HEAAC 0x1610
+#define WAVE_FORMAT_HEAAC 0x1610 /* Raw AAC or ADTS */
#define WAVE_FORMAT_A52 0x2000 /* a52 */
#define WAVE_FORMAT_DTSINC_DTS 0x2001 /* DTS */
+#define WAVE_FORMAT_ALAC0x6c61
+#define WAVE_FORMAT_OPUS0x704f
#define WAVE_FORMAT_AVCODEC_AAC 0x706D
#define WAVE_FORMAT_DIVIO_AAC 0x4143 /* Divio's AAC */
@@ -367,6 +369,8 @@ wave_format_tag_to_fourcc[] =
{ WAVE_FORMAT_AAC_3,VLC_CODEC_MP4A, "MPEG-4
Audio" },
{ WAVE_FORMAT_AAC_LATM, VLC_CODEC_MP4A, "MPEG-4
LATM Audio" },
{ WAVE_FORMAT_HEAAC,VLC_CODEC_MP4A, "MPEG-4
Audio" },
+{ WAVE_FORMAT_ALAC, VLC_CODEC_ALAC, "Apple
Lossless" },
+{ WAVE_FORMAT_OPUS, VLC_CODEC_OPUS, "Opus
Audio" },
{ WAVE_FORMAT_AVCODEC_AAC, VLC_CODEC_MP4A, "MPEG-4
Audio" },
{ WAVE_FORMAT_AAC_MS, VLC_CODEC_MP4A, "MPEG-4
Audio" },
{ WAVE_FORMAT_VORBIS, VLC_CODEC_VORBIS, "Vorbis
Audio" },
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4f7eeafa6561170d838ad23be350aa59e061e592
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/4f7eeafa6561170d838ad23be350aa59e061e592
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] vout/macosx: remove mouse handling
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
1951da33 by Marvin Scholz at 2021-06-03T07:36:11+00:00
vout/macosx: remove mouse handling
This currently deadlocks the vout and should be done in the vout
window properly anyway.
- - - - -
1 changed file:
- modules/video_output/macosx.m
Changes:
=
modules/video_output/macosx.m
=
@@ -711,91 +711,7 @@ static void OpenglSwap (vlc_gl_t *gl)
#pragma mark -
#pragma mark Mouse handling
-- (void)mouseDown:(NSEvent *)o_event
-{
-@synchronized (self) {
-if (vd) {
-if ([o_event type] == NSLeftMouseDown && !([o_event modifierFlags]
& NSControlKeyMask)) {
-if ([o_event clickCount] <= 1)
-vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_LEFT);
-}
-}
-}
-
-[super mouseDown:o_event];
-}
-
-- (void)otherMouseDown:(NSEvent *)o_event
-{
-@synchronized (self) {
-if (vd)
-vout_display_SendEventMousePressed (vd, MOUSE_BUTTON_CENTER);
-}
-
-[super otherMouseDown: o_event];
-}
-
-- (void)mouseUp:(NSEvent *)o_event
-{
-@synchronized (self) {
-if (vd) {
-if ([o_event type] == NSLeftMouseUp)
-vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_LEFT);
-}
-}
-
-[super mouseUp: o_event];
-}
-
-- (void)otherMouseUp:(NSEvent *)o_event
-{
-@synchronized (self) {
-if (vd)
-vout_display_SendEventMouseReleased (vd, MOUSE_BUTTON_CENTER);
-}
-
-[super otherMouseUp: o_event];
-}
-
-- (void)mouseMoved:(NSEvent *)o_event
-{
-/* on HiDPI displays, the point bounds don't equal the actual pixel based
bounds */
-NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
-NSRect videoRect = [self bounds];
-BOOL b_inside = [self mouse: ml inRect: videoRect];
-
-ml = [self convertPointToBacking: ml];
-videoRect = [self convertRectToBacking: videoRect];
-
-if (b_inside) {
-@synchronized (self) {
-if (vd) {
-vout_display_SendMouseMovedDisplayCoordinates(vd,
- (int)ml.x,
videoRect.size.height - (int)ml.y);
-}
-}
-}
-
-[super mouseMoved: o_event];
-}
-
-- (void)mouseDragged:(NSEvent *)o_event
-{
-[self mouseMoved: o_event];
-[super mouseDragged: o_event];
-}
-
-- (void)otherMouseDragged:(NSEvent *)o_event
-{
-[self mouseMoved: o_event];
-[super otherMouseDragged: o_event];
-}
-
-- (void)rightMouseDragged:(NSEvent *)o_event
-{
-[self mouseMoved: o_event];
-[super rightMouseDragged: o_event];
-}
+#warning Missing mouse handling, must be implemented in Vout Window
- (BOOL)acceptsFirstResponder
{
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/1951da33fa414ef3ce05668ee43cef5427925151
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/1951da33fa414ef3ce05668ee43cef5427925151
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon May 31 11:15:42 2021 +0200| [db23bfe6decab6b00f3eba2f8f134169d7fbac4c] | committer: Hugo Beauzée-Luyssen Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=db23bfe6decab6b00f3eba2f8f134169d7fbac4c --- NEWS | 11 +++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index 079ce38206..04c514f721 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,17 @@ Changes between 3.0.14 and 3.0.15: -- +Demux: + * Fix asf regression with broadcast streams + * MP4: Fix audio drop on seek + +Video Output: + * Fix seek & volume sliders overlapping with subtitles + * Fix delays when seeking with D3D11 + +Text renderer: + * Improve freetype fonts outlining + Misc: * Fix GnuTLS support for Windows XP ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: aom: Disable assembly for 32bits windows builds
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Fri May 28 11:10:50 2021 +0200| [6835e923d5c04a4036e66f4ccb8221683be72756] | committer: Hugo Beauzée-Luyssen contrib: aom: Disable assembly for 32bits windows builds Fix #25745 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6835e923d5c04a4036e66f4ccb8221683be72756 --- contrib/src/aom/rules.mak | 4 1 file changed, 4 insertions(+) diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak index 2fb351e2a2..0a153c3a85 100644 --- a/contrib/src/aom/rules.mak +++ b/contrib/src/aom/rules.mak @@ -67,6 +67,10 @@ ifeq ($(ARCH),arm) AOM_CONF += -DAOM_TARGET_CPU=armv7 AOM_CONF += -DAOM_ADS2GAS_REQUIRED=1 -DAOM_ADS2GAS=../build/make/ads2gas.pl -DAOM_ADS2GAS_OPTS="-thumb;-noelf" -DAOM_GAS_EXT=S endif +ifndef HAVE_WIN64 +AOM_CONF += -DENABLE_SSE2=0 -DENABLE_SSE3=0 -DENABLE_SSE=0 -DENABLE_SSSE3=0 -DENABLE_SSE4_1=0 +AOM_CONF += -DENABLE_SSE4_2=0 -DENABLE_AVX=0 -DENABLE_AVX2=0 +endif endif ifdef HAVE_DARWIN_OS ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 2 commits: demux: mp4: report current trun sample pos in debug
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
2028c4b9 by Francois Cartegnie at 2021-06-01T08:47:15+00:00
demux: mp4: report current trun sample pos in debug
- - - - -
86b1ffe5 by Francois Cartegnie at 2021-06-01T08:47:15+00:00
demux: mp4: fix missing intra-trun sample increment on seek
ends up reading wrong sample size/time
refs #25784
- - - - -
1 changed file:
- modules/demux/mp4/mp4.c
Changes:
=
modules/demux/mp4/mp4.c
=
@@ -1841,6 +1841,7 @@ static void FragTrunSeekToTime( mp4_track_t *p_track,
stime_t i_target_time )
i_time += dur;
i_pos += len;
+i_sample++;
}
}
@@ -4570,7 +4571,7 @@ static int FragDemuxTrack( demux_t *p_demux, mp4_track_t
*p_track,
msg_Dbg( p_demux, "tk(%i)=%"PRId64" mv=%"PRId64" pos=%"PRIu64,
p_track->i_track_ID,
VLC_TICK_0 + MP4_rescale_mtime( i_dts, p_track->i_timescale ),
VLC_TICK_0 + MP4_rescale_mtime( i_pts, p_track->i_timescale ),
- p_track->context.i_trun_sample_pos );
+ p_track->context.i_trun_sample_pos - i_read );
#endif
if ( p_track->p_es )
{
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/8092f480fe02a6562319b18f839531a94d286ab6...86b1ffe50f7cb5cbe273f14e1c4e0ba2b3572f93
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/8092f480fe02a6562319b18f839531a94d286ab6...86b1ffe50f7cb5cbe273f14e1c4e0ba2b3572f93
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] Contribs: update dav1d to 0.9.0
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Commits: 722afbfe by Ewout ter Hoeven at 2021-05-23T09:45:48+00:00 Contribs: update dav1d to 0.9.0 - - - - - 2 changed files: - contrib/src/dav1d/SHA512SUMS - contrib/src/dav1d/rules.mak Changes: = contrib/src/dav1d/SHA512SUMS = @@ -1 +1 @@ -c2d69adcc1f26c8700592e08306828aeaa3bf035e90a09bce4f2a494678645f37d4d0c5fc201eb4c369099f8f27e1325ca3421264aa1c2ffdad94868cc0504af dav1d-0.8.2.tar.xz +46ead83042ab951eb4c79c458e060875174739a8a0efd8d34fdcb6ad3c094093f629d16f467c1dbd37a125bba31d0a7b051933540e38c675eade25fefc80ed75 dav1d-0.9.0.tar.xz = contrib/src/dav1d/rules.mak = @@ -1,6 +1,6 @@ # libdav1d -DAV1D_VERSION := 0.8.2 +DAV1D_VERSION := 0.9.0 DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz PKGS += dav1d View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/722afbfe36517581d3d4618e4296411185684519 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/722afbfe36517581d3d4618e4296411185684519 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] d3d_dynamic_shader: disable useless warning
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
be4cdbc2 by Steve Lhomme at 2021-05-21T12:33:43+00:00
d3d_dynamic_shader: disable useless warning
This warning is useless because we already clip the values before.
The linear values are never negative.
Shader@0x7FFE51EFA920(105,12-30): warning X3571: pow(f, e) will not work
for negative f, use abs(f) or conditionally handle negative values if you
expect them
- - - - -
1 changed file:
- modules/video_output/win32/d3d_dynamic_shader.c
Changes:
=
modules/video_output/win32/d3d_dynamic_shader.c
=
@@ -36,6 +36,7 @@
#include "d3d_dynamic_shader.h"
static const char globPixelShaderDefault[] = "\
+#pragma warning( disable: 3571 )\n\
cbuffer PS_CONSTANT_BUFFER : register(b0)\n\
{\n\
float4x3 Colorspace;\n\
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/be4cdbc261bcf49341f8783dd9afdfb48e4c0a78
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/be4cdbc261bcf49341f8783dd9afdfb48e4c0a78
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] Qt: Redundant signal binding
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Commits: 37d8b6f8 by Zou Ya at 2021-05-21T12:12:56+00:00 Qt: Redundant signal binding The signal slot binding here is redundant, because every time the menu is created, the value is obtained from MainInterface, and there is no need to set it again through the signal. - - - - - 1 changed file: - modules/gui/qt/menus/menus.cpp Changes: = modules/gui/qt/menus/menus.cpp = @@ -344,14 +344,12 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac action->setCheckable( true ); connect( action, ::triggered, mi, ::setPlaylistVisible ); action->setChecked( mi->isPlaylistVisible() ); -connect( mi, ::playlistVisibleChanged, - action, ::setChecked ); - /* Docked Playlist */ action = menu->addAction( qtr( "Docked Playlist" ) ); action->setCheckable( true ); connect( action, ::triggered, mi, ::setPlaylistDocked ); +action->setChecked( mi->isPlaylistDocked() ); menu->addSeparator(); @@ -367,15 +365,11 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac ::toggleInterfaceFullScreen, QString( "F11" ) ); action->setCheckable( true ); action->setChecked( mi->isInterfaceFullScreen() ); -connect( mi, ::fullscreenInterfaceToggled, - action, ::setChecked ); action = menu->addAction( qtr( " Items as Grid" ), mi, ::setGridView ); action->setCheckable( true ); action->setChecked( mi->hasGridView() ); -connect( mi, ::gridViewChanged, - action, ::setChecked ); menu->addMenu( new CheckableListMenu(qtr( " Scheme" ), mi->getColorScheme(), CheckableListMenu::GROUPED, current) ); View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37d8b6f802182a2eaf0f2c2d4e4b14a8263edcbf -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/37d8b6f802182a2eaf0f2c2d4e4b14a8263edcbf You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] On the road to 3.0.15
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Wed May 19 09:58:33 2021 +0200| [e786f493f0609db7d737186d6b167c30375c0265] | committer: Hugo Beauzée-Luyssen On the road to 3.0.15 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e786f493f0609db7d737186d6b167c30375c0265 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index cc2037594b..eb04e254c7 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2021 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.14) +AC_INIT(vlc, 3.0.15) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=14 +VERSION_REVISION=15 VERSION_EXTRA=0 VERSION_DEV= ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Wed May 19 09:58:15 2021 +0200| [16519beed0cfcf989e98da3aa13623601c38ad85] | committer: Hugo Beauzée-Luyssen Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=16519beed0cfcf989e98da3aa13623601c38ad85 --- NEWS | 6 ++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index e5dd1855e7..079ce38206 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Changes between 3.0.14 and 3.0.15: +-- + +Misc: + * Fix GnuTLS support for Windows XP + Changes between 3.0.13 and 3.0.14: -- ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: gnutls: Don't use function introduced in Windows Vista
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Tue May
18 11:08:00 2021 +0200| [98a9f98e7a40abd7bfba0eef8ba6032438cc5e52] | committer:
Hugo Beauzée-Luyssen
contrib: gnutls: Don't use function introduced in Windows Vista
Fix #25746
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=98a9f98e7a40abd7bfba0eef8ba6032438cc5e52
---
...Fix-when-compiling-for-versions-older-tha.patch | 67 ++
contrib/src/gnutls/rules.mak | 3 +
2 files changed, 70 insertions(+)
diff --git
a/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch
b/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch
new file mode 100644
index 00..f4dc05d3f3
--- /dev/null
+++
b/contrib/src/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch
@@ -0,0 +1,67 @@
+From 1796cda9975bd459a87222676030b943869c686e Mon Sep 17 00:00:00 2001
+From: Bruno Haible
+Date: Wed, 16 Sep 2020 23:51:52 +0200
+Subject: [PATCH] stat, fstat: Fix when compiling for versions older than
+ Windows Vista.
+
+Reported by Eli Zaretskii in
+<https://lists.gnu.org/archive/html/bug-gnulib/2020-09/msg00027.html>.
+
+* lib/stat-w32.c: Include . Test the value of _WIN32_WINNT
+that was originally set before we redefined it.
+* m4/stat.m4 (gl_PREREQ_STAT_W32): New macro.
+(gl_PREREQ_STAT): Require it.
+* m4/fstat.m4 (gl_PREREQ_FSTAT): Likewise.
+---
+ gnutls/gl/stat-w32.c | 24 ++--
+ 4 files changed, 43 insertions(+), 8 deletions(-)
+
+diff --git gnutls/gl/lib/stat-w32.c gnutls/gl/lib/stat-w32.c
+index 19bdfaa37..72442e933 100644
+--- gnutls/gl/stat-w32.c
gnutls/gl/stat-w32.c
+@@ -20,10 +20,22 @@
+
+ #if defined _WIN32 && ! defined __CYGWIN__
+
+-/* Ensure that defines FILE_ID_INFO. */
+-#if !defined _WIN32_WINNT || (_WIN32_WINNT < _WIN32_WINNT_WIN8)
+-# undef _WIN32_WINNT
+-# define _WIN32_WINNT _WIN32_WINNT_WIN8
++/* Attempt to make define FILE_ID_INFO.
++ But ensure that the redefinition of _WIN32_WINNT does not make us assume
++ Windows Vista or newer when building for an older version of Windows. */
++#if HAVE_SDKDDKVER_H
++# include
++# if _WIN32_WINNT >= _WIN32_WINNT_VISTA
++# define WIN32_ASSUME_VISTA 1
++# else
++# define WIN32_ASSUME_VISTA 0
++# endif
++# if !defined _WIN32_WINNT || (_WIN32_WINNT < _WIN32_WINNT_WIN8)
++# undef _WIN32_WINNT
++# define _WIN32_WINNT _WIN32_WINNT_WIN8
++# endif
++#else
++# define WIN32_ASSUME_VISTA (_WIN32_WINNT >= _WIN32_WINNT_VISTA)
+ #endif
+
+ #include
+@@ -46,7 +58,7 @@
+ #undef GetFinalPathNameByHandle
+ #define GetFinalPathNameByHandle GetFinalPathNameByHandleA
+
+-#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
++#if !WIN32_ASSUME_VISTA
+
+ /* Avoid warnings from gcc -Wcast-function-type. */
+ # define GetProcAddress \
+@@ -149,7 +161,7 @@ _gl_fstat_by_handle (HANDLE h, const char *path, struct
stat *buf)
+ DWORD type = GetFileType (h);
+ if (type == FILE_TYPE_DISK)
+ {
+-#if !(_WIN32_WINNT >= _WIN32_WINNT_VISTA)
++#if !WIN32_ASSUME_VISTA
+ if (!initialized)
+ initialize ();
+ #endif
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index e425f5f9a6..70bd94c64f 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -31,6 +31,9 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
# forbidden RtlSecureZeroMemory call in winstore builds
$(APPLY)
$(SRC)/gnutls/0001-explicit_bzero-Do-not-call-SecureZeroMemory-on-UWP-b.patch
+ # Don't use functions available starting with windows vista
+ $(APPLY)
$(SRC)/gnutls/0001-stat-fstat-Fix-when-compiling-for-versions-older-tha.patch
+
# disable the dllimport in static linking (pkg-config --static doesn't
handle Cflags.private)
cd $(UNPACK_DIR) && sed -i.orig -e s/"_SYM_EXPORT
__declspec(dllimport)"/"_SYM_EXPORT"/g lib/includes/gnutls/gnutls.h.in
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon May 10 15:59:58 2021 +0200| [41878ff4f2a4b566cf0a1bd15f72037b2be98a18] | committer: Hugo Beauzée-Luyssen Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=41878ff4f2a4b566cf0a1bd15f72037b2be98a18 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index f76bd7cf5e..e5dd1855e7 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ Changes between 3.0.13 and 3.0.14: Core: * Fix double loading of slave input + * Fix an issue causing the auto-updater not to launch the new version + installer Changes between 3.0.12.1 and 3.0.13: -- ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] On the road to 3.0.14
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon May 10 12:19:49 2021 +0200| [0937dbb5c217d6845fa9efea7828dc12f18be719] | committer: Hugo Beauzée-Luyssen On the road to 3.0.14 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0937dbb5c217d6845fa9efea7828dc12f18be719 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9b41afb17c..cc2037594b 100644 --- a/configure.ac +++ b/configure.ac @@ -2,10 +2,10 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2021 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.13) +AC_INIT(vlc, 3.0.14) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=13 +VERSION_REVISION=14 VERSION_EXTRA=0 VERSION_DEV= ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] core: update: Fix winstore detection
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon May
10 12:07:07 2021 +0200| [d456994213b98933664bd6aee2e8f09d5dea5628] | committer:
Hugo Beauzée-Luyssen
core: update: Fix winstore detection
(cherry picked from commit c15e2691ef24b1eae01b29dca8fcbdfed64963ed)
Signed-off-by: Hugo Beauzée-Luyssen
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d456994213b98933664bd6aee2e8f09d5dea5628
---
src/misc/update.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/update.c b/src/misc/update.c
index 6c5a231bce..b7e1420dfa 100644
--- a/src/misc/update.c
+++ b/src/misc/update.c
@@ -728,7 +728,7 @@ static void* update_DownloadReal( void *obj )
psz_msg );
if(answer == 1)
{
-#ifndef VLC_WINSTORE_APP
+#if !VLC_WINSTORE_APP
wchar_t psz_wdestfile[MAX_PATH];
MultiByteToWideChar( CP_UTF8, 0, psz_destfile, -1, psz_wdestfile,
MAX_PATH );
answer = (int)ShellExecuteW( NULL, L"open", psz_wdestfile, NULL, NULL,
SW_SHOW);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon May 10 12:19:07 2021 +0200| [2fb86c634d92ec8aeb93a52ed97aa1f9d8565a65] | committer: Hugo Beauzée-Luyssen Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2fb86c634d92ec8aeb93a52ed97aa1f9d8565a65 --- NEWS | 6 ++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 01c1f295e1..f76bd7cf5e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Changes between 3.0.13 and 3.0.14: +-- + +Core: + * Fix double loading of slave input + Changes between 3.0.12.1 and 3.0.13: -- ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] core: update: Fix winstore detection
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
c15e2691 by Hugo Beauzée-Luyssen at 2021-05-10T12:07:07+02:00
core: update: Fix winstore detection
- - - - -
1 changed file:
- src/misc/update.c
Changes:
=
src/misc/update.c
=
@@ -725,7 +725,7 @@ static void* update_DownloadReal( void *obj )
psz_msg );
if(answer == 1)
{
-#ifndef VLC_WINSTORE_APP
+#if !VLC_WINSTORE_APP
wchar_t psz_wdestfile[MAX_PATH];
MultiByteToWideChar( CP_UTF8, 0, psz_destfile, -1, psz_wdestfile,
MAX_PATH );
answer = (int)ShellExecuteW( NULL, L"open", psz_wdestfile, NULL, NULL,
SW_SHOW);
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c15e2691ef24b1eae01b29dca8fcbdfed64963ed
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c15e2691ef24b1eae01b29dca8fcbdfed64963ed
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 13 commits: vulkan: remove obsolete import
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Commits: d8f89d45 by Niklas Haas at 2021-05-09T11:53:37+00:00 vulkan: remove obsolete import This is no longer used by anything, as the vulkan code no longer depends directly on libplacebo. - - - - - 47353b65 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: move utils to new library This will be reused by the other libplacebo components, and in particular is required to avoid symbol collisions. - - - - - 5b3a7163 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: add new libplacebo abstraction interface This will help disentangle the libplacebo-based vout from the individual pl_gpu providers (vulkan, opengl, etc.) Rename the existing vlc_placebo_Create helper to vlc_placebo_CreateContext to avoid symbol collision. - - - - - f5295572 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: bump minimum dependency to v1.7.0 This lifts the v1.7.0 dependency from the vulkan-specific check out into the general libplacebo pkgconfig check, a change which is required for the following refactor of vulkan/display.c into libplacebo/display.c. A separate dependency for v0.5 is no longer needed, since its very old and no longer shipping anywhere (including debian stable). Therefore, simplify the logic rather than recreating it exactly. - - - - - 03b3360d by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: move vout to API-agnostic module Rebases vulkan/display.c ontop of the new API-agnostic libplacebo GPU abstraction module. This opens up libplacebo/display.c to work with API backends other than Vulkan. Note: this has the side effect of bumping up the minimum libplacebo dependency, because now the libplacebo vout is always compiled when libplacebo is available. On the plus side, however, it simplifies the configure check. That said, 1.7.0 is from 2018, and packaged everywhere (including debian stable). so this should be fine. - - - - - 6d49f176 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: namespace all settings behind pl- prefix The old settings names were not properly namespaced. Since this is technically a new vout, use the opportunity to break existing configurations in order to namespace all of the settings. - - - - - 7c340cd3 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: add libplacebo-vulkan wrapper module - - - - - 4b89ec42 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: add MakeCurrent/ReleaseCurrent wrappers Needed for OpenGL API support, at least on versions of libplacebo prior to v3.128. Its worth pointing out that this logic is therefore only temporary - once the libplacebo version is bumped past v3.128, this can be removed again. This commit only adds the API, with the OpenGL implementation coming in a following commit. - - - - - 9ae6b001 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: add libplacebo-OpenGL wrapper module Supports both GL and GLES2, configurably. - - - - - 51cdf229 by Niklas Haas at 2021-05-09T11:53:37+00:00 libplacebo: correctly handle overlays on flipped framebuffers This affects OpenGL. - - - - - f6e9e324 by Niklas Haas at 2021-05-09T11:53:37+00:00 vulkan: rename instance.h to platform.h With the removal of the actual vulkan instance from this abstraction in 883a865a, calling this instance is confusing and misleading. It should be called platform, because the only thing the abstraction is designed to contain is platform-specific state and operations. Rename it, and the associated type, for clarity. This frees up the name `vlc_vk_t` to be used for an actual Vulkan instance, if we ever decide we need one in the future. (e.g. for GPU filters) - - - - - 36884525 by Niklas Haas at 2021-05-09T11:53:37+00:00 vulkan: remove refcount from vlc_vk_platform_t I cant think of a use case for this ever being refcounted. It made more sense back when it held the actual instance, but the platform/surface is only ever going to be used by whatever also owns the vout_window_t. - - - - - ac14138a by Niklas Haas at 2021-05-09T11:53:37+00:00 vulkan: minor cosmetic cleanups Tidy up the struct and comments, and also remove redundant forward declarations. - - - - - 22 changed files: - configure.ac - modules/video_output/Makefile.am - + modules/video_output/libplacebo/Makefile.am - modules/video_output/vulkan/display.c → modules/video_output/libplacebo/display.c - + modules/video_output/libplacebo/instance.c - + modules/video_output/libplacebo/instance.h - + modules/video_output/libplacebo/instance_opengl.c - + modules/video_output/libplacebo/instance_vulkan.c - modules/video_output/placebo_utils.c → modules/video_output/libplacebo/utils.c - modules/video_output/placebo_utils.h → modules/video_output/libplacebo/utils.h - modules/video_output/opengl/Makefile.am - modules/video_output/opengl/sampler.c - modules/video_output/opengl/vout_helper.h - modules/video_output/vulkan/Makefile.am - modules/video_output/vulkan/instance.c → modules/video_output/vulkan
[vlc-commits] [Git][videolan/vlc][master] libplacebo: remove haasnsoft scaler
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
75c26d8b by Niklas Haas at 2021-05-09T09:34:23+00:00
libplacebo: remove haasnsoft scaler
This was deprecated in libplacebo git master, but mistakenly removed
entirely for some (untagged) versions (specifically, v3.120 through
v3.137).
As such, this commit fixes build errors for those versions. (And gets
rid of a deprecation warning for v3.138+)
- - - - -
1 changed file:
- modules/video_output/placebo_utils.h
Changes:
=
modules/video_output/placebo_utils.h
=
@@ -241,8 +241,7 @@ enum {
SCALE_GINSENG,
SCALE_EWA_GINSENG,
SCALE_EWA_HANN,
-SCALE_HAASNSOFT,
-SCALE_CATMULL_ROM,
+SCALE_CATMULL_ROM = SCALE_EWA_HANN + 2, // preserve option order
SCALE_ROBIDOUX,
SCALE_ROBIDOUXSHARP,
SCALE_EWA_ROBIDOUX,
@@ -267,7 +266,6 @@ static const int scale_values[] = {
SCALE_GINSENG,
SCALE_EWA_GINSENG,
SCALE_EWA_HANN,
-SCALE_HAASNSOFT,
SCALE_CATMULL_ROM,
SCALE_ROBIDOUX,
SCALE_ROBIDOUXSHARP,
@@ -293,7 +291,6 @@ static const char * const scale_text[] = {
"Ginseng 3 taps",
"EWA Ginseng",
"EWA Hann",
-"HaasnSoft (blurred EWA Hann)",
"Catmull-Rom",
"Robidoux",
"RobidouxSharp",
@@ -319,7 +316,6 @@ static const struct pl_filter_config *const scale_config[]
= {
[SCALE_EWA_LANCZOS] = _filter_ewa_lanczos,
[SCALE_EWA_GINSENG] = _filter_ewa_ginseng,
[SCALE_EWA_HANN]= _filter_ewa_hann,
-[SCALE_HAASNSOFT] = _filter_haasnsoft,
[SCALE_BICUBIC] = _filter_bicubic,
[SCALE_CATMULL_ROM] = _filter_catmull_rom,
[SCALE_MITCHELL]= _filter_mitchell,
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/75c26d8b449723db56ff56fd786247db071e692a
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/75c26d8b449723db56ff56fd786247db071e692a
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] amt: remove unused option
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
6c66cdf6 by Lyndon Brown at 2021-05-09T09:10:26+00:00
amt: remove unused option
never used since introduction of the module in
51b38743edd4665485d31364a96b534b69635b9a
feedback in MR suggested deleting rather than obsoleting since it was
never in v3.0, only in 4.0-dev.
- - - - -
1 changed file:
- modules/access/amt.c
Changes:
=
modules/access/amt.c
=
@@ -68,7 +68,6 @@
#define BUFFER_TEXT N_("Receive buffer")
#define BUFFER_LONGTEXT N_("AMT receive buffer size (bytes)" )
#define TIMEOUT_TEXT N_("Native multicast timeout (sec)")
-#define AMT_TIMEOUT_TEXT N_("AMT timeout (sec)")
#define AMT_RELAY_ADDRESS N_("AMT relay (IP address or FQDN)")
#define AMT_RELAY_ADDR_LONG N_("AMT relay anycast address, or specify the
relay you want by address or fully qualified domain name")
#define AMT_DEFAULT_RELAY N_("amt-relay.m2icast.net")
@@ -257,7 +256,6 @@ vlc_module_begin ()
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
-add_integer( "amt-timeout", 5, AMT_TIMEOUT_TEXT, NULL, true )
add_integer( "amt-native-timeout", 5, TIMEOUT_TEXT, NULL, true )
add_string( "amt-relay", AMT_DEFAULT_RELAY, AMT_RELAY_ADDRESS,
AMT_RELAY_ADDR_LONG, true )
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/6c66cdf6a2cbb0241e381603be2597d4812fb536
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/6c66cdf6a2cbb0241e381603be2597d4812fb536
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] qml: fix empty duration column in video list
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
ddf748ac by Prince Gupta at 2021-05-08T11:48:22+00:00
qml: fix empty duration column in video list
- - - - -
1 changed file:
- modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
Changes:
=
modules/gui/qt/medialibrary/qml/VideoListDisplay.qml
=
@@ -66,7 +66,7 @@ MainInterface.MainTableView {
text: i18n.qtr("Title")
}, {
-criteria: "duration_short",
+criteria: "duration",
width: VLCStyle.colWidth(1),
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/ddf748ac30fedb1430e173fc7c0460937437df61
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/ddf748ac30fedb1430e173fc7c0460937437df61
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 7 commits: qt/mlbasemodel: Add the 'itemCache' function
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
80b1d991 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlbasemodel: Add the itemCache function
This is useful when we only want to return a cached item.
- - - - -
22bc7af6 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt: Create CoverGenerator
This class can be useful to retrieve composed thumbnails for groups, playlists
and genres.
It supports a few options like custom size, count and division type.
- - - - -
74ffcb26 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgroup: Add CoverGenerator implementation
- - - - -
e6ebc5f8 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgrouplistmodel: Add CoverGenerator implementation
- - - - -
73072c14 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgenre: Add CoverGenerator implementation
- - - - -
43e3ea1e by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qt/mlgenremodel: Add CoverGenerator implementation
- - - - -
4362af46 by Benjamin Arnaud at 2021-05-08T10:59:52+00:00
qml/MusicGenres: Add gradient overlay
fix #25595
- - - - -
16 changed files:
- modules/gui/qt/Makefile.am
- modules/gui/qt/maininterface/mainui.cpp
- modules/gui/qt/medialibrary/mlbasemodel.cpp
- modules/gui/qt/medialibrary/mlbasemodel.hpp
- modules/gui/qt/medialibrary/mlgenre.cpp
- modules/gui/qt/medialibrary/mlgenre.hpp
- modules/gui/qt/medialibrary/mlgenremodel.cpp
- modules/gui/qt/medialibrary/mlgenremodel.hpp
- modules/gui/qt/medialibrary/mlgroup.cpp
- modules/gui/qt/medialibrary/mlgroup.hpp
- modules/gui/qt/medialibrary/mlgrouplistmodel.cpp
- modules/gui/qt/medialibrary/mlgrouplistmodel.hpp
- modules/gui/qt/medialibrary/qml/MusicGenres.qml
- + modules/gui/qt/util/covergenerator.cpp
- + modules/gui/qt/util/covergenerator.hpp
- po/POTFILES.in
Changes:
=
modules/gui/qt/Makefile.am
=
@@ -218,6 +218,8 @@ libqt_plugin_la_SOURCES = \
gui/qt/util/audio_device_model.cpp \
gui/qt/util/audio_device_model.hpp \
gui/qt/util/color_scheme_model.cpp gui/qt/util/color_scheme_model.hpp \
+ gui/qt/util/covergenerator.cpp \
+ gui/qt/util/covergenerator.hpp \
gui/qt/util/imageluminanceextractor.cpp
gui/qt/util/imageluminanceextractor.hpp \
gui/qt/util/imagehelper.cpp gui/qt/util/imagehelper.hpp \
gui/qt/util/i18n.cpp gui/qt/util/i18n.hpp \
@@ -343,9 +345,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/medialibrary/mlartistmodel.moc.cpp \
gui/qt/medialibrary/mlbasemodel.moc.cpp \
gui/qt/medialibrary/mlfoldersmodel.moc.cpp \
- gui/qt/medialibrary/mlgenre.moc.cpp \
gui/qt/medialibrary/mlgenremodel.moc.cpp \
- gui/qt/medialibrary/mlgroup.moc.cpp \
gui/qt/medialibrary/mlgrouplistmodel.moc.cpp \
gui/qt/medialibrary/mlqmltypes.moc.cpp \
gui/qt/medialibrary/mlrecentsmodel.moc.cpp \
@@ -374,6 +374,7 @@ nodist_libqt_plugin_la_SOURCES = \
gui/qt/util/asynctask.moc.cpp \
gui/qt/util/audio_device_model.moc.cpp \
gui/qt/util/color_scheme_model.moc.cpp \
+ gui/qt/util/covergenerator.moc.cpp \
gui/qt/util/imageluminanceextractor.moc.cpp \
gui/qt/util/i18n.moc.cpp \
gui/qt/util/listcache.moc.cpp \
=
modules/gui/qt/maininterface/mainui.cpp
=
@@ -199,7 +199,6 @@ void MainUI::registerQMLTypes()
registerAnonymousType("org.videolan.medialib", 1);
registerAnonymousType("org.videolan.medialib", 1);
registerAnonymousType("org.videolan.medialib", 1);
-registerAnonymousType("org.videolan.medialib", 1);
registerAnonymousType("org.videolan.medialib", 1);
qmlRegisterType( "org.videolan.medialib", 0, 1,
"AlbumContextMenu" );
=
modules/gui/qt/medialibrary/mlbasemodel.cpp
=
@@ -408,19 +408,37 @@ void MLBaseModel::invalidateCache()
m_cache.reset();
}
+//-
+
MLItem *MLBaseModel::item(int signedidx) const
{
validateCache();
ssize_t count = m_cache->count();
-if (count == COUNT_UNINITIALIZED || signedidx < 0
-|| signedidx >= count)
+
+if (count == COUNT_UNINITIALIZED || signedidx < 0 || signedidx >= count)
return nullptr;
unsigned int idx = static_cast(signedidx);
+
m_cache->refer(idx);
const std::unique_ptr *item = m_cache->get(idx);
+
+if (!item)
+/* Not in cache */
+return nullptr;
+
+/* Return raw pointer */
+return item->get();
+}
+
+MLItem *MLBaseModel::itemCache(int signedidx) const
+{
+unsigned int idx = static_cast(signedidx);
+
+const std::unique_ptr *item = m_cache->get(idx);
[vlc-commits] [Git][videolan/vlc][master] qml/MediaGroupListDisplay: Fix name property
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
5b1fb7d5 by Benjamin Arnaud at 2021-05-07T19:27:26+00:00
qml/MediaGroupListDisplay: Fix name property
fix #25663
- - - - -
1 changed file:
- modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml
Changes:
=
modules/gui/qt/medialibrary/qml/MediaGroupDisplay.qml
=
@@ -44,7 +44,7 @@ VideoAll {
property alias parentId: modelGroup.parentId
// NOTE: The name of the group.
-property string name
+property string name: initialName
//-
// Childs
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/5b1fb7d5d2ef69d7c374b50a97ea0304b36f2132
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/5b1fb7d5d2ef69d7c374b50a97ea0304b36f2132
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] help: fix confusing -p (module help) for mods with no options
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
90fb5683 by Lyndon Brown at 2021-05-07T18:15:27+00:00
help: fix confusing -p (module help) for mods with no options
it confused me in the past when I tried `vlc -p pulse` and it came back
with an error stating that no matching module was found, and to look in
the list generated by --list, when that does in fact contain a module with
that name.
the problem is that the module has no options (nor pulsesrc/pulselist),
and the underlying logic is geared primarily towards --full-help/--longhelp
output which deliberately skips over such modules.
i have finally looked into this and fixed the confusing behaviour by
avoiding skipping over modules when in search mode, so now we output
minimal details about such modules along with a statement that it has no
options when looking up modules, but continue to skip over them in
--full-help/--longhelp output.
old output:
```
lyndon@desktop ~$ vlc -p pulse
VLC media player 4.0.0-dev Otto Chriek (revision 4.0.0-dev-15406-g183c8d9971)
No matching module found. Use --list or --list-verbose to list available
modules.
```
new output:
```
lyndon@desktop ~$ vlc -p pulse
VLC media player 4.0.0-dev Otto Chriek (revision 4.0.0-dev-15407-g19c204c671)
Pulseaudio audio output (pulse)
This module has no options.
PulseAudio input (pulsesrc)
Pass pulse:// to open the default PulseAudio source, or pulse://SOURCE to open
a specific source named SOURCE.
This module has no options.
Audio capture (PulseAudio) (pulselist)
This module has no options.
```
- - - - -
1 changed file:
- src/config/help.c
Changes:
=
src/config/help.c
=
@@ -603,13 +603,13 @@ static void Usage (vlc_object_t *p_this, char const
*psz_search)
const module_config_t *section = NULL;
const char *objname = module_get_object(m);
-if (p->conf.count == 0)
+if (psz_search == NULL && p->conf.count == 0)
continue; /* Ignore modules without config options */
if (!module_match(m, psz_search, strict))
continue;
found = true;
-if (!plugin_show(p))
+if (psz_search == NULL && !plugin_show(p))
continue;
/* Print name of module */
@@ -619,6 +619,9 @@ static void Usage (vlc_object_t *p_this, char const
*psz_search)
printf(color ? CYAN" %s\n"GRAY : " %s\n",
module_gettext(m, m->psz_help));
+if (psz_search != NULL && p->conf.count == 0)
+printf(" %s\n", _("This module has no options."));
+
/* Print module options */
for (size_t j = 0; j < p->conf.size; j++)
{
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/90fb56834f0ab753c67f362dae8612d33965ed36
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/90fb56834f0ab753c67f362dae8612d33965ed36
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 2 commits: qt: mlfoldersmodel: Ensure MRL are fully encoded
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
e4339355 by Hugo Beauzée-Luyssen at 2021-05-07T14:31:12+00:00
qt: mlfoldersmodel: Ensure MRL are fully encoded
Refs #2
- - - - -
8e087e24 by Hugo Beauzée-Luyssen at 2021-05-07T14:31:12+00:00
contrib: Bump medialibrary version
Fix #2
- - - - -
2 changed files:
- contrib/src/medialibrary/rules.mak
- modules/gui/qt/medialibrary/mlfoldersmodel.cpp
Changes:
=
contrib/src/medialibrary/rules.mak
=
@@ -1,4 +1,4 @@
-MEDIALIBRARY_HASH := d3711efef557e240687bfd3bcbc7be16604fd48c
+MEDIALIBRARY_HASH := f541a77c9a3b107970e5650d8db2de0294aea8c3
MEDIALIBRARY_VERSION := git-$(MEDIALIBRARY_HASH)
MEDIALIBRARY_GITURL := https://code.videolan.org/videolan/medialibrary.git
=
modules/gui/qt/medialibrary/mlfoldersmodel.cpp
=
@@ -139,7 +139,7 @@ void MLFoldersModel::removeAt( int index )
void MLFoldersModel::add(const QUrl )
{
-vlc_ml_add_folder( ml() , qtu( mrl.toString( QUrl::None ) ) );
+vlc_ml_add_folder( ml() , qtu( mrl.toString( QUrl::FullyEncoded ) ) );
}
void MLBannedFoldersModel::removeAt(int index)
@@ -154,7 +154,7 @@ void MLBannedFoldersModel::removeAt(int index)
void MLBannedFoldersModel::add(const QUrl )
{
-vlc_ml_ban_folder( ml() , qtu( mrl.toString( QUrl::None ) ) );
+vlc_ml_ban_folder( ml() , qtu( mrl.toString( QUrl::FullyEncoded ) ) );
}
std::vector
MLBannedFoldersModel::entryPoints() const
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7bcc8a1782bd12f6c0b78cd20572b6db9e767bab...8e087e241b6538cf2959b4d4ec5d585e3dc0
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/7bcc8a1782bd12f6c0b78cd20572b6db9e767bab...8e087e241b6538cf2959b4d4ec5d585e3dc0
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] qml/MediaGroupList: Fix group label
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
7bcc8a17 by Benjamin Arnaud at 2021-05-07T13:55:40+00:00
qml/MediaGroupList: Fix group label
- - - - -
1 changed file:
- modules/gui/qt/medialibrary/qml/MediaGroupList.qml
Changes:
=
modules/gui/qt/medialibrary/qml/MediaGroupList.qml
=
@@ -279,7 +279,7 @@ Widgets.NavigableFocusScope {
title: (model.name) ? model.name
: i18n.qtr("Unknown title")
-labels: _getLabels(model, i18n.qtr("%1 Medias"))
+labels: _getLabels(model, i18n.qtr("%1 Videos"))
// NOTE: We don't want to show the indicator for a group..
showNewIndicator: (model.count === 1)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/7bcc8a1782bd12f6c0b78cd20572b6db9e767bab
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/7bcc8a1782bd12f6c0b78cd20572b6db9e767bab
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] access: imem: Remove error logs confusing libvlc users
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
08214798 by Martin Finkel at 2021-05-07T12:26:00+00:00
access: imem: Remove error logs confusing libvlc users
libvlc_media_new_callbacks does not set imem-get and imem-release.
Because of this, the following logs
imem Error: Invalid get/release function pointers
are confusing users. This commit aligns behavior with imem-access.c
which also returns VLC_EGENERIC silently for missing read_cb.
- - - - -
1 changed file:
- modules/access/imem.c
Changes:
=
modules/access/imem.c
=
@@ -255,7 +255,6 @@ static int OpenCommon(vlc_object_t *object, imem_sys_t
**sys_ptr, const char *ps
free(tmp);
if (!sys->source.get || !sys->source.release) {
-msg_Err(object, "Invalid get/release function pointers");
return VLC_EGENERIC;
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0821479844121f5fcfa6961bb5f69c3107c667e2
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/0821479844121f5fcfa6961bb5f69c3107c667e2
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 4 commits: input: add input_CanPaceControl()
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
ea0fb027 by Thomas Guillem at 2021-05-07T08:51:35+00:00
input: add input_CanPaceControl()
- - - - -
704e8b08 by Thomas Guillem at 2021-05-07T08:51:35+00:00
es_out: use input_CanPaceControl()
- - - - -
5ab5fbe1 by Thomas Guillem at 2021-05-07T08:51:35+00:00
input: dont duplicate properties from the master source
- - - - -
58ba0326 by Thomas Guillem at 2021-05-07T08:51:35+00:00
input: dont override item and capabilities from the slave
InputSourceInit() is called to initialize the master and all slaves
inputs. Some initialisation concerned only the master, so move them out to a
new function: InitProperties().
This fixes the input slaves overriding some item properties
(attachment) and the master capabilities.
- - - - -
4 changed files:
- src/input/es_out.c
- src/input/es_out_timeshift.c
- src/input/input.c
- src/input/input_internal.h
Changes:
=
src/input/es_out.c
=
@@ -703,9 +703,9 @@ static vlc_tick_t EsOutGetWakeup( es_out_t *out )
/* We do not have a wake up date if the input cannot have its speed
* controlled or sout is imposing its own or while buffering
*
- * FIXME for !input_priv(p_input)->b_can_pace_control a wake-up time is
still needed
+ * FIXME for !input_CanPaceControl() a wake-up time is still needed
* to avoid too heavy buffering */
-if( !input_priv(p_input)->b_can_pace_control ||
+if( !input_CanPaceControl(p_input) ||
input_priv(p_input)->b_out_pace_control ||
p_sys->b_buffering )
return 0;
@@ -1278,14 +1278,13 @@ static void EsOutProgramHandleClockSource( es_out_t
*out, es_out_pgrm_t *p_pgrm
{
es_out_sys_t *p_sys = container_of(out, es_out_sys_t, out);
input_thread_t *p_input = p_sys->p_input;
-input_thread_private_t *priv = input_priv(p_input);
-/* XXX: The clock source selection depends on priv->b_can_pace_control but
+/* XXX: The clock source selection depends on input_CanPaceControl() but
* this variable is only initialized from the input_thread_t after the
* demux is opened. Programs and ES tracks can be created from the demux
* open callback or midstream (from the demux callback). Therefore, we
* can't handle the clock source selection after the program is created
- * since priv->b_can_pace_control might not be initialized. To fix this
+ * since input_CanPaceControl() might not be initialized. To fix this
* issue, handle clock source selection when the first PCR is sent (from
* ES_OUT_SET_PCR). */
assert( p_sys->b_active );
@@ -1293,7 +1292,7 @@ static void EsOutProgramHandleClockSource( es_out_t *out,
es_out_pgrm_t *p_pgrm
switch( p_sys->clock_source )
{
case VLC_CLOCK_MASTER_AUTO:
-if (priv->b_can_pace_control)
+if (input_CanPaceControl(p_input))
{
p_pgrm->active_clock_source = VLC_CLOCK_MASTER_AUDIO;
break;
@@ -3300,7 +3299,7 @@ static int EsOutVaControlLocked( es_out_t *out,
input_source_t *source,
bool b_extra_buffering_allowed = !b_low_delay &&
EsOutIsExtraBufferingAllowed( out );
vlc_tick_t i_late = input_clock_Update(
p_pgrm->p_input_clock, VLC_OBJECT(p_sys->p_input),
-priv->b_can_pace_control || p_sys->b_buffering,
+input_CanPaceControl(p_sys->p_input) ||
p_sys->b_buffering,
b_extra_buffering_allowed,
i_pcr, vlc_tick_now() );
=
src/input/es_out_timeshift.c
=
@@ -546,7 +546,7 @@ static int ControlLockedGetWakeup( es_out_t *p_out,
vlc_tick_t *pi_wakeup )
if( p_sys->b_delayed )
{
-assert( !input_priv(p_sys->p_input)->b_can_pace_control );
+assert( !input_CanPaceControl( p_sys->p_input ) );
*pi_wakeup = 0;
}
else
@@ -579,7 +579,7 @@ static int ControlLockedSetPauseState( es_out_t *p_out,
bool b_source_paused, bo
else
{
i_ret = VLC_EGENERIC;
-if( !input_priv(p_sys->p_input)->b_can_pace_control )
+if( !input_CanPaceControl( p_sys->p_input ) )
{
if( !p_sys->b_delayed )
TsStart( p_out );
@@ -614,7 +614,7 @@ static int ControlLockedSetRate( es_out_t *p_out, float
src_rate, float rate )
else
{
i_ret = VLC_EGENERIC;
-if( !input_priv(p_sys->p_input)->b_can_pace_control )
+if( !input_CanPaceControl( p_sys->p_input ) )
{
if( !p_sys->b_delayed )
TsStart( p_out );
=
src/input/input.c
=
@@ -304,7 +304,6
[vlc-commits] [Git][videolan/vlc][master] 3 commits: d3d11_player: field renaming
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
b7378da2 by Martin Finkel at 2021-05-07T08:21:48+00:00
d3d11_player: field renaming
- - - - -
65226020 by Martin Finkel at 2021-05-07T08:21:48+00:00
lib: docs: align group_id variable naming
Signed-off-by: Martin Finkel mar...@videolabs.io
- - - - -
b48fd310 by Martin Finkel at 2021-05-07T08:21:48+00:00
lib: docs: indicate programs are also deleted with the list
Signed-off-by: Martin Finkel mar...@videolabs.io
- - - - -
2 changed files:
- doc/libvlc/d3d11_player.cpp
- include/vlc/libvlc_media_player.h
Changes:
=
doc/libvlc/d3d11_player.cpp
=
@@ -47,7 +47,7 @@ struct render_context
struct {
ID3D11Texture2D *textureVLC; // shared between VLC and the app
ID3D11RenderTargetView *textureRenderTarget;
-HANDLE sharedHandled; // handle of the texture used
by VLC and the app
+HANDLE sharedHandle; // handle of the texture used by
VLC and the app
/* texture VLC renders into */
ID3D11Texture2D *texture;
@@ -280,10 +280,10 @@ static void init_direct3d(struct render_context *ctx)
static void release_textures(struct render_context *ctx)
{
ULONG ref;
-if (ctx->resized.sharedHandled)
+if (ctx->resized.sharedHandle)
{
-CloseHandle(ctx->resized.sharedHandled);
-ctx->resized.sharedHandled = NULL;
+CloseHandle(ctx->resized.sharedHandle);
+ctx->resized.sharedHandle = NULL;
}
if (ctx->resized.textureVLC)
{
@@ -382,7 +382,6 @@ static bool UpdateOutput_cb( void *opaque, const
libvlc_video_render_cfg_t *cfg,
D3D11_TEXTURE2D_DESC texDesc = { };
texDesc.MipLevels = 1;
texDesc.SampleDesc.Count = 1;
-texDesc.MiscFlags = 0;
texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE;
texDesc.Usage = D3D11_USAGE_DEFAULT;
texDesc.CPUAccessFlags = 0;
@@ -397,12 +396,12 @@ static bool UpdateOutput_cb( void *opaque, const
libvlc_video_render_cfg_t *cfg,
IDXGIResource1* sharedResource = NULL;
ctx->resized.texture->QueryInterface(__uuidof(IDXGIResource1), (LPVOID*)
);
-hr = sharedResource->CreateSharedHandle(NULL,
DXGI_SHARED_RESOURCE_READ|DXGI_SHARED_RESOURCE_WRITE, NULL,
>resized.sharedHandled);
+hr = sharedResource->CreateSharedHandle(NULL,
DXGI_SHARED_RESOURCE_READ|DXGI_SHARED_RESOURCE_WRITE, NULL,
>resized.sharedHandle);
sharedResource->Release();
ID3D11Device1* d3d11VLC1;
ctx->d3deviceVLC->QueryInterface(__uuidof(ID3D11Device1), (LPVOID*)
);
-hr = d3d11VLC1->OpenSharedResource1(ctx->resized.sharedHandled,
__uuidof(ID3D11Texture2D), (void**)>resized.textureVLC);
+hr = d3d11VLC1->OpenSharedResource1(ctx->resized.sharedHandle,
__uuidof(ID3D11Texture2D), (void**)>resized.textureVLC);
d3d11VLC1->Release();
D3D11_SHADER_RESOURCE_VIEW_DESC resviewDesc;
=
include/vlc/libvlc_media_player.h
=
@@ -1533,9 +1533,10 @@ libvlc_player_programlist_at(
libvlc_player_programlist_t *list, size_t index );
/**
* Release a programlist
*
+ * \note program structs from the list are also deleted.
+ *
* \version LibVLC 4.0.0 and later.
*
- * \see libvlc_media_get_programlist
* \see libvlc_media_player_get_programlist
*
* \param list valid programlist
@@ -1552,9 +1553,9 @@ libvlc_player_programlist_delete(
libvlc_player_programlist_t *list );
* \version LibVLC 4.0.0 or later
*
* \param p_mi opaque media player handle
- * \param program_id
+ * \param i_group_id program id
*/
-LIBVLC_API void libvlc_media_player_select_program_id( libvlc_media_player_t
*p_mi, int program_id);
+LIBVLC_API void libvlc_media_player_select_program_id( libvlc_media_player_t
*p_mi, int i_group_id);
/**
* Get the selected program
@@ -1577,7 +1578,7 @@ libvlc_media_player_get_selected_program(
libvlc_media_player_t *p_mi);
* \param p_mi opaque media player handle
* \param i_group_id program id
*
- * \return a valid program struct or NULL if the group_id is not found. The
+ * \return a valid program struct or NULL if the i_group_id is not found. The
* program need to be freed with libvlc_player_program_delete().
*/
LIBVLC_API libvlc_player_program_t *
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/1d02d748ee36202a805063b1e6a919042a9d60d7...b48fd310931f8c84e6b976ee2b0feef700aa8c09
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/1d02d748ee36202a805063b1e6a919042a9d60d7...b48fd310931f8c84e6b976ee2b0feef700aa8c09
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] wayland: fix wayland-client cflags
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Commits: a4617538 by Niklas Haas at 2021-05-06T07:23:01+00:00 wayland: fix wayland-client cflags This WAYLAND_CFLAGS was probably meant to be WAYLAND_CLIENT_CFLAGS. The former doesnt exist on my system, the latter is required for compilation to succeed. - - - - - 1 changed file: - modules/video_output/wayland/Makefile.am Changes: = modules/video_output/wayland/Makefile.am = @@ -77,9 +77,9 @@ libvk_wl_plugin_la_SOURCES = \ video_output/vulkan/instance.h \ video_output/wayland/vulkan.c libvk_wl_plugin_la_CFLAGS = $(AM_CFLAGS) \ - $(WAYLAND_CFLAGS) $(VULKAN_COMMONCFLAGS) \ + $(WAYLAND_CLIENT_CFLAGS) $(VULKAN_COMMONCFLAGS) \ -DVK_USE_PLATFORM_WAYLAND_KHR -libvk_wl_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) $(WAYLAND_LIBS) +libvk_wl_plugin_la_LIBADD = $(VULKAN_COMMONLIBS) $(WAYLAND_CLIENT_LIBS) if HAVE_WAYLAND BUILT_SOURCES += $(nodist_libwl_shm_plugin_la_SOURCES) View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a4617538a5b9f56c7566fe0631e9ed7b4b6ac614 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/a4617538a5b9f56c7566fe0631e9ed7b4b6ac614 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] input: Fix thumbnailer black frames
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
bf81ddc4 by Hugo Beauzée-Luyssen at 2021-05-05T08:34:25+00:00
input: Fix thumbnailer black frames
Fix a regression introduced in
adfe2249db3cd9fd4b8e568ba3a9dadd9d107768
Fix #25605
- - - - -
1 changed file:
- src/input/thumbnailer.c
Changes:
=
src/input/thumbnailer.c
=
@@ -280,7 +280,7 @@ vlc_thumbnailer_RequestByPos( vlc_thumbnailer_t
*thumbnailer,
{
struct seek_target seek_target = {
.type = VLC_THUMBNAILER_SEEK_POS,
-.time = pos,
+.pos = pos,
};
return RequestCommon(thumbnailer, seek_target, speed, item, timeout, cb,
userdata);
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/bf81ddc49cf389a0de37077c70d4420ceb58465f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/bf81ddc49cf389a0de37077c70d4420ceb58465f
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] vout: do not trigger OSD for vout reset callbacks when unchanged
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
badb301c by Francois Cartegnie at 2021-05-05T08:17:59+00:00
vout: do not trigger OSD for vout reset callbacks when unchanged
- - - - -
2 changed files:
- src/player/osd.c
- src/video_output/vout_intf.c
Changes:
=
src/player/osd.c
=
@@ -323,10 +323,10 @@ vlc_player_vout_OSDCallback(vlc_object_t *this, const
char *var,
free(mode);
}
-else if (strcmp(var, "sub-margin") == 0)
+else if (strcmp(var, "sub-margin") == 0 && newval.i_int != oldval.i_int)
vouts_osd_Message(, 1, _("Subtitle position %d px"),
newval.i_int);
-else if (strcmp(var, "secondary-sub-margin") == 0)
+else if (strcmp(var, "secondary-sub-margin") == 0 && newval.i_int !=
oldval.i_int)
vouts_osd_Message(, 1, _("Secondary subtitle position %d px"),
newval.i_int);
else if (strcmp(var, "sub-text-scale") == 0)
=
src/video_output/vout_intf.c
=
@@ -313,6 +313,8 @@ void vout_IntfReinit( vout_thread_t *p_vout )
var_TriggerCallback( p_vout, "video-filter" );
var_TriggerCallback( p_vout, "sub-source" );
var_TriggerCallback( p_vout, "sub-filter" );
+/* !Warn those will trigger also vlc_player_vout_OSDCallback and
+cause unwanted OSD on vout start. Filter out it there. */
var_TriggerCallback( p_vout, "sub-margin" );
var_TriggerCallback( p_vout, "secondary-sub-margin" );
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/badb301cec5a53d19741fc5d61f0f2c488832b0f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/badb301cec5a53d19741fc5d61f0f2c488832b0f
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 2 commits: Revert "Fix MSI packaging"
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
fccc47c6 by Hugo Beauzée-Luyssen at 2021-05-04T12:18:36+00:00
Revert Fix MSI packaging
This reverts commit 105de271ad53e15952627ee969cc185eec8f2e59.
- - - - -
e7458985 by Hugo Beauzée-Luyssen at 2021-05-04T12:18:36+00:00
extras: win32 package: Copy README.md as README.txt
- - - - -
2 changed files:
- extras/package/win32/msi/product.wxs
- extras/package/win32/package.mak
Changes:
=
extras/package/win32/msi/product.wxs
=
@@ -125,7 +125,7 @@
-
+
=
extras/package/win32/package.mak
=
@@ -54,9 +54,10 @@ endif
for file in AUTHORS THANKS ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" >
"$(win32_destdir)/$${file}.txt"; \
done
- for file in NEWS COPYING README.md; \
+ for file in NEWS COPYING; \
do cp "$(srcdir)/$$file" "$(win32_destdir)/$${file}.txt"; \
done
+ cp "$(srcdir)/README.md" "$(win32_destdir)/README.txt"
cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)
for plugindir in $(prefix)/lib/vlc/plugins/*/; do \
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/172eacd6f388588d72046de271e36726e0f399d0...e74589855c390a5e464a3c676a855afe55eb5f42
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/172eacd6f388588d72046de271e36726e0f399d0...e74589855c390a5e464a3c676a855afe55eb5f42
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] gitlab-ci: run make dist on debian target
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
172eacd6 by Thomas Guillem at 2021-05-04T10:00:41+00:00
gitlab-ci: run make dist on debian target
cf. !68
- - - - -
1 changed file:
- extras/ci/gitlab-ci.yml
Changes:
=
extras/ci/gitlab-ci.yml
=
@@ -247,6 +247,10 @@ debian:
if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
export XZ_OPT="-T 0"
make -j$NCPU distcheck
+else
+ # Don't run distcheck but dist as it is already tested via
+ # make_check_wrapper.sh
+ make -j$NCPU dist
fi
variables: *variables-debian
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/172eacd6f388588d72046de271e36726e0f399d0
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/172eacd6f388588d72046de271e36726e0f399d0
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] builtin_shaders.h: update to BT.709-2 coefficients
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
68b27c23 by Valerii Zapodovnikov at 2021-05-03T14:41:37+00:00
builtin_shaders.h: update to BT.709-2 coefficients
- - - - -
1 changed file:
- modules/video_output/win32/builtin_shaders.h
Changes:
=
modules/video_output/win32/builtin_shaders.h
=
@@ -63,9 +63,9 @@ static const char shader_convert601to709_source[] =
"float4 yuv709_to_rgb(float4 YUV)\n"
"{\n"
-"float Kr = 0.2125;\n"
-"float Kg = 0.7154;\n"
-"float Kb = 0.0721;\n"
+"float Kr = 0.2126;\n"
+"float Kg = 0.7152;\n"
+"float Kb = 0.0722;\n"
"float Y = YUV.x;\n"
"float U = YUV.y;\n"
"float V = YUV.z;\n"
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/68b27c23fd6f87577d2f1c49821008fc5b86f75d
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/68b27c23fd6f87577d2f1c49821008fc5b86f75d
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 6 commits: medialibrary: fix FsFactory::createFile method
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits:
e7fd452c by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: fix FsFactory::createFile method
The createFile method in the FsFactory was using the mrl incorrectly by
creating a temporary directory with the full mrl of the file instead of
truncating the file name.
- - - - -
c35d7f02 by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: fs/file: reformat ctor
Previously, input_filess slaves where just ignored while creating ml
files. These changes take into account these files, create them in the
ml hierarchy and link them with their relatives.
- - - - -
edfcc459 by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: add input_slaves to the ml hierarchy
Previously, input_filess slaves where just ignored while creating ml
files. These changes take into account these files, create them in the
ml hierarchy and link them with their relatives.
- - - - -
80864e99 by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: expose new ml_file_t values
The medialibrary has files sizes and last modification dates in its
database. This patch exposes theses two previously ignored values.
- - - - -
2af0f654 by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: fix `directory.cpp formatting
- - - - -
76107933 by Alaric Senat at 2021-05-02T10:31:06+00:00
medialibrary: change misleading error messages
Switch to a more generic error message.
Theses errors message can be triggered by local filesystem errors or any
timeouts. Assuming all the errors will come from network is incorrect
and potentially misleading.
- - - - -
9 changed files:
- include/vlc_media_library.h
- modules/misc/medialibrary/entities.cpp
- modules/misc/medialibrary/fs/directory.cpp
- modules/misc/medialibrary/fs/directory.h
- modules/misc/medialibrary/fs/file.cpp
- modules/misc/medialibrary/fs/file.h
- modules/misc/medialibrary/fs/fs.cpp
- modules/misc/medialibrary/fs/util.cpp
- modules/misc/medialibrary/fs/util.h
Changes:
=
include/vlc_media_library.h
=
@@ -150,6 +150,8 @@ typedef struct vlc_ml_label_list_t
typedef struct vlc_ml_file_t
{
char* psz_mrl;
+int64_t i_size;
+time_t i_last_modification_date;
vlc_ml_file_type_t i_type;
bool b_external;
bool b_removable;
=
modules/misc/medialibrary/entities.cpp
=
@@ -296,6 +296,8 @@ bool Convert( const medialibrary::IFile* input,
vlc_ml_file_t& output )
vlc_assert_unreachable();
}
+output.i_size = input->size();
+output.i_last_modification_date = input->lastModificationDate();
output.b_removable = input->isRemovable();
output.b_present = true;
try
=
modules/misc/medialibrary/fs/directory.cpp
=
@@ -26,16 +26,20 @@
#include "file.h"
#include "util.h"
-#include
-#include
-#include
-#include
#include
+#include
#include
+#include
#include
#include
#include
+
+#include
+#include
#include
+#include
+#include
+#include
using InputItemPtr = vlc_shared_data_ptr_type(input_item_t,
input_item_Hold,
@@ -61,7 +65,7 @@ SDDirectory::mrl() const
const std::vector> &
SDDirectory::files() const
{
-if (!m_read_done)
+if ( !m_read_done )
read();
return m_files;
}
@@ -69,7 +73,7 @@ SDDirectory::files() const
const std::vector> &
SDDirectory::dirs() const
{
-if (!m_read_done)
+if ( !m_read_done )
read();
return m_dirs;
}
@@ -77,8 +81,8 @@ SDDirectory::dirs() const
std::shared_ptr
SDDirectory::device() const
{
-if (!m_device)
-m_device = m_fs.createDeviceFromMrl(mrl());
+if ( !m_device )
+m_device = m_fs.createDeviceFromMrl( mrl() );
return m_device;
}
@@ -135,13 +139,13 @@ static void onParserSubtreeAdded( input_item_t *,
input_item_node_t *subtree,
{
auto req = static_cast( data );
-for (int i = 0; i < subtree->i_children; ++i)
+for ( int i = 0; i < subtree->i_children; ++i )
{
-input_item_node_t *child = subtree->pp_children[i];
+input_item_node_t* child = subtree->pp_children[i];
/* this class assumes we always receive a flat list */
- assert(child->i_children == 0);
- input_item_t *media = child->p_item;
- req->children->emplace_back( media );
+assert( child->i_children == 0 );
+input_item_t* media = child->p_item;
+req->children->emplace_back( media );
}
}
@@ -165,21 +169,20 @@ static bool request_metadata_sync( libvlc_int_t *libvlc,
input_item_t *media,
onParserSubtreeAdded,
};
-auto inputParser = vlc::wrap_cptr(
-input_item_Parse( media, VLC_OBJECT( l
[vlc-commits] core: update_crypto: Ensure we don't overflow while shifting
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon Apr 19 11:49:27 2021 +0200| [4cd66139cef61e9a7390db304e99ee80f01bf555] | committer: Hugo Beauzée-Luyssen core: update_crypto: Ensure we don't overflow while shifting (cherry picked from commit 984407ba32a0f3d4ed5dd69510b943003bb3bd63) Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4cd66139cef61e9a7390db304e99ee80f01bf555 --- src/misc/update_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c index d4e65fa2a6..09479468c0 100644 --- a/src/misc/update_crypto.c +++ b/src/misc/update_crypto.c @@ -63,7 +63,7 @@ static inline uint32_t scalar_number( const uint8_t *p, int header_len ) else if( header_len == 2 ) return( (p[0] << 8) + p[1] ); else if( header_len == 4 ) -return( (p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] ); +return( ((uint32_t)p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3] ); else abort(); } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] core: update_crypto: Use uint32_t for buffer sizes
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon Apr
19 11:46:56 2021 +0200| [4df4378f433fb5b175bf0792f32bb7014f055c10] | committer:
Hugo Beauzée-Luyssen
core: update_crypto: Use uint32_t for buffer sizes
(cherry picked from commit 1778e11aaffc628f62cfb6e35ba9d64b1953620e)
Signed-off-by: Hugo Beauzée-Luyssen
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4df4378f433fb5b175bf0792f32bb7014f055c10
---
src/misc/update_crypto.c | 26 +-
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/misc/update_crypto.c b/src/misc/update_crypto.c
index 87800d11a4..d4e65fa2a6 100644
--- a/src/misc/update_crypto.c
+++ b/src/misc/update_crypto.c
@@ -54,7 +54,7 @@
#define packet_header_len( c ) ( ( c & 0x03 ) + 1 ) /* number of bytes in a
packet header */
-static inline int scalar_number( const uint8_t *p, int header_len )
+static inline uint32_t scalar_number( const uint8_t *p, int header_len )
{
assert( header_len == 1 || header_len == 2 || header_len == 4 );
@@ -70,7 +70,7 @@ static inline int scalar_number( const uint8_t *p, int
header_len )
/* number of data bytes in a MPI */
-static int mpi_len(const uint8_t *mpi)
+static uint32_t mpi_len(const uint8_t *mpi)
{
return (scalar_number(mpi, 2) + 7) / 8;
}
@@ -482,15 +482,15 @@ static int verify_signature_rsa( signature_packet_t
*sign, public_key_packet_t *
gcry_sexp_t key_sexp, hash_sexp, sig_sexp;
key_sexp = hash_sexp = sig_sexp = NULL;
-int i_n_len = mpi_len( p_key->sig.rsa.n );
-int i_e_len = mpi_len( p_key->sig.rsa.e );
+size_t i_e_len = mpi_len( p_key->sig.rsa.e );
+size_t i_n_len = mpi_len( p_key->sig.rsa.n );
if( gcry_mpi_scan( , GCRYMPI_FMT_USG, p_key->sig.rsa.n + 2, i_n_len,
NULL ) ||
gcry_mpi_scan( , GCRYMPI_FMT_USG, p_key->sig.rsa.e + 2, i_e_len,
NULL ) ||
gcry_sexp_build( _sexp, , key_sexp_s, n, e ) )
goto out;
uint8_t *p_s = sign->algo_specific.rsa.s;
-int i_s_len = mpi_len( p_s );
+size_t i_s_len = mpi_len( p_s );
if( gcry_mpi_scan( , GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) ||
gcry_sexp_build( _sexp, , sig_sexp_s, s ) )
goto out;
@@ -536,10 +536,10 @@ static int verify_signature_dsa( signature_packet_t
*sign, public_key_packet_t *
gcry_sexp_t key_sexp, hash_sexp, sig_sexp;
key_sexp = hash_sexp = sig_sexp = NULL;
-int i_p_len = mpi_len( p_key->sig.dsa.p );
-int i_q_len = mpi_len( p_key->sig.dsa.q );
-int i_g_len = mpi_len( p_key->sig.dsa.g );
-int i_y_len = mpi_len( p_key->sig.dsa.y );
+size_t i_p_len = mpi_len( p_key->sig.dsa.p );
+size_t i_q_len = mpi_len( p_key->sig.dsa.q );
+size_t i_g_len = mpi_len( p_key->sig.dsa.g );
+size_t i_y_len = mpi_len( p_key->sig.dsa.y );
if( gcry_mpi_scan( , GCRYMPI_FMT_USG, p_key->sig.dsa.p + 2, i_p_len,
NULL ) ||
gcry_mpi_scan( , GCRYMPI_FMT_USG, p_key->sig.dsa.q + 2, i_q_len,
NULL ) ||
gcry_mpi_scan( , GCRYMPI_FMT_USG, p_key->sig.dsa.g + 2, i_g_len,
NULL ) ||
@@ -549,14 +549,14 @@ static int verify_signature_dsa( signature_packet_t
*sign, public_key_packet_t *
uint8_t *p_r = sign->algo_specific.dsa.r;
uint8_t *p_s = sign->algo_specific.dsa.s;
-int i_r_len = mpi_len( p_r );
-int i_s_len = mpi_len( p_s );
+size_t i_r_len = mpi_len( p_r );
+size_t i_s_len = mpi_len( p_s );
if( gcry_mpi_scan( , GCRYMPI_FMT_USG, p_r + 2, i_r_len, NULL ) ||
gcry_mpi_scan( , GCRYMPI_FMT_USG, p_s + 2, i_s_len, NULL ) ||
gcry_sexp_build( _sexp, , sig_sexp_s, r, s ) )
goto out;
-int i_hash_len = gcry_md_get_algo_dlen (sign->digest_algo);
+unsigned int i_hash_len = gcry_md_get_algo_dlen (sign->digest_algo);
if (i_hash_len > i_q_len)
i_hash_len = i_q_len;
if( gcry_mpi_scan( , GCRYMPI_FMT_USG, p_hash, i_hash_len, NULL ) ||
@@ -648,7 +648,7 @@ int parse_public_key( const uint8_t *p_key_data, size_t
i_key_len,
( i_header_len != 1 && i_header_len != 2 && i_header_len != 4 ) )
goto error;
-int i_packet_len = scalar_number( pos, i_header_len );
+size_t i_packet_len = scalar_number( pos, i_header_len );
pos += i_header_len;
if( pos + i_packet_len > max_pos )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/libvlcpp][master] Fixed typo in vlcpp/structures.hpp
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp Commits: 17e622c6 by The personified devil at 2021-03-19T14:49:34+01:00 Fixed typo in vlcpp/structures.hpp - - - - - 1 changed file: - vlcpp/structures.hpp Changes: = vlcpp/structures.hpp = @@ -792,7 +792,7 @@ class AudioOutputDeviceDescription if ( d->psz_device != nullptr ) m_device = d->psz_device; if ( d->psz_description != nullptr ) -m_device = d->psz_description; +m_description = d->psz_description; } private: View it on GitLab: https://code.videolan.org/videolan/libvlcpp/-/commit/17e622c6a23f685a60451e9611d50e361cee2278 -- View it on GitLab: https://code.videolan.org/videolan/libvlcpp/-/commit/17e622c6a23f685a60451e9611d50e361cee2278 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/libvlcpp][master] MediaDiscoverer: Add a default constructor
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp
Commits:
b4eecc53 by Hugo Beauzée-Luyssen at 2021-03-12T12:42:58+01:00
MediaDiscoverer: Add a default constructor
- - - - -
1 changed file:
- vlcpp/MediaDiscoverer.hpp
Changes:
=
vlcpp/MediaDiscoverer.hpp
=
@@ -98,6 +98,13 @@ public:
{
}
+/**
+ * Create an empty Media Discoverer instance.
+ *
+ * Calling any method on such an instance is undefined.
+*/
+MediaDiscoverer() = default;
+
#if LIBVLC_VERSION_INT >= LIBVLC_VERSION(3, 0, 0, 0)
/**
* Start media discovery.
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/b4eecc53b602af563bec579c92fb853b1b2cf4ef
--
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/b4eecc53b602af563bec579c92fb853b1b2cf4ef
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/libvlcpp][master] Instance: Allow construction from an existing libvlc_instance_t
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp
Commits:
f52dc9fd by Hugo Beauzée-Luyssen at 2021-03-09T10:07:48+01:00
Instance: Allow construction from an existing libvlc_instance_t
- - - - -
1 changed file:
- vlcpp/Instance.hpp
Changes:
=
vlcpp/Instance.hpp
=
@@ -111,6 +111,19 @@ public:
{
}
+/**
+ * \brief Instance Wraps an existing libvlc instance to be used with
libvlcpp
+ * \param instance A libvlc_instance_t
+ *
+ * The instance will be held by the constructor, the caller can release it
+ * as soon at the instance is constructed.
+ */
+explicit Instance( libvlc_instance_t* instance )
+: Internal{ instance, libvlc_release }
+{
+libvlc_retain( instance );
+}
+
/**
* Create an empty VLC instance.
*
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/f52dc9fd50af47565e30d66a695fe7f95090ce1c
--
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/f52dc9fd50af47565e30d66a695fe7f95090ce1c
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/libvlcpp][master] MediaList: Added missing constructor for an empty MediaList
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp
Commits:
98fafd88 by Leonhard Saam at 2021-02-18T19:04:46+01:00
MediaList: Added missing constructor for an empty MediaList
- - - - -
1 changed file:
- vlcpp/MediaList.hpp
Changes:
=
vlcpp/MediaList.hpp
=
@@ -79,16 +79,10 @@ public:
*
* \param p_mlib media library object
*/
-MediaList(MediaLibrary& mlib )
+MediaList(MediaLibrary& mlib)
: Internal{ libvlc_media_library_media_list(
getInternalPtr( mlib ) ), libvlc_media_list_release }
{
}
-#endif
-
-MediaList( Internal::InternalPtr mediaList )
-: Internal{ mediaList, libvlc_media_list_release }
-{
-}
/**
* Create an empty VLC MediaList instance.
@@ -97,6 +91,34 @@ public:
*/
MediaList() = default;
+/**
+ * Create an empty media list.
+ *
+ * \param p_instance libvlc instance
+ */
+MediaList(Instance& instance)
+: Internal{ libvlc_media_list_new( getInternalPtr(
instance ) ),
+ libvlc_media_list_release }
+{
+}
+#else
+/**
+ * Create an empty media list.
+ *
+ * \param p_instance libvlc instance
+ */
+MediaList()
+: Internal{ libvlc_media_list_new(),
+libvlc_media_list_release }
+{
+}
+#endif
+
+MediaList( Internal::InternalPtr mediaList )
+: Internal{ mediaList, libvlc_media_list_release }
+{
+}
+
/**
* Associate media instance with this media list instance. If another
* media instance was present it will be released. The
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/98fafd88113c65f44e283a004c992ed5fc9111c0
--
View it on GitLab:
https://code.videolan.org/videolan/libvlcpp/-/commit/98fafd88113c65f44e283a004c992ed5fc9111c0
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/npapi-vlc][master] Bump libvlcpp submodule
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC Browser Plugins Commits: a19f7b3b by Hugo Beauzée-Luyssen at 2021-01-30T19:01:51+01:00 Bump libvlcpp submodule - - - - - 1 changed file: - vlcpp Changes: = vlcpp = @@ -1 +1 @@ -Subproject commit 94ee174a05b5dc462aece1dc08cad735f06e7cfa +Subproject commit 4ac2be9c5a9ae83dfba5fa605400491310ca2279 View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8 -- View it on GitLab: https://code.videolan.org/videolan/npapi-vlc/-/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Bump libvlcpp submodule
npapi-vlc | branch: master | Hugo Beauzée-Luyssen | Sat Jan 30 19:01:40 2021 +0100| [a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8] | committer: Hugo Beauzée-Luyssen Bump libvlcpp submodule > https://code.videolan.org/videolan/npapi-vlc/commit/a19f7b3bfce5a022785c89e4b4de4e3eddfda3c8 --- vlcpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlcpp b/vlcpp index 94ee174..4ac2be9 16 --- a/vlcpp +++ b/vlcpp @@ -1 +1 @@ -Subproject commit 94ee174a05b5dc462aece1dc08cad735f06e7cfa +Subproject commit 4ac2be9c5a9ae83dfba5fa605400491310ca2279 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/libvlcpp][master] EventManager: Don't expose onFreed event starting from 4.0
Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / libvlcpp Commits: 4ac2be9c by Hugo Beauzée-Luyssen at 2021-01-30T18:55:47+01:00 EventManager: Dont expose onFreed event starting from 4.0 - - - - - 1 changed file: - vlcpp/EventManager.hpp Changes: = vlcpp/EventManager.hpp = @@ -334,6 +334,7 @@ class MediaEventManager : public EventManager #endif } +#if LIBVLC_VERSION_INT < LIBVLC_VERSION(4, 0, 0, 0) /** * \brief onFreed Registers an event called when the media reaches a refcount of 0 * \param f A std::function (or an equivalent Callable type) @@ -354,6 +355,7 @@ class MediaEventManager : public EventManager (*callback)( media != nullptr ? std::make_shared( media, true ) : nullptr ); }); } +#endif /** * \brief onStateChanged Registers an event called when the Media state changes View it on GitLab: https://code.videolan.org/videolan/libvlcpp/-/commit/4ac2be9c5a9ae83dfba5fa605400491310ca2279 -- View it on GitLab: https://code.videolan.org/videolan/libvlcpp/-/commit/4ac2be9c5a9ae83dfba5fa605400491310ca2279 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_common: Provide an unreachable() implementation for MSVC
vlc | branch: master | Hugo Beauzée-Luyssen | Fri Dec 18 13:04:14 2020 +0100| [626a5d9a16b44ff01bb6f25b76872f1c4bd5bab0] | committer: Hugo Beauzée-Luyssen vlc_common: Provide an unreachable() implementation for MSVC > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=626a5d9a16b44ff01bb6f25b76872f1c4bd5bab0 --- include/vlc_common.h | 4 1 file changed, 4 insertions(+) diff --git a/include/vlc_common.h b/include/vlc_common.h index d65a076d45..f62ff86d04 100644 --- a/include/vlc_common.h +++ b/include/vlc_common.h @@ -203,6 +203,10 @@ # define likely(p) __builtin_expect(!!(p), 1) # define unlikely(p) __builtin_expect(!!(p), 0) # define unreachable() __builtin_unreachable() +#elif defined(_MSC_VER) +# define likely(p) (!!(p)) +# define unlikely(p) (!!(p)) +# define unreachable() (__assume(0)) #else /** * Predicted true condition ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] config: file: Remove useless copy
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 17
17:47:58 2020 +0100| [695d579e115c95bf914d17b4b5fbc299cd05b109] | committer:
Hugo Beauzée-Luyssen
config: file: Remove useless copy
The folder is always owned by the caller, so we can modify it directly
and save a copy per folder level
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=695d579e115c95bf914d17b4b5fbc299cd05b109
---
src/config/file.c | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/config/file.c b/src/config/file.c
index 35cd1e4dfe..10f8973f0c 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -267,7 +267,7 @@ int config_LoadConfigFile( vlc_object_t *p_this )
/*
* config_CreateDir: Create configuration directory if it doesn't exist.
*/
-static int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
+static int config_CreateDir( vlc_object_t *p_this, char *psz_dirname )
{
if( !psz_dirname || !*psz_dirname ) return -1;
@@ -282,14 +282,13 @@ static int config_CreateDir( vlc_object_t *p_this, const
char *psz_dirname )
case ENOENT:
{
/* Let's try to create the parent directory */
-char psz_parent[strlen( psz_dirname ) + 1], *psz_end;
-strcpy( psz_parent, psz_dirname );
-
-psz_end = strrchr( psz_parent, DIR_SEP_CHAR );
-if( psz_end && psz_end != psz_parent )
+char *psz_end = strrchr( psz_dirname, DIR_SEP_CHAR );
+if( psz_end && psz_end != psz_dirname )
{
*psz_end = '\0';
-if( config_CreateDir( p_this, psz_parent ) == 0 )
+int res = config_CreateDir( p_this, psz_dirname );
+*psz_end = DIR_SEP_CHAR;
+if( res == 0 )
{
if( !vlc_mkdir( psz_dirname, 0700 ) )
return 0;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] preparser: art: Remove useless copy
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 17
16:52:46 2020 +0100| [3103c63b8b434c0f47d88ba5102d526832fff22a] | committer:
Hugo Beauzée-Luyssen
preparser: art: Remove useless copy
The content is always owned by the called, and since the
ArtCacheCreateDir doesn't change the string content, we can simply use
the string passed in parameter without any need for a copy
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3103c63b8b434c0f47d88ba5102d526832fff22a
---
src/preparser/art.c | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/preparser/art.c b/src/preparser/art.c
index b7f0d48411..9fa9e66ba0 100644
--- a/src/preparser/art.c
+++ b/src/preparser/art.c
@@ -37,20 +37,17 @@
#include "art.h"
-static void ArtCacheCreateDir( const char *psz_dir )
+static void ArtCacheCreateDir( char *psz_dir )
{
-char newdir[strlen( psz_dir ) + 1];
-strcpy( newdir, psz_dir );
-char * psz_newdir = newdir;
-char * psz = psz_newdir;
+char * psz = psz_dir;
while( *psz )
{
while( *psz && *psz != DIR_SEP_CHAR) psz++;
if( !*psz ) break;
*psz = 0;
-if( !EMPTY_STR( psz_newdir ) )
-vlc_mkdir( psz_newdir, 0700 );
+if( !EMPTY_STR( psz_dir ) )
+vlc_mkdir( psz_dir, 0700 );
*psz = DIR_SEP_CHAR;
psz++;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] config: file: Mark config_CreateDir as static
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 17
17:31:43 2020 +0100| [4bb3e03ced3e9a18654eda25c182352b6cc3ebc9] | committer:
Hugo Beauzée-Luyssen
config: file: Mark config_CreateDir as static
It's not in any other file
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4bb3e03ced3e9a18654eda25c182352b6cc3ebc9
---
src/config/configuration.h | 1 -
src/config/file.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/config/configuration.h b/src/config/configuration.h
index ec19abc89e..ecf96ef4d8 100644
--- a/src/config/configuration.h
+++ b/src/config/configuration.h
@@ -27,7 +27,6 @@ extern "C" {
/* Internal configuration prototypes and structures */
-int config_CreateDir( vlc_object_t *, const char * );
int config_AutoSaveConfigFile( vlc_object_t * );
void config_Free (module_config_t *, size_t);
diff --git a/src/config/file.c b/src/config/file.c
index ae6e8b9ce5..35cd1e4dfe 100644
--- a/src/config/file.c
+++ b/src/config/file.c
@@ -267,7 +267,7 @@ int config_LoadConfigFile( vlc_object_t *p_this )
/*
* config_CreateDir: Create configuration directory if it doesn't exist.
*/
-int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
+static int config_CreateDir( vlc_object_t *p_this, const char *psz_dirname )
{
if( !psz_dirname || !*psz_dirname ) return -1;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] picture: Use vlc_atomic_rc
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Nov 26
12:29:08 2020 +0100| [9b197f348c6d33f565bf8a205486e55ff41a02ba] | committer:
Hugo Beauzée-Luyssen
picture: Use vlc_atomic_rc
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b197f348c6d33f565bf8a205486e55ff41a02ba
---
include/vlc_picture.h | 19 ---
src/misc/picture.c| 6 ++
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index 5010c2f10a..09f65a1326 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -26,14 +26,7 @@
#define VLC_PICTURE_H 1
#include
-#ifndef __cplusplus
-#include
-#else
-#include
-using std::atomic_uintptr_t;
-using std::memory_order_relaxed;
-using std::memory_order_release;
-#endif
+#include
/**
* \file
@@ -160,7 +153,7 @@ struct picture_t
/** Next picture in a FIFO a pictures */
struct picture_t *p_next;
-atomic_uintptr_t refs;
+vlc_atomic_rc_t refs;
};
static inline vlc_video_context* picture_GetVideoContext(picture_t *pic)
@@ -360,8 +353,7 @@ VLC_API void picture_Destroy(picture_t *picture);
*/
static inline picture_t *picture_Hold(picture_t *picture)
{
-atomic_fetch_add_explicit(>refs, (uintptr_t)1,
- memory_order_relaxed);
+vlc_atomic_rc_inc(>refs);
return picture;
}
@@ -374,10 +366,7 @@ static inline picture_t *picture_Hold(picture_t *picture)
*/
static inline void picture_Release(picture_t *picture)
{
-uintptr_t refs = atomic_fetch_sub_explicit(>refs, (uintptr_t)1,
- memory_order_release);
-vlc_assert(refs > 0);
-if (refs == 1)
+if (vlc_atomic_rc_dec(>refs))
picture_Destroy(picture);
}
diff --git a/src/misc/picture.c b/src/misc/picture.c
index e00b130325..5b867a7591 100644
--- a/src/misc/picture.c
+++ b/src/misc/picture.c
@@ -210,7 +210,7 @@ static bool picture_InitPrivate(const video_format_t
*restrict p_fmt,
if( picture_Setup( p_picture, p_fmt ) )
return false;
-atomic_init(_picture->refs, 1);
+vlc_atomic_rc_init(_picture->refs);
priv->gc.opaque = NULL;
p_picture->p_sys = p_resource->p_sys;
@@ -337,9 +337,7 @@ picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width,
int i_height, int i_
void picture_Destroy(picture_t *picture)
{
-/* See changes from other threads */
-atomic_thread_fence(memory_order_acquire);
-assert(atomic_load_explicit(>refs, memory_order_relaxed) == 0);
+assert(vlc_atomic_rc_get(>refs) == 0);
PictureDestroyContext(picture);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_atomic: Add a vlc_atomic_rc_get function
vlc | branch: master | Hugo Beauzée-Luyssen | Wed Dec 16
14:29:06 2020 +0100| [5a6b9d32bde8420ae8a7fe26d46c0fb5e5b27857] | committer:
Hugo Beauzée-Luyssen
vlc_atomic: Add a vlc_atomic_rc_get function
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a6b9d32bde8420ae8a7fe26d46c0fb5e5b27857
---
include/vlc_atomic.h | 8
1 file changed, 8 insertions(+)
diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index d596259e12..ac0d5998aa 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -60,4 +60,12 @@ static inline bool vlc_atomic_rc_dec(vlc_atomic_rc_t *rc)
return prev == 1;
}
+/** Returns the current reference count.
+ * This is not safe to use for logic and must only be used for debugging or
+ * assertion purposes */
+static inline uintptr_t vlc_atomic_rc_get(const vlc_atomic_rc_t* rc)
+{
+return atomic_load_explicit(>refs, memory_order_relaxed);
+}
+
#endif
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] picture_pool: Use vlc_atomic_rc_t
vlc | branch: master | Hugo Beauzée-Luyssen | Mon Nov 30
01:21:18 2020 -0800| [666b132b701852cc8cdc4cafba7493c896f6952e] | committer:
Hugo Beauzée-Luyssen
picture_pool: Use vlc_atomic_rc_t
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=666b132b701852cc8cdc4cafba7493c896f6952e
---
src/misc/picture_pool.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/misc/picture_pool.c b/src/misc/picture_pool.c
index d2df4bf2eb..055487b985 100644
--- a/src/misc/picture_pool.c
+++ b/src/misc/picture_pool.c
@@ -32,6 +32,7 @@
#include
#include
+#include
#include "picture.h"
#define POOL_MAX (CHAR_BIT * sizeof (unsigned long long))
@@ -44,17 +45,16 @@ struct picture_pool_t {
bool canceled;
unsigned long long available;
-atomic_ushort refs;
+vlc_atomic_rc_trefs;
unsigned short picture_count;
picture_t *picture[];
};
static void picture_pool_Destroy(picture_pool_t *pool)
{
-if (atomic_fetch_sub_explicit(>refs, 1, memory_order_release) != 1)
+if (!vlc_atomic_rc_dec(>refs))
return;
-atomic_thread_fence(memory_order_acquire);
aligned_free(pool);
}
@@ -94,7 +94,7 @@ static picture_t *picture_pool_ClonePicture(picture_pool_t
*pool,
(void*)sys);
if (clone != NULL) {
assert(!picture_HasChainedPics(clone));
-atomic_fetch_add_explicit(>refs, 1, memory_order_relaxed);
+vlc_atomic_rc_inc(>refs);
}
return clone;
}
@@ -118,7 +118,7 @@ picture_pool_t *picture_pool_New(unsigned count, picture_t
*const *tab)
pool->available = ~0ULL;
else
pool->available = (1ULL << count) - 1;
-atomic_init(>refs, 1);
+vlc_atomic_rc_init(>refs);
pool->picture_count = count;
memcpy(pool->picture, tab, count * sizeof (picture_t *));
pool->canceled = false;
@@ -177,7 +177,7 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
unsigned long long available;
vlc_mutex_lock(>lock);
-assert(pool->refs > 0);
+assert(vlc_atomic_rc_get(>refs) > 0);
available = pool->available;
while (available != 0)
@@ -201,7 +201,7 @@ picture_t *picture_pool_Get(picture_pool_t *pool)
picture_t *picture_pool_Wait(picture_pool_t *pool)
{
vlc_mutex_lock(>lock);
-assert(pool->refs > 0);
+assert(vlc_atomic_rc_get(>refs) > 0);
while (pool->available == 0)
{
@@ -223,7 +223,7 @@ picture_t *picture_pool_Wait(picture_pool_t *pool)
void picture_pool_Cancel(picture_pool_t *pool, bool canceled)
{
vlc_mutex_lock(>lock);
-assert(pool->refs > 0);
+assert(vlc_atomic_rc_get(>refs) > 0);
pool->canceled = canceled;
if (canceled)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_atomic.h: Allow inclusion when building C++
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Nov 26
12:25:54 2020 +0100| [876bb0e0094a5b151adc3a7e4c521514862fdcbb] | committer:
Hugo Beauzée-Luyssen
vlc_atomic.h: Allow inclusion when building C++
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=876bb0e0094a5b151adc3a7e4c521514862fdcbb
---
include/vlc_atomic.h | 19 ---
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h
index ac0d5998aa..b393fafb36 100644
--- a/include/vlc_atomic.h
+++ b/include/vlc_atomic.h
@@ -18,10 +18,6 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*/
-#ifdef __cplusplus
-# error Not implemented in C++.
-#endif
-
#ifndef VLC_ATOMIC_H
# define VLC_ATOMIC_H
@@ -31,7 +27,14 @@
*/
# include
+#ifndef __cplusplus
# include
+#else
+# include
+using std::atomic_uintptr_t;
+using std::memory_order_relaxed;
+using std::memory_order_acq_rel;
+#endif
# include
typedef struct vlc_atomic_rc_t {
@@ -41,13 +44,14 @@ typedef struct vlc_atomic_rc_t {
/** Init the RC to 1 */
static inline void vlc_atomic_rc_init(vlc_atomic_rc_t *rc)
{
-atomic_init(>refs, 1);
+atomic_init(>refs, (uintptr_t)1);
}
/** Increment the RC */
static inline void vlc_atomic_rc_inc(vlc_atomic_rc_t *rc)
{
-uintptr_t prev = atomic_fetch_add_explicit(>refs, 1,
memory_order_relaxed);
+uintptr_t prev = atomic_fetch_add_explicit(>refs, (uintptr_t)1,
+ memory_order_relaxed);
vlc_assert(prev);
VLC_UNUSED(prev);
}
@@ -55,7 +59,8 @@ static inline void vlc_atomic_rc_inc(vlc_atomic_rc_t *rc)
/** Decrement the RC and return true if it reaches 0 */
static inline bool vlc_atomic_rc_dec(vlc_atomic_rc_t *rc)
{
-uintptr_t prev = atomic_fetch_sub_explicit(>refs, 1,
memory_order_acq_rel);
+uintptr_t prev = atomic_fetch_sub_explicit(>refs, (uintptr_t)1,
+ memory_order_acq_rel);
vlc_assert(prev);
return prev == 1;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] demux: ts: Fix potential use of uninitialized variable
vlc | branch: master | Hugo Beauzée-Luyssen | Tue Dec 15
17:37:33 2020 +0100| [6ae50cc4c956469ebda5ea75cd6e48893889f23d] | committer:
Hugo Beauzée-Luyssen
demux: ts: Fix potential use of uninitialized variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ae50cc4c956469ebda5ea75cd6e48893889f23d
---
modules/demux/mpeg/ts.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index 9c7c4625c6..b294d06d0e 100644
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -450,7 +450,7 @@ static int Open( vlc_object_t *p_this )
if( psz_string && *psz_string )
{
int i_res;
-char* psz_csa2;
+char* psz_csa2 = NULL;
p_sys->csa = csa_New();
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avi: Fix integer overflow
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon Nov 9 09:54:27 2020 +0100| [56cbe9c4b59edbdc5e1bb2687992f3bbf492eccb] | committer: Hugo Beauzée-Luyssen avi: Fix integer overflow Which would in turn cause a size verification failure, leading to a buffer overflow Reported by: Zhen Zhou, NSFOCUS Security Team (cherry picked from commit a4b1de184faf86617b4432954c1984e0027fb246) Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=56cbe9c4b59edbdc5e1bb2687992f3bbf492eccb --- modules/demux/avi/avi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 9ca8043472..7868a0f90e 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -3078,7 +3078,7 @@ static void AVI_ExtractSubtitle( demux_t *p_demux, if( i_size < 6 || GetWLE( [0] ) != 0x04 ) goto exit; const unsigned i_payload = GetDWLE( [2] ); -if( i_size < 6 + i_payload || i_payload <= 0 ) +if( i_size - 6 < i_payload || i_payload == 0 ) goto exit; p += 6; i_size -= 6; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] mkv: Ensure we don't use an EbmlDummy element for something it's not
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Fri Sep 18 14:53:15 2020 +0200| [ec1f55ee9ace5cc675395a1bc9700d99679e7e8c] | committer: Hugo Beauzée-Luyssen mkv: Ensure we don't use an EbmlDummy element for something it's not Reported by: Zhen Zhou, NSFOCUS Security (cherry picked from commit 89093b8c033d6dee3d16bebf4a7df6abad4105b8) Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ec1f55ee9ace5cc675395a1bc9700d99679e7e8c --- modules/demux/mkv/mkv.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 38a62aa2af..fa9a1e81a5 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -113,7 +113,7 @@ enum #define MKVD_TIMECODESCALE 100 -#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) ) +#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() ) #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avi: Fix integer overflow
vlc | branch: master | Hugo Beauzée-Luyssen | Mon Nov 9 09:54:27 2020 +0100| [a4b1de184faf86617b4432954c1984e0027fb246] | committer: Hugo Beauzée-Luyssen avi: Fix integer overflow Which would in turn cause a size verification failure, leading to a buffer overflow Reported by: Zhen Zhou, NSFOCUS Security Team > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a4b1de184faf86617b4432954c1984e0027fb246 --- modules/demux/avi/avi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c index 9174b3167b..c3aa70ef57 100644 --- a/modules/demux/avi/avi.c +++ b/modules/demux/avi/avi.c @@ -2933,7 +2933,7 @@ static void AVI_ExtractSubtitle( demux_t *p_demux, if( i_size < 6 || GetWLE( [0] ) != 0x04 ) goto exit; const unsigned i_payload = GetDWLE( [2] ); -if( i_size < 6 + i_payload || i_payload <= 0 ) +if( i_size - 6 < i_payload || i_payload == 0 ) goto exit; p += 6; i_size -= 6; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] mkv: Ensure we don't use an EbmlDummy element for something it's not
vlc | branch: master | Hugo Beauzée-Luyssen | Fri Sep 18 14:53:15 2020 +0200| [89093b8c033d6dee3d16bebf4a7df6abad4105b8] | committer: Hugo Beauzée-Luyssen mkv: Ensure we don't use an EbmlDummy element for something it's not Reported by: Zhen Zhou, NSFOCUS Security > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89093b8c033d6dee3d16bebf4a7df6abad4105b8 --- modules/demux/mkv/mkv.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 5d8c24603b..048f41532e 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -112,7 +112,7 @@ enum #define MKVD_TIMECODESCALE 100 -#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) ) +#define MKV_IS_ID( el, C ) ( el != NULL && (el->operator const EbmlId&()) == (C::ClassInfos.ClassId()) && !el->IsDummy() ) #define MKV_CHECKED_PTR_DECL( name, type, src ) type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL #define MKV_CHECKED_PTR_DECL_CONST( name, type, src ) const type * name = MKV_IS_ID(src, type) ? static_cast(src) : NULL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras: CI: Bump windows images
vlc | branch: master | Hugo Beauzée-Luyssen | Mon Dec 14
11:08:09 2020 +0100| [5ce8a11d63423239b32a9def9364b70abe0700e7] | committer:
Hugo Beauzée-Luyssen
extras: CI: Bump windows images
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5ce8a11d63423239b32a9def9364b70abe0700e7
---
extras/ci/gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index f8364124f7..d42ec06efd 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -12,8 +12,8 @@ default:
- mv contrib/vlc-contrib-*.tar.bz2
contrib/vlc-contrib-${TRIPLET}-${VLC_CONTRIB_SHA}.tar.bz2 2>/dev/null || true
variables:
-VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20200702161720
-VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20200702144729
+VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20201106141924
+VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20201106143728
VLC_WIN_LLVM_IMAGE:
registry.videolan.org/vlc-debian-llvm-mingw:20201201162707
VLC_UWP_LLVM_IMAGE:
registry.videolan.org/vlc-debian-llvm-uwp:20201201150955
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] network: http auth: Remove VLA usages
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10
17:31:28 2020 +0100| [1e56827c79b662cec37c580d596630412ebeca68] | committer:
Hugo Beauzée-Luyssen
network: http auth: Remove VLA usages
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e56827c79b662cec37c580d596630412ebeca68
---
src/network/http_auth.c | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/network/http_auth.c b/src/network/http_auth.c
index 599fda6286..76f91fe7d9 100644
--- a/src/network/http_auth.c
+++ b/src/network/http_auth.c
@@ -42,10 +42,9 @@
/*
* "RFC 2617: Basic and Digest Access Authentication" header parsing
*/
-static char *AuthGetParam( const char *psz_header, const char *psz_param )
+#define AuthGetParam( HEADER, PARAM ) AuthGetParamConcat( HEADER, PARAM "=\"" )
+static char *AuthGetParamConcat( const char *psz_header, const char *psz_what )
{
-char psz_what[strlen(psz_param)+3];
-sprintf( psz_what, "%s=\"", psz_param );
psz_header = strstr( psz_header, psz_what );
if ( psz_header )
{
@@ -62,10 +61,9 @@ static char *AuthGetParam( const char *psz_header, const
char *psz_param )
}
}
-static char *AuthGetParamNoQuotes( const char *psz_header, const char
*psz_param )
+#define AuthGetParamNoQuotes( HEADER, PARAM ) AuthGetParamNoQuotesConcat(
HEADER, PARAM "=" )
+static char *AuthGetParamNoQuotesConcat( const char *psz_header, const char
*psz_what )
{
-char psz_what[strlen(psz_param)+2];
-sprintf( psz_what, "%s=", psz_param );
psz_header = strstr( psz_header, psz_what );
if ( psz_header )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] On the road to 3.0.12
vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen | Mon Dec 14 12:28:28 2020 +0100| [ed5d14181c22edddc40e859e85c233c20f08c693] | committer: Hugo Beauzée-Luyssen On the road to 3.0.12 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ed5d14181c22edddc40e859e85c233c20f08c693 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 376f5200e7..3fc09545d0 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2020 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.11.1) +AC_INIT(vlc, 3.0.12) VERSION_MAJOR=3 VERSION_MINOR=0 -VERSION_REVISION=11 -VERSION_EXTRA=1 +VERSION_REVISION=12 +VERSION_EXTRA=0 VERSION_DEV= PKGDIR="vlc" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] lib: media_list: Fix syntax error
vlc | branch: master | Hugo Beauzée-Luyssen | Fri Dec 11
14:03:08 2020 +0100| [a5bc4e86de5814608845ea050a93eddf3b8e7e24] | committer:
Hugo Beauzée-Luyssen
lib: media_list: Fix syntax error
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5bc4e86de5814608845ea050a93eddf3b8e7e24
---
lib/media_list.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/media_list.c b/lib/media_list.c
index 353530c2a5..b120bd3166 100644
--- a/lib/media_list.c
+++ b/lib/media_list.c
@@ -180,7 +180,7 @@ libvlc_media_list_t *libvlc_media_list_new(void)
void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
{
if( !vlc_atomic_rc_dec( _mlist->rc ) )
-return
+return;
/* Refcount null, time to free */
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] input: stream: Avoid VLA
vlc | branch: master | Hugo Beauzée-Luyssen | Fri Nov 27 06:19:21 2020 -0800| [3b670ad92de7de94bb9b917e44a31372de4926ea] | committer: Hugo Beauzée-Luyssen input: stream: Avoid VLA > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b670ad92de7de94bb9b917e44a31372de4926ea --- src/input/stream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/input/stream.c b/src/input/stream.c index 77c8cf0e4c..b07c3b451d 100644 --- a/src/input/stream.c +++ b/src/input/stream.c @@ -434,8 +434,8 @@ static ssize_t vlc_stream_ReadRaw(stream_t *s, void *buf, size_t len) if (unlikely(len == 0)) return 0; -char dummy[(len <= 256 ? len : 256)]; -ret = s->pf_read(s, dummy, sizeof (dummy)); +char dummy[256]; +ret = s->pf_read(s, dummy, len <= 256 ? len : 256); } else ret = s->pf_read(s, buf, len); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] adaptive: playlist: Fix list cleanup
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10
15:08:15 2020 +0100| [7e305be5d43d5dc2aa6f62e09a31fa24af822314] | committer:
Hugo Beauzée-Luyssen
adaptive: playlist: Fix list cleanup
Calling front() on an empty container is undefined behavior
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7e305be5d43d5dc2aa6f62e09a31fa24af822314
---
modules/demux/adaptive/playlist/Inheritables.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/adaptive/playlist/Inheritables.cpp
b/modules/demux/adaptive/playlist/Inheritables.cpp
index c61b3f0c45..16c1ef4d2f 100644
--- a/modules/demux/adaptive/playlist/Inheritables.cpp
+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
@@ -58,7 +58,7 @@ AttrsNode::AttrsNode(Type t, AttrsNode *parent_)
AttrsNode::~AttrsNode()
{
-while(props.front())
+while(!props.empty())
{
delete props.front();
props.pop_front();
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] actions: Remove VLA usage
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10
17:14:54 2020 +0100| [8d6ce1be1c25d6372ae8aa8f578cec833c4da8f2] | committer:
Hugo Beauzée-Luyssen
actions: Remove VLA usage
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d6ce1be1c25d6372ae8aa8f578cec833c4da8f2
---
src/misc/actions.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/misc/actions.c b/src/misc/actions.c
index ddbf04ad65..5b6e081f1c 100644
--- a/src/misc/actions.c
+++ b/src/misc/actions.c
@@ -601,7 +601,8 @@ size_t
vlc_actions_get_keycodes(vlc_object_t *p_obj, const char *psz_key_name,
bool b_global, uint_fast32_t **pp_keycodes)
{
-char varname[12 /* "global-key-" */ + strlen( psz_key_name )];
+assert(strlen( psz_key_name ) <= MAXACTION);
+char varname[12 /* "global-key-" */ + MAXACTION];
sprintf( varname, "%skey-%s", b_global ? "global-" : "", psz_key_name );
*pp_keycodes = NULL;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] playlist_controller: Fix uninitialized member
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10 16:09:09 2020 +0100| [547e58b86ddadbfea58755cb37133a950eb1d7c2] | committer: Hugo Beauzée-Luyssen playlist_controller: Fix uninitialized member > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=547e58b86ddadbfea58755cb37133a950eb1d7c2 --- modules/gui/qt/playlist/playlist_controller_p.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt/playlist/playlist_controller_p.hpp b/modules/gui/qt/playlist/playlist_controller_p.hpp index f49ec5b636..4fd22c974e 100644 --- a/modules/gui/qt/playlist/playlist_controller_p.hpp +++ b/modules/gui/qt/playlist/playlist_controller_p.hpp @@ -58,7 +58,7 @@ public: bool m_hasPrev = false; PlaylistControllerModel::PlaybackRepeat m_repeat = PlaylistControllerModel::PLAYBACK_REPEAT_NONE; bool m_random = false; -bool m_isPlayAndExit; +bool m_isPlayAndExit = false; bool m_empty = true; size_t m_count = 0; PlaylistControllerModel::SortKey m_sortKey = PlaylistControllerModel::SORT_KEY_NONE; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_plugin.h: Move the EXTERN_SYMBOL definition higher in the file
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3 03:36:06 2020 -0800| [47a51638054ddf0ec1f9f5426c0775c5e8da9fb6] | committer: Hugo Beauzée-Luyssen vlc_plugin.h: Move the EXTERN_SYMBOL definition higher in the file No functional change > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47a51638054ddf0ec1f9f5426c0775c5e8da9fb6 --- include/vlc_plugin.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 7a68c953e3..88317c88db 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -204,6 +204,12 @@ enum vlc_module_properties #define CONCATENATE( y, z ) CRUDE_HACK( y, z ) #define CRUDE_HACK( y, z ) y##__##z +#if defined(__cplusplus) +#define EXTERN_SYMBOL extern "C" +#else +#define EXTERN_SYMBOL +#endif + /* If the module is built-in, then we need to define foo_InitModule instead * of InitModule. Same for Activate- and DeactivateModule. */ #ifdef __PLUGIN__ @@ -230,12 +236,6 @@ enum vlc_module_properties # define DLL_SYMBOL #endif -#if defined( __cplusplus ) -# define EXTERN_SYMBOL extern "C" -#else -# define EXTERN_SYMBOL -#endif - EXTERN_SYMBOL typedef int (*vlc_set_cb) (void *, void *, int, ...); #define vlc_plugin_set(...) vlc_set (opaque, NULL, __VA_ARGS__) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] actions: Fix MAXACTION value
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10
16:35:17 2020 +0100| [70945326df84c2d2952e6ab148ff1f162faf7b65] | committer:
Hugo Beauzée-Luyssen
actions: Fix MAXACTION value
The longuest string is 26 characters long, not including terminal null
byte
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=70945326df84c2d2952e6ab148ff1f162faf7b65
---
src/misc/actions.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/actions.c b/src/misc/actions.c
index b10b07936e..ddbf04ad65 100644
--- a/src/misc/actions.c
+++ b/src/misc/actions.c
@@ -255,7 +255,7 @@ found:
/*** VLC key map ***/
-#define MAXACTION 26
+#define MAXACTION 27
static const struct name2action
{
char psz[MAXACTION];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_messages.h: Declare vlc_module_name as extern "C" when building C++
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3 03:45:36 2020 -0800| [c01ef0f56bc1498e54799dd23b4d68cdd1eb138b] | committer: Hugo Beauzée-Luyssen vlc_messages.h: Declare vlc_module_name as extern "C" when building C++ Otherwise link might fail > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c01ef0f56bc1498e54799dd23b4d68cdd1eb138b --- include/vlc_messages.h | 4 1 file changed, 4 insertions(+) diff --git a/include/vlc_messages.h b/include/vlc_messages.h index b6d5843985..95bce875fb 100644 --- a/include/vlc_messages.h +++ b/include/vlc_messages.h @@ -105,7 +105,11 @@ VLC_API void vlc_object_vaLog(vlc_object_t *obj, int prio, const char *module, #define msg_Dbg(p_this, ...) \ msg_Generic(p_this, VLC_MSG_DBG, __VA_ARGS__) +#ifndef __cplusplus extern const char vlc_module_name[]; +#else +extern "C" const char vlc_module_name[]; +#endif VLC_API const char *vlc_strerror(int); VLC_API const char *vlc_strerror_c(int); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] modules: Use a typedef for deactivate function pointer
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 10 19:49:10 2020 +0100| [84c04c3182e2184ded3eff6748b23997627798b6] | committer: Hugo Beauzée-Luyssen modules: Use a typedef for deactivate function pointer Using va_arg with the function pointer type spelled out can be considered ill-formed as per C11 §7.16.1.1 See http://c-faq.com/varargs/funcptr.html > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84c04c3182e2184ded3eff6748b23997627798b6 --- src/modules/entry.c | 4 ++-- src/modules/modules.h | 5 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/modules/entry.c b/src/modules/entry.c index fc7f3cdbb6..1d921d5af0 100644 --- a/src/modules/entry.c +++ b/src/modules/entry.c @@ -273,7 +273,7 @@ static int vlc_plugin_desc_cb(void *ctx, void *tgt, int propid, ...) case VLC_MODULE_CB_CLOSE: module->deactivate_name = va_arg(ap, const char *); -module->deactivate = va_arg(ap, void (*)(vlc_object_t *)); +module->deactivate = va_arg(ap, vlc_deactivate_cb); break; case VLC_MODULE_NO_UNLOAD: @@ -498,7 +498,7 @@ static int vlc_plugin_gpa_cb(void *ctx, void *tgt, int propid, ...) va_start(ap, propid); name = va_arg(ap, const char *); -addr = va_arg(ap, void (*)(vlc_object_t *)); +addr = va_arg(ap, vlc_deactivate_cb); va_end(ap); break; } diff --git a/src/modules/modules.h b/src/modules/modules.h index 93cc1ca289..34d6b81dd9 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -66,6 +66,9 @@ extern struct vlc_plugin_t *vlc_plugins; /** Plugin entry point prototype */ typedef int (*vlc_plugin_cb) (int (*)(void *, void *, int, ...), void *); +/** Plugin deactivation callback */ +typedef void (*vlc_deactivate_cb)(vlc_object_t*); + /** Core module */ int vlc_entry__core (int (*)(void *, void *, int, ...), void *); @@ -95,7 +98,7 @@ struct module_t const char *activate_name; const char *deactivate_name; void *pf_activate; -void (*deactivate)(vlc_object_t *); +vlc_deactivate_cb deactivate; }; vlc_plugin_t *vlc_plugin_create(void); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] vlc_plugin.h: Declare vlc_module_name as an EXTERN_SYMBOL
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3 03:36:55 2020 -0800| [b3c69dd2c9306fd756a0f18a2793a93b797818c8] | committer: Hugo Beauzée-Luyssen vlc_plugin.h: Declare vlc_module_name as an EXTERN_SYMBOL We don't want the symbol to be mangled when building C++ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3c69dd2c9306fd756a0f18a2793a93b797818c8 --- include/vlc_plugin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 88317c88db..d13622 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -215,7 +215,7 @@ enum vlc_module_properties #ifdef __PLUGIN__ # define VLC_SYMBOL(symbol) symbol # define VLC_MODULE_NAME_HIDDEN_SYMBOL \ -const char vlc_module_name[] = MODULE_STRING; +EXTERN_SYMBOL const char vlc_module_name[] = MODULE_STRING; #else # define VLC_SYMBOL(symbol) CONCATENATE(symbol, MODULE_NAME) # define VLC_MODULE_NAME_HIDDEN_SYMBOL ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] adaptive: SegmentList: Fix variable shadowing
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3
10:16:21 2020 -0800| [d9f10e44c4d39bfbc3a6022ea96a8b1f4aaf71ac] | committer:
Hugo Beauzée-Luyssen
adaptive: SegmentList: Fix variable shadowing
Causing a potential use of uninitialized variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d9f10e44c4d39bfbc3a6022ea96a8b1f4aaf71ac
---
modules/demux/adaptive/playlist/SegmentList.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/demux/adaptive/playlist/SegmentList.cpp
b/modules/demux/adaptive/playlist/SegmentList.cpp
index 92d12b56f7..71a60b09ed 100644
--- a/modules/demux/adaptive/playlist/SegmentList.cpp
+++ b/modules/demux/adaptive/playlist/SegmentList.cpp
@@ -178,8 +178,8 @@ bool
SegmentList::getPlaybackTimeDurationBySegmentNumber(uint64_t number,
return false;
bool found = false;
-stime_t stime = first->startTime.Get();
-stime_t sduration = 0;
+stime = first->startTime.Get();
+sduration = 0;
std::vector::const_iterator it = segments.begin();
for(it = segments.begin(); it != segments.end(); ++it)
{
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] filter_chain: Fix struct initialization
vlc | branch: master | Hugo Beauzée-Luyssen | Mon Nov 30
01:36:04 2020 -0800| [b8b8bd7ff1304647822d716828115d40539dc576] | committer:
Hugo Beauzée-Luyssen
filter_chain: Fix struct initialization
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b8b8bd7ff1304647822d716828115d40539dc576
---
src/misc/filter_chain.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index baa2f9684c..82068f3ff2 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -158,7 +158,7 @@ filter_chain_t *filter_chain_NewVideo( vlc_object_t *obj,
bool allow_change,
chain->parent_video_owner = *owner;
}
else
-chain->parent_video_owner = (filter_owner_t){};
+chain->parent_video_owner = (filter_owner_t){0};
return chain;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] adaptive: BufferingLogic: Fix variable shadowing
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3
10:15:58 2020 -0800| [0390f40ca7700c1b262333ef34733473608086ad] | committer:
Hugo Beauzée-Luyssen
adaptive: BufferingLogic: Fix variable shadowing
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0390f40ca7700c1b262333ef34733473608086ad
---
modules/demux/adaptive/logic/BufferingLogic.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/adaptive/logic/BufferingLogic.cpp
b/modules/demux/adaptive/logic/BufferingLogic.cpp
index 0fd79232cc..0622d94690 100644
--- a/modules/demux/adaptive/logic/BufferingLogic.cpp
+++ b/modules/demux/adaptive/logic/BufferingLogic.cpp
@@ -182,7 +182,7 @@ uint64_t
DefaultBufferingLogic::getLiveStartSegmentNumber(BaseRepresentation *re
if(playlist->timeShiftBufferDepth.Get())
{
stime_t edgetime;
-bool b_ret =
timeline->getScaledPlaybackTimeDurationBySegmentNumber(timeline->maxElementNumber(),
+b_ret =
timeline->getScaledPlaybackTimeDurationBySegmentNumber(timeline->maxElementNumber(),
, );
if(unlikely(!b_ret))
return 0;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] adaptive: Use std::string::npos instead of a literal -1
vlc | branch: master | Hugo Beauzée-Luyssen | Thu Dec 3
03:47:45 2020 -0800| [eaebf7d18c332316b89a8a1e550cae241a42b3eb] | committer:
Hugo Beauzée-Luyssen
adaptive: Use std::string::npos instead of a literal -1
MSVC complains about a negative number being assigned to an unsigned
variable
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eaebf7d18c332316b89a8a1e550cae241a42b3eb
---
modules/demux/dash/mpd/IsoffMainParser.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp
b/modules/demux/dash/mpd/IsoffMainParser.cpp
index 408c61b567..c3553657ea 100644
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -580,7 +580,7 @@ Profile IsoffMainParser::getProfile() const
urn = root->getAttributeValue("profile"); //The standard spells it the
both ways...
size_t pos;
-size_t nextpos = -1;
+size_t nextpos = std::string::npos;
do
{
pos = nextpos + 1;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
