[vlc-commits] pulse: timing info can be NULL, deal with it
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont | Sun Aug
23 20:02:58 2015 +0300| [3e3504bf67afc59f804d76330ea84b04a8cb0190] | committer:
Rémi Denis-Courmont
pulse: timing info can be NULL, deal with it
(cherry picked from commit c00c298601174cbe271fbc16e34b9f77b584fb63)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=3e3504bf67afc59f804d76330ea84b04a8cb0190
---
modules/audio_output/vlcpulse.c |5 +
1 file changed, 5 insertions(+)
diff --git a/modules/audio_output/vlcpulse.c b/modules/audio_output/vlcpulse.c
index 0952cb0..42aea5c 100644
--- a/modules/audio_output/vlcpulse.c
+++ b/modules/audio_output/vlcpulse.c
@@ -264,6 +264,11 @@ mtime_t vlc_pa_get_latency(vlc_object_t *obj, pa_context
*ctx, pa_stream *s)
const pa_sample_spec *ss = pa_stream_get_sample_spec(s);
const pa_timing_info *ti = pa_stream_get_timing_info(s);
+if (ti == NULL) {
+msg_Dbg(obj, "no timing infos");
+return VLC_TS_INVALID;
+}
+
if (ti->write_index_corrupt) {
msg_Dbg(obj, "write index corrupt");
return VLC_TS_INVALID;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: add tp file extension (close #15329)
vlc | branch: master | David Fuhrmann | Sun Aug 23 16:58:54 2015 +0200| [b1d06242eedcd85ea59ed5697ecc853d21a062fe] | committer: David Fuhrmann macosx: add tp file extension (close #15329) tp is another extension for ts. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1d06242eedcd85ea59ed5697ecc853d21a062fe --- extras/package/macosx/Info.plist.in |2 ++ 1 file changed, 2 insertions(+) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 520bc15..2f80fbc 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -912,6 +912,7 @@ CFBundleTypeExtensions + tp ts m2ts mts @@ -2218,6 +2219,7 @@ m2p ps + tp ts m2ts mts ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] nsspeechsynthesizer: drop priority to 0
vlc | branch: master | David Fuhrmann | Sun Aug 23
16:54:19 2015 +0200| [8fb13a450fd6384398d5ac7ce8cf997999b6ee2f] | committer:
David Fuhrmann
nsspeechsynthesizer: drop priority to 0
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8fb13a450fd6384398d5ac7ce8cf997999b6ee2f
---
modules/text_renderer/nsspeechsynthesizer.m |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/text_renderer/nsspeechsynthesizer.m
b/modules/text_renderer/nsspeechsynthesizer.m
index 47101f0..6d4bc87 100644
--- a/modules/text_renderer/nsspeechsynthesizer.m
+++ b/modules/text_renderer/nsspeechsynthesizer.m
@@ -47,7 +47,7 @@ set_description(N_("Speech synthesis for Mac OS X"))
set_category(CAT_VIDEO)
set_subcategory(SUBCAT_VIDEO_SUBPIC)
-set_capability("text renderer", 50)
+set_capability("text renderer", 0)
set_callbacks(Create, Destroy)
vlc_module_end ()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gnutls: generate Diffie-Hellman parameters dynamically (fixes #14702)
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont | Sun Aug
23 13:18:05 2015 +0300| [70387a798477072bac5798916b6324d72454fa46] | committer:
Rémi Denis-Courmont
gnutls: generate Diffie-Hellman parameters dynamically (fixes #14702)
(cherry picked from commit cafbe261a0863505587c17ead6c69e5222d35b4a)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=70387a798477072bac5798916b6324d72454fa46
---
modules/misc/Modules.am |2 +-
modules/misc/dhparams.h | 17 -
modules/misc/gnutls.c | 15 +++
po/POTFILES.in |1 -
4 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 62a54d1..4d77265 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -19,7 +19,7 @@ libfingerprinter_plugin_la_SOURCES = fingerprinter.c \
libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD)
misc_LTLIBRARIES += libfingerprinter_plugin.la
-libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
+libgnutls_plugin_la_SOURCES = gnutls.c
libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
if HAVE_WIN32
diff --git a/modules/misc/dhparams.h b/modules/misc/dhparams.h
deleted file mode 100644
index d7e97c5..000
--- a/modules/misc/dhparams.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Pre-computed Diffie-Hellman-Merkel parameters.
- * $Id$
- * Numbers are not copyrightable.
- *
- * If you feel like it, generate new ones:
- * # certtool --generate-dh-params --bits 2048
- */
-static const unsigned char dh_params[] =
-"-BEGIN DH PARAMETERS-\n"
-"MIIBBwKCAQDJ9pqmqBy71hn5pA3QL1AiGB2JOKq2wfdRq3EQVdbOtPscXM6BXdm7"
-"NfBRUZIGT47oPNgCOhVV33z9OfnMHCSiMoWFPZeT14Mdm5TQBBYA2H6tf0g2Fp4X"
-"qs7eeYheslzkg1V7U7PcdsyopiGI0FC4Heq+PxcyFOC0DuDUNiRq2Pk51gSUQURS"
-"dtTyiU5fEFUETcFN2FWuPuCdQpA0xmYnQwnTJKq75b1GAxRlp6XqTbWmXgBggwYk"
-"+O/oGpgVLlwZPquSbumbQsp4OU0Lk0hxqTR4Jd3XIeBuV/pc1zZaCH/9LIQT6aXn"
-"S1wHhOlCUKgPWlBtx82omKgyo8ebJwWjAgEG\n"
-"-END DH PARAMETERS-";
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index f7baff7..f6d1291 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -1,7 +1,7 @@
/*
* gnutls.c
*
- * Copyright (C) 2004-2012 Rémi Denis-Courmont
+ * Copyright (C) 2004-2015 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -38,7 +38,6 @@
#include
#include
-#include "dhparams.h"
/*
* Module descriptor
@@ -715,18 +714,17 @@ static int OpenServer (vlc_tls_creds_t *crd, const char
*cert, const char *key)
}
/* FIXME:
+ * - regenerate these regularly
* - support other cipher suites
*/
val = gnutls_dh_params_init (&sys->dh_params);
if (val >= 0)
{
-const gnutls_datum_t data = {
-.data = (unsigned char *)dh_params,
-.size = sizeof (dh_params) - 1,
-};
+gnutls_sec_param_t sec = GNUTLS_SEC_PARAM_MEDIUM;
+unsigned bits = gnutls_sec_param_to_pk_bits (GNUTLS_PK_DH, sec);
-val = gnutls_dh_params_import_pkcs3 (sys->dh_params, &data,
- GNUTLS_X509_FMT_PEM);
+msg_Dbg (crd, "generating Diffie-Hellman %u-bits parameters...", bits);
+val = gnutls_dh_params_generate2 (sys->dh_params, bits);
if (val == 0)
gnutls_certificate_set_dh_params (sys->x509_cred,
sys->dh_params);
@@ -737,6 +735,7 @@ static int OpenServer (vlc_tls_creds_t *crd, const char
*cert, const char *key)
gnutls_strerror (val));
}
+msg_Dbg (crd, "ciphers parameters loaded");
return VLC_SUCCESS;
error:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 62e813e..df630e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -963,7 +963,6 @@ modules/lua/vlc.h
modules/meta_engine/folder.c
modules/meta_engine/taglib.cpp
modules/misc/audioscrobbler.c
-modules/misc/dhparams.h
modules/misc/gnutls.c
modules/misc/inhibit/dbus.c
modules/misc/inhibit/xdg.c
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gnutls: generate Diffie-Hellman parameters dynamically (fixes #14702)
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23
13:18:05 2015 +0300| [cafbe261a0863505587c17ead6c69e5222d35b4a] | committer:
Rémi Denis-Courmont
gnutls: generate Diffie-Hellman parameters dynamically (fixes #14702)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cafbe261a0863505587c17ead6c69e5222d35b4a
---
modules/misc/Makefile.am |2 +-
modules/misc/dhparams.h | 17 -
modules/misc/gnutls.c| 16
po/POTFILES.in |1 -
4 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/modules/misc/Makefile.am b/modules/misc/Makefile.am
index f9315e9..f53fc4d 100644
--- a/modules/misc/Makefile.am
+++ b/modules/misc/Makefile.am
@@ -24,7 +24,7 @@ libfingerprinter_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-I$(srcdir)/misc
libfingerprinter_plugin_la_LIBADD = $(LIBM) $(LIBPTHREAD)
misc_LTLIBRARIES += libfingerprinter_plugin.la
-libgnutls_plugin_la_SOURCES = misc/gnutls.c misc/dhparams.h
+libgnutls_plugin_la_SOURCES = misc/gnutls.c
libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
if HAVE_WIN32
diff --git a/modules/misc/dhparams.h b/modules/misc/dhparams.h
deleted file mode 100644
index d7e97c5..000
--- a/modules/misc/dhparams.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Pre-computed Diffie-Hellman-Merkel parameters.
- * $Id$
- * Numbers are not copyrightable.
- *
- * If you feel like it, generate new ones:
- * # certtool --generate-dh-params --bits 2048
- */
-static const unsigned char dh_params[] =
-"-BEGIN DH PARAMETERS-\n"
-"MIIBBwKCAQDJ9pqmqBy71hn5pA3QL1AiGB2JOKq2wfdRq3EQVdbOtPscXM6BXdm7"
-"NfBRUZIGT47oPNgCOhVV33z9OfnMHCSiMoWFPZeT14Mdm5TQBBYA2H6tf0g2Fp4X"
-"qs7eeYheslzkg1V7U7PcdsyopiGI0FC4Heq+PxcyFOC0DuDUNiRq2Pk51gSUQURS"
-"dtTyiU5fEFUETcFN2FWuPuCdQpA0xmYnQwnTJKq75b1GAxRlp6XqTbWmXgBggwYk"
-"+O/oGpgVLlwZPquSbumbQsp4OU0Lk0hxqTR4Jd3XIeBuV/pc1zZaCH/9LIQT6aXn"
-"S1wHhOlCUKgPWlBtx82omKgyo8ebJwWjAgEG\n"
-"-END DH PARAMETERS-";
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index cef2285..ea56fb3 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -1,7 +1,7 @@
/*
* gnutls.c
*
- * Copyright (C) 2004-2014 Rémi Denis-Courmont
+ * Copyright (C) 2004-2015 Rémi Denis-Courmont
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -37,7 +37,6 @@
#include
#include
-#include "dhparams.h"
#if (GNUTLS_VERSION_NUMBER >= 0x030300)
static int gnutls_Init (vlc_object_t *obj)
@@ -631,18 +630,17 @@ static int OpenServer (vlc_tls_creds_t *crd, const char
*cert, const char *key)
}
/* FIXME:
+ * - regenerate these regularly
* - support other cipher suites
*/
val = gnutls_dh_params_init (&sys->dh_params);
if (val >= 0)
{
-const gnutls_datum_t data = {
-.data = (unsigned char *)dh_params,
-.size = sizeof (dh_params) - 1,
-};
+gnutls_sec_param_t sec = GNUTLS_SEC_PARAM_MEDIUM;
+unsigned bits = gnutls_sec_param_to_pk_bits (GNUTLS_PK_DH, sec);
-val = gnutls_dh_params_import_pkcs3 (sys->dh_params, &data,
- GNUTLS_X509_FMT_PEM);
+msg_Dbg (crd, "generating Diffie-Hellman %u-bits parameters...", bits);
+val = gnutls_dh_params_generate2 (sys->dh_params, bits);
if (val == 0)
gnutls_certificate_set_dh_params (sys->x509_cred,
sys->dh_params);
@@ -653,6 +651,8 @@ static int OpenServer (vlc_tls_creds_t *crd, const char
*cert, const char *key)
gnutls_strerror (val));
}
+msg_Dbg (crd, "ciphers parameters loaded");
+
crd->sys = sys;
crd->open = gnutls_ServerSessionOpen;
crd->handshake = gnutls_ServerHandshake;
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7d8b26b..f918737 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -982,7 +982,6 @@ modules/lua/vlc.h
modules/meta_engine/folder.c
modules/meta_engine/taglib.cpp
modules/misc/audioscrobbler.c
-modules/misc/dhparams.h
modules/misc/gnutls.c
modules/misc/inhibit/dbus.c
modules/misc/inhibit/xdg.c
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: return useful/visible video dimensions (fixes #15122)
vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont | Sun Aug 23 12:46:44 2015 +0300| [b185aad11dc2f5ed31e65916e3eedcbf29c1d61f] | committer: Rémi Denis-Courmont libvlc: return useful/visible video dimensions (fixes #15122) (cherry picked from commit 5f000e6ac6154f0f30f376adc5595aeaec876da4) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=b185aad11dc2f5ed31e65916e3eedcbf29c1d61f --- lib/media.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/media.c b/lib/media.c index c2a4ef5..6f324aa 100644 --- a/lib/media.c +++ b/lib/media.c @@ -766,8 +766,8 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t ** break; case VIDEO_ES: p_mes->i_type = libvlc_track_video; -p_mes->u.video.i_height = p_es->video.i_height; -p_mes->u.video.i_width = p_es->video.i_width; +p_mes->u.video.i_height = p_es->video.i_visible_height; +p_mes->u.video.i_width = p_es->video.i_visible_width; break; case AUDIO_ES: p_mes->i_type = libvlc_track_audio; @@ -842,8 +842,8 @@ libvlc_media_tracks_get( libvlc_media_t *p_md, libvlc_media_track_t *** pp_es ) break; case VIDEO_ES: p_mes->i_type = libvlc_track_video; -p_mes->video->i_height = p_es->video.i_height; -p_mes->video->i_width = p_es->video.i_width; +p_mes->video->i_height = p_es->video.i_visible_height; +p_mes->video->i_width = p_es->video.i_visible_width; p_mes->video->i_sar_num = p_es->video.i_sar_num; p_mes->video->i_sar_den = p_es->video.i_sar_den; p_mes->video->i_frame_rate_num = p_es->video.i_frame_rate; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] libvlc: return useful/visible video dimensions (fixes #15122)
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23 12:46:44 2015 +0300| [5f000e6ac6154f0f30f376adc5595aeaec876da4] | committer: Rémi Denis-Courmont libvlc: return useful/visible video dimensions (fixes #15122) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5f000e6ac6154f0f30f376adc5595aeaec876da4 --- lib/media.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/media.c b/lib/media.c index a403d14..3b717c7 100644 --- a/lib/media.c +++ b/lib/media.c @@ -861,8 +861,8 @@ libvlc_media_get_tracks_info( libvlc_media_t *p_md, libvlc_media_track_info_t ** break; case VIDEO_ES: p_mes->i_type = libvlc_track_video; -p_mes->u.video.i_height = p_es->video.i_height; -p_mes->u.video.i_width = p_es->video.i_width; +p_mes->u.video.i_height = p_es->video.i_visible_height; +p_mes->u.video.i_width = p_es->video.i_visible_width; break; case AUDIO_ES: p_mes->i_type = libvlc_track_audio; @@ -937,8 +937,8 @@ libvlc_media_tracks_get( libvlc_media_t *p_md, libvlc_media_track_t *** pp_es ) break; case VIDEO_ES: p_mes->i_type = libvlc_track_video; -p_mes->video->i_height = p_es->video.i_height; -p_mes->video->i_width = p_es->video.i_width; +p_mes->video->i_height = p_es->video.i_visible_height; +p_mes->video->i_width = p_es->video.i_visible_width; p_mes->video->i_sar_num = p_es->video.i_sar_num; p_mes->video->i_sar_den = p_es->video.i_sar_den; p_mes->video->i_frame_rate_num = p_es->video.i_frame_rate; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] speex: avoid unsigned->signed->unsigned conversion (CID #1048968)
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23 10:33:50 2015 +0300| [cb267c8052444a1f14e903203ad7da9e5b8df1d9] | committer: Rémi Denis-Courmont speex: avoid unsigned->signed->unsigned conversion (CID #1048968) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=cb267c8052444a1f14e903203ad7da9e5b8df1d9 --- modules/codec/speex.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codec/speex.c b/modules/codec/speex.c index c93fbc6..e21c7fa 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -1061,7 +1061,7 @@ static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf ) if( unlikely( !p_aout_buf ) ) return NULL; unsigned char *p_buffer = p_aout_buf->p_buffer; -int i_samples = p_aout_buf->i_nb_samples; +unsigned i_samples = p_aout_buf->i_nb_samples; int i_samples_delay = p_sys->i_samples_delay; mtime_t i_pts = p_aout_buf->i_pts - ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] rar: call strchr() only once
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23
10:13:33 2015 +0300| [71690f13687241a8e68aea400967dac4ff1fafe8] | committer:
Rémi Denis-Courmont
rar: call strchr() only once
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=71690f13687241a8e68aea400967dac4ff1fafe8
---
modules/access/rar/access.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/access/rar/access.c b/modules/access/rar/access.c
index 3a8f11a..b6dec32 100644
--- a/modules/access/rar/access.c
+++ b/modules/access/rar/access.c
@@ -143,14 +143,15 @@ int RarAccessOpen(vlc_object_t *object)
{
access_t *access = (access_t*)object;
-if (!strchr(access->psz_location, '|'))
+const char *name = strchr(access->psz_location, '|');
+if (name == NULL)
return VLC_EGENERIC;
-char *base = strdup(access->psz_location);
-if (!base)
-return VLC_EGENERIC;
-char *name = strchr(base, '|');
-*name++ = '\0';
+char *base = strndup(access->psz_location, name - access->psz_location);
+if (unlikely(base == NULL))
+return VLC_ENOMEM;
+
+name++;
decode_URI(base);
stream_t *s = stream_UrlNew(access, base);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] shout: remove unused values
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23
10:15:58 2015 +0300| [321c5866dae98d9bc5c40ca1a38fbf8f42062b16] | committer:
Rémi Denis-Courmont
shout: remove unused values
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=321c5866dae98d9bc5c40ca1a38fbf8f42062b16
---
modules/access_output/shout.c | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index f5ce49a..127af94 100644
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -316,11 +316,7 @@ static int Open( vlc_object_t *p_this )
while ( i_ret != SHOUTERR_CONNECTED )
{
/* Shout parameters cannot be changed on an open connection */
-i_ret = shout_close( p_shout );
-if( i_ret == SHOUTERR_SUCCESS )
-{
-i_ret = SHOUTERR_UNCONNECTED;
-}
+shout_close( p_shout );
/* Re-initialize for Shoutcast using ICY protocol. Not needed for
initial connection
but it is when we are reconnecting after other protocol was tried.
*/
@@ -341,11 +337,7 @@ static int Open( vlc_object_t *p_this )
msg_Warn( p_access, "failed to connect using 'icy' (shoutcast)
protocol" );
/* Shout parameters cannot be changed on an open connection */
-i_ret = shout_close( p_shout );
-if( i_ret == SHOUTERR_SUCCESS )
-{
-i_ret = SHOUTERR_UNCONNECTED;
-}
+shout_close( p_shout );
/* IceCAST using HTTP protocol */
i_ret = shout_set_protocol( p_shout, SHOUT_PROTOCOL_HTTP );
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] linsys_sdi: simplify and fix sysfs usage
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23
10:05:57 2015 +0300| [4e84bd2cef4e41cd074cd5a6e99fa18923acc545] | committer:
Rémi Denis-Courmont
linsys_sdi: simplify and fix sysfs usage
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4e84bd2cef4e41cd074cd5a6e99fa18923acc545
---
modules/access/linsys/linsys_sdi.c | 49 ++--
1 file changed, 19 insertions(+), 30 deletions(-)
diff --git a/modules/access/linsys/linsys_sdi.c
b/modules/access/linsys/linsys_sdi.c
index d2f9184..c479ad9 100644
--- a/modules/access/linsys/linsys_sdi.c
+++ b/modules/access/linsys/linsys_sdi.c
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1660,47 +1661,35 @@ static int HandleSDBuffer( demux_t *p_demux, uint8_t
*p_buffer,
static int ReadULSysfs( const char *psz_fmt, unsigned int i_link )
{
-char psz_file[MAXLEN], psz_data[MAXLEN];
-char *psz_tmp;
-int i_fd;
-ssize_t i_ret;
+char psz_file[MAXLEN];
unsigned int i_data;
-snprintf( psz_file, sizeof(psz_file) - 1, psz_fmt, i_link );
+snprintf( psz_file, sizeof(psz_file), psz_fmt, i_link );
-if ( (i_fd = vlc_open( psz_file, O_RDONLY )) < 0 )
-return i_fd;
-
-i_ret = read( i_fd, psz_data, sizeof(psz_data) );
-close( i_fd );
-
-if ( i_ret < 0 )
-return i_ret;
-
-i_data = strtoul( psz_data, &psz_tmp, 0 );
-if ( *psz_tmp != '\n' )
+FILE *stream = vlc_fopen( psz_file, "rt" );
+if( stream == NULL )
return -1;
-return i_data;
+int ret = fscanf( stream, "%u", &i_data );
+fclose( stream );
+
+return (ret == 1 && i_data <= INT_MAX) ? (int)i_data : -1;
}
-static ssize_t WriteULSysfs( const char *psz_fmt, unsigned int i_link,
- unsigned int i_buf )
+static int WriteULSysfs( const char *psz_fmt, unsigned int i_link,
+ unsigned int i_buf )
{
-char psz_file[MAXLEN], psz_data[MAXLEN];
-int i_fd;
-ssize_t i_ret;
-
-snprintf( psz_file, sizeof(psz_file) -1, psz_fmt, i_link );
+char psz_file[MAXLEN];
-snprintf( psz_data, sizeof(psz_data) -1, "%u\n", i_buf );
+snprintf( psz_file, sizeof(psz_file), psz_fmt, i_link );
-if ( (i_fd = vlc_open( psz_file, O_WRONLY )) < 0 )
-return i_fd;
+FILE *stream = vlc_fopen( psz_file, "wt" );
+if( stream == NULL )
+return -1;
-i_ret = write( i_fd, psz_data, strlen(psz_data) + 1 );
-close( i_fd );
-return i_ret;
+int ret = fprintf( stream, "%u\n", i_buf );
+fclose( stream );
+return ret;
}
static int InitCapture( demux_t *p_demux )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] live555: check for error
vlc | branch: master | Rémi Denis-Courmont | Sun Aug 23
10:08:15 2015 +0300| [b2f093c86c9e2957c915cb18ef17d9ae5c4342f1] | committer:
Rémi Denis-Courmont
live555: check for error
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b2f093c86c9e2957c915cb18ef17d9ae5c4342f1
---
modules/access/live555.cpp | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 41d2641..3bdd741 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -335,13 +335,14 @@ static int Open ( vlc_object_t *p_this )
if( strcasecmp( p_demux->psz_access, "satip" ) == 0 )
{
-asprintf(&p_sys->p_sdp, "v=0\r\n"
-"o=- 0 %s\r\n"
-"s=SATIP:stream\r\n"
-"i=SATIP RTP Stream\r\n"
-"m=video 0 RTP/AVP 33\r\n"
-"a=control:rtsp://%s\r\n\r\n",
-p_sys->url.psz_host, p_sys->psz_path);
+if( asprintf(&p_sys->p_sdp, "v=0\r\n"
+ "o=- 0 %s\r\n"
+ "s=SATIP:stream\r\n"
+ "i=SATIP RTP Stream\r\n"
+ "m=video 0 RTP/AVP 33\r\n"
+ "a=control:rtsp://%s\r\n\r\n",
+ p_sys->url.psz_host, p_sys->psz_path) < 0 )
+abort();
}
if( p_demux->s != NULL )
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
