[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][master] Qt: Fix metadata URL not cleared
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: 13ecfd02 by Aashish Parmar at 2021-06-18T14:08:27+00:00 Qt: Fix metadata URL not cleared Closes #22752 - - - - - 1 changed file: - modules/gui/qt/dialogs/mediainfo/info_panels.cpp Changes: = modules/gui/qt/dialogs/mediainfo/info_panels.cpp = @@ -346,6 +346,7 @@ void MetaPanel::clear() encodedby_text->clear(); art_cover->clear(); fingerprintButton->setVisible( false ); +lblURL->clear(); setEditMode( false ); emit uriSet( "" ); View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/13ecfd02a21fb1ceae45d6933312d05e763416d6 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/13ecfd02a21fb1ceae45d6933312d05e763416d6 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: remove unused paused parameter
Romain Vimont pushed to branch master at VideoLAN / VLC
Commits:
3d3e23fa by Romain Vimont at 2021-06-18T07:37:30+00:00
vout: remove unused paused parameter
The parameter "paused" was written but never read by the caller.
This is the case since f1bf7ce5b4480a3d38d54c7ae1d1564f0670d83f.
The comment above "*paused = true" says:
> (so that the current picture is displayed but not the next one)
Since then, the next picture has been removed by
4ec95bb1668140f7022736ca0221e13c2cac98a8, so the "paused" parameter
can
be removed too.
- - - - -
1 changed file:
- src/video_output/video_output.c
Changes:
=
src/video_output/video_output.c
=
@@ -975,7 +975,7 @@ static bool IsPictureLate(vout_thread_sys_t *vout,
picture_t *decoded,
/* */
VLC_USED
static picture_t *PreparePicture(vout_thread_sys_t *vout, bool reuse_decoded,
- bool frame_by_frame, bool *paused)
+ bool frame_by_frame)
{
vout_thread_sys_t *sys = vout;
bool is_late_dropped = sys->is_late_dropped && !frame_by_frame;
@@ -1000,22 +1000,12 @@ static picture_t *PreparePicture(vout_thread_sys_t
*vout, bool reuse_decoded,
vlc_clock_ConvertToSystem(sys->clock, system_now,
decoded->date, sys->rate);
-if (system_pts == INT64_MAX)
+if (system_pts != INT64_MAX &&
+IsPictureLate(vout, decoded, system_now, system_pts))
{
-/* The clock is paused, notify it (so that the current
- * picture is displayed but not the next one), this
- * current picture can't be be late. */
-*paused = true;
-}
-else
-{
-if (IsPictureLate(vout, decoded, system_now,
- system_pts))
-{
-picture_Release(decoded);
-vout_statistic_AddLost(&sys->statistic, 1);
-continue;
-}
+picture_Release(decoded);
+vout_statistic_AddLost(&sys->statistic, 1);
+continue;
}
}
vlc_video_context *pic_vctx = picture_GetVideoContext(decoded);
@@ -1390,7 +1380,7 @@ static int DisplayPicture(vout_thread_sys_t *vout,
vlc_tick_t *deadline)
if (frame_by_frame)
{
picture_t *next;
-next = PreparePicture(vout, !sys->displayed.current, true, &paused);
+next = PreparePicture(vout, !sys->displayed.current, true);
if (next)
{
@@ -1426,7 +1416,7 @@ static int DisplayPicture(vout_thread_sys_t *vout,
vlc_tick_t *deadline)
picture_t *next = NULL;
if (first)
{
-next = PreparePicture(vout, true, false, &paused);
+next = PreparePicture(vout, true, false);
if (!next)
{
*deadline = VLC_TICK_INVALID;
@@ -1444,7 +1434,7 @@ static int DisplayPicture(vout_thread_sys_t *vout,
vlc_tick_t *deadline)
if (date_next <= system_now)
{
// the current frame will be late, look for the next not
late one
-next = PreparePicture(vout, false, false, &paused);
+next = PreparePicture(vout, false, false);
}
}
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/3d3e23fa152a7f6500f4ff3f33b99250eaf17fb0
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/3d3e23fa152a7f6500f4ff3f33b99250eaf17fb0
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] 3 commits: httpd: store timeout date rather than activity date
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC
Commits:
d6db88ba by Stavros Vagionitis at 2021-06-17T09:50:25+03:00
httpd: store timeout date rather than activity date
This should not make any functional differences.
Refs #25812.
(cherry picked from commit 2fd2b843c4af0e42c6848bc88ab03173500cc52c)
- - - - -
3f9e2d54 by Stavros Vagionitis at 2021-06-17T09:50:28+03:00
httpd: set timeout duration per host rather than client
Refs #25812.
(cherry picked from commit ce3269d4a20aba2f87fc3e512131cb31b9561b3e)
- - - - -
720d7316 by Rémi Denis-Courmont at 2021-06-17T09:50:30+03:00
httpd: do not disable timeout for RTSP
Use the same timeout for the RTSP connection as for the RTSP session.
A shorter timeout is inefficient, as it requires clients to reconnect
to refresh the session anyway. A longer timeout is pointless as the
session would timeout and the RTP streams would stop regardless of the
connection staying alive.
Refs #25812.
(cherry picked from commit 38d214bc4f2ef68dfe6859383e12a20ae91e62de)
- - - - -
1 changed file:
- src/network/httpd.c
Changes:
=
src/network/httpd.c
=
@@ -96,6 +96,7 @@ struct httpd_host_t
bool b_no_timeout;
inti_client;
httpd_client_t **client;
+unsigned timeout_sec;
/* TLS data */
vlc_tls_creds_t *p_tls;
@@ -146,8 +147,7 @@ struct httpd_client_t
boolb_stream_mode;
uint8_t i_state;
-mtime_t i_activity_date;
-mtime_t i_activity_timeout;
+mtime_t i_timeout_date;
/* buffer for reading header */
int i_buffer_size;
@@ -860,12 +860,13 @@ void httpd_StreamDelete(httpd_stream_t *stream)
*/
static void* httpd_HostThread(void *);
static httpd_host_t *httpd_HostCreate(vlc_object_t *, const char *,
- const char *, vlc_tls_creds_t *);
+ const char *, vlc_tls_creds_t *,
+ unsigned);
/* create a new host */
httpd_host_t *vlc_http_HostNew(vlc_object_t *p_this)
{
-return httpd_HostCreate(p_this, "http-host", "http-port", NULL);
+return httpd_HostCreate(p_this, "http-host", "http-port", NULL, 10);
}
httpd_host_t *vlc_https_HostNew(vlc_object_t *obj)
@@ -889,12 +890,13 @@ httpd_host_t *vlc_https_HostNew(vlc_object_t *obj)
free(key);
free(cert);
-return httpd_HostCreate(obj, "http-host", "https-port", tls);
+return httpd_HostCreate(obj, "http-host", "https-port", tls, 10);
}
httpd_host_t *vlc_rtsp_HostNew(vlc_object_t *p_this)
{
-return httpd_HostCreate(p_this, "rtsp-host", "rtsp-port", NULL);
+unsigned timeout = var_InheritInteger(p_this, "rtsp-timeout");
+return httpd_HostCreate(p_this, "rtsp-host", "rtsp-port", NULL, timeout);
}
static struct httpd
@@ -908,7 +910,8 @@ static struct httpd
static httpd_host_t *httpd_HostCreate(vlc_object_t *p_this,
const char *hostvar,
const char *portvar,
- vlc_tls_creds_t *p_tls)
+ vlc_tls_creds_t *p_tls,
+ unsigned timeout_sec)
{
httpd_host_t *host;
unsigned port = var_InheritInteger(p_this, portvar);
@@ -968,6 +971,7 @@ static httpd_host_t *httpd_HostCreate(vlc_object_t *p_this,
host->url = NULL;
host->i_client = 0;
host->client = NULL;
+host->timeout_sec = timeout_sec;
host->p_tls= p_tls;
/* create the thread */
@@ -1184,11 +1188,9 @@ void httpd_MsgAdd(httpd_message_t *msg, const char
*name, const char *psz_value,
msg->i_headers++;
}
-static void httpd_ClientInit(httpd_client_t *cl, mtime_t now)
+static void httpd_ClientInit(httpd_client_t *cl)
{
cl->i_state = HTTPD_CLIENT_RECEIVING;
-cl->i_activity_date = now;
-cl->i_activity_timeout = INT64_C(1000);
cl->i_buffer_size = HTTPD_CL_BUFSIZE;
cl->i_buffer = 0;
cl->p_buffer = xmalloc(cl->i_buffer_size);
@@ -1219,7 +1221,7 @@ static void httpd_ClientDestroy(httpd_client_t *cl)
free(cl);
}
-static httpd_client_t *httpd_ClientNew(vlc_tls_t *sock, mtime_t now)
+static httpd_client_t *httpd_ClientNew(vlc_tls_t *sock)
{
httpd_client_t *cl = malloc(sizeof(httpd_client_t));
@@ -1229,7 +1231,7 @@ static httpd_client_t *httpd_ClientNew(vlc_tls_t *sock,
mtime_t now)
cl->sock= sock;
cl->url = NULL;
-httpd_ClientInit(cl, now);
+httpd_ClientInit(cl);
return cl;
}
@@ -1559,10 +1561,6 @@ static int httpd_ClientRecv(httpd_client_t *cl)
return 0;
}
-/* XXX: for QT I have to disable timeout. Try to find why */
-if (cl->query.i_proto == HTTPD_PROTO_RTSP)
-cl->i_activity_timeout = 0;
-
return 0;
}
@@ -1737,8 +1735,8 @@ stati
[vlc-commits] [Git][videolan/vlc][master] 10 commits: demux/subtitle: clarify comment
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC Commits: 550cd952 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: clarify comment this does not just apply to srt files, it is done for all formats handled by this demuxer. it also needed additional clarification. - - - - - eb07c5f2 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: remove pointless statement we find the period for the extension and set it to null such that we can then find the second to last period that should preceed the substring we want to extract. there is absolutely no point in restoring the period afterwards in the working copy which we are then just about to destroy. the comment did not even make any sense. - - - - - d582bf98 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: add missing alloc check - - - - - 04aed075 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: minor reorganisation of filename language extraction (non-functional) prepares for handling an alternate common pattern; removes unnecessary variable (we can reuse the `psz_tmp` var now instead of also having `psz_language_begin`); better readability. - - - - - 0984f11c by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: use only filename for filename language substr extraction ...and thus prevent some ugly failures. (the string given to the function is the full filepath not just the filename). the attempt to determine the language from subtitle filenames is based upon a single common pattern - PATH/filename.LANG.ext. whilst it works just fine for this pattern, it is not the only pattern commonly used, for instance PATH/Subs/x_LANG.ext (where 'x' is an integer). in such cases where the period for the extension is the only one in the filename, the function could produce an ugly result should any directory in the path happen to contain a period (if not, NULL would be returned). it would incorrectly capture a chunk of the path as part of the substring extraction, producing results like "FOOBAR/Subs/1_English" (or worse) which then end up as the language name displayed under the subtitle menu and elsewhere. this commit strips the string processed down to filename only and thus prevents such ugliness. the next commit will introduce proper handling for the just mentioned alternate common pattern. - - - - - 0dd41106 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: handle PATH/Subs/1_English.srt type filename lang extraction the only pattern handled was PATH/filename.LANG.ext. another common one is PATH/Subs/x_LANG.ext which this adds handling for. this simply replies upon falling back to trying to get the substring after the last underscore if trying to get the substring after a period fails. we do not explicitly require the second pattern to only occur in files found under a 'Subs' subdir, since it is not certain that there is value in implementing such a restriction. - - - - - 58ce4b96 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitle: prepare for lang detection via codec properties at least one subtitle format handled by this demuxer may hold the language as a property specified within the file. we should allow the parser to extract and use that as an alternative to the filename based substring extraction. this sets things up to allow the parser functions to provide that extracted property string. - - - - - 17b2c064 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitles: clarify debug message the substring obtained from filename extraction in some cases is perfect but in other cases may not be a language at all, just some portion of the filename. stating 'detected language FOO' is a bit odd if it turns out to not actually be a language name that we've extracted. let's fix that by clarifying what we've actually retrieved, and thus distinguish the less reliable filename extraction result from the likely more reliable property available in some subtitle files. also, enclose in quotes in both cases. for the filename based case since this simply makes sense. in the property case, since this may be a language code, as it is for ASS/SSA. - - - - - 49c7098e by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitles: capture language attribute from SSA/ASS files ... for language identification. this info property has been supported by libass since v0.10.0. it is currently a 2-char iso-639-1 code. libass commit adding support: https://github.com/libass/libass/commit/c979365946b2dc2499ede862b6f7da15f9bc0ed1 discussion about enhancing the attribute to support 3-char iso-639-2 codes, possibly bcp-47: https://github.com/libass/libass/issues/404 - - - - - d7d8cff6 by Lyndon Brown at 2021-06-18T06:50:04+00:00 demux/subtitles: avoid unnecessary allocations for SSA/ASS we only need to allocate the `psz_text` buffer when handling `Dialogue` and `Language` lines. restricting allocation to lines beginning with 'D' or 'L' is a simple way of avoiding most/all that ar
