[vlc-commits] l10n: Portuguese (Portugal) update
vlc/vlc-3.0 | branch: master | Rui | Wed May 15 14:27:18 2019 +0200| [1038d3e096a1331cbb47d556c8a3d0599cd0372a] | committer: Michał Trzebiatowski l10n: Portuguese (Portugal) update 100% translated Signed-off-by: Michał Trzebiatowski > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1038d3e096a1331cbb47d556c8a3d0599cd0372a --- po/pt_PT.po | 248 +++- 1 file changed, 129 insertions(+), 119 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=1038d3e096a1331cbb47d556c8a3d0599cd0372a ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Portuguese (Portugal) update
vlc/vlc-3.0 | branch: master | Rui | Tue Apr 30 17:20:22 2019 +0200| [8f40ae5c8558b06d4e7eff2a931884f6d0528bb9] | committer: Hugo Beauzée-Luyssen l10n: Portuguese (Portugal) update 100% translated Signed-off-by: Michał Trzebiatowski Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8f40ae5c8558b06d4e7eff2a931884f6d0528bb9 --- po/pt_PT.po | 465 +++- 1 file changed, 240 insertions(+), 225 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=8f40ae5c8558b06d4e7eff2a931884f6d0528bb9 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Portuguese (Portugal) update
vlc/vlc-3.0 | branch: master | Rui | Sun Apr 14 23:31:34 2019 +0200| [0d221f786e61fe9a05e9426bdcbe11b73ca07946] | committer: Hugo Beauzée-Luyssen l10n: Portuguese (Portugal) update 100% translated Signed-off-by: Michał Trzebiatowski Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0d221f786e61fe9a05e9426bdcbe11b73ca07946 --- po/pt_PT.po | 169 ++-- 1 file changed, 84 insertions(+), 85 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=0d221f786e61fe9a05e9426bdcbe11b73ca07946 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Portuguese (Portugal) update
vlc/vlc-3.0 | branch: master | Rui | Thu Apr 4 18:03:14 2019 +0200| [acb109d2de4da9e125acc90bd5b5df9e6f2a8717] | committer: Hugo Beauzée-Luyssen l10n: Portuguese (Portugal) update 100% translated Signed-off-by: Michał Trzebiatowski Signed-off-by: Hugo Beauzée-Luyssen > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=acb109d2de4da9e125acc90bd5b5df9e6f2a8717 --- po/pt_PT.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 3b91b36583..7d0db745f8 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: vlc 3.0.7\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2018-12-19 17:55+0100\n" -"PO-Revision-Date: 2019-03-23 19:39+0100\n" +"PO-Revision-Date: 2019-04-04 18:03+0200\n" "Last-Translator: Rui , 2019\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/yaron/; "teams/16553/pt_PT/)\n" @@ -21719,8 +21719,8 @@ msgid "" "Activate the automatic notification of new versions of the software. It runs " "once every two weeks." msgstr "" -"Ative a notificação automática das novas versões do softyware. É executada a " -"cada duas semanas." +"Notifica caso existam novas versões do VLC. A verificação é feita a cada 2 " +"semanas." #: modules/gui/qt/qt.cpp:128 msgid "Number of days between two update checks" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] MediaCodec: correct field signature
vlc | branch: master | Zhang Rui bbcal...@gmail.com | Wed Feb 19 16:59:20
2014 +0800| [e7a54d238a69887901ce5ad89f8e4e3a3a80c4d8] | committer:
Jean-Baptiste Kempf
MediaCodec: correct field signature
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7a54d238a69887901ce5ad89f8e4e3a3a80c4d8
---
modules/codec/omxil/android_mediacodec.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/codec/omxil/android_mediacodec.c
b/modules/codec/omxil/android_mediacodec.c
index 9a38c24..74091db 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -134,8 +134,8 @@ static const struct member members[] = {
{ getCapabilitiesForType,
(Ljava/lang/String;)Landroid/media/MediaCodecInfo$CodecCapabilities;,
android/media/MediaCodecInfo, OFF(get_capabilities_for_type), METHOD },
{ profileLevels, [Landroid/media/MediaCodecInfo$CodecProfileLevel;,
android/media/MediaCodecInfo$CodecCapabilities, OFF(profile_levels_field),
FIELD },
-{ profile, I, android.media.MediaCodecInfo$CodecProfileLevel,
OFF(profile_field), FIELD },
-{ level, I, android.media.MediaCodecInfo$CodecProfileLevel,
OFF(level_field), FIELD },
+{ profile, I, android/media/MediaCodecInfo$CodecProfileLevel,
OFF(profile_field), FIELD },
+{ level, I, android/media/MediaCodecInfo$CodecProfileLevel,
OFF(level_field), FIELD },
{ createByCodecName, (Ljava/lang/String;)Landroid/media/MediaCodec;,
android/media/MediaCodec, OFF(create_by_codec_name), STATIC_METHOD },
{ configure,
(Landroid/media/MediaFormat;Landroid/view/Surface;Landroid/media/MediaCrypto;I)V,
android/media/MediaCodec, OFF(configure), METHOD },
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] androidsurface: setup format depending on surface format
vlc | branch: master | Rui Zhang bbcal...@gmail.com | Wed Jan 2 12:42:51
2013 -0500| [c3eacd1e2de5600246d5622233796b3f7133bf62] | committer: Rafaël Carré
androidsurface: setup format depending on surface format
Modified-by: Edward Wang edward.c.w...@compdigitec.com
Signed-off-by: Edward Wang edward.c.w...@compdigitec.com
Modified-by: Rafaël Carré fun...@videolan.org
Signed-off-by: Rafaël Carré fun...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c3eacd1e2de5600246d5622233796b3f7133bf62
---
modules/video_output/androidsurface.c | 105 -
1 file changed, 89 insertions(+), 16 deletions(-)
diff --git a/modules/video_output/androidsurface.c
b/modules/video_output/androidsurface.c
index 1b757ee..69bf590 100644
--- a/modules/video_output/androidsurface.c
+++ b/modules/video_output/androidsurface.c
@@ -46,6 +46,11 @@
/*
* Module descriptor
*/
+#define CHROMA_TEXT N_(Chroma used)
+#define CHROMA_LONGTEXT N_(\
+Force use of a specific chroma for output. Default is RGB32.)
+
+#define CFG_PREFIX androidsurface-
static int Open (vlc_object_t *);
static void Close(vlc_object_t *);
@@ -57,6 +62,7 @@ vlc_module_begin()
set_description(N_(Android Surface video output))
set_capability(vout display, 155)
add_shortcut(androidsurface, android)
+add_string(CFG_PREFIX chroma, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true)
set_callbacks(Open, Close)
vlc_module_end()
@@ -84,6 +90,17 @@ static void Display(vout_display_t *, picture_t
*, subpicture_t *);
static int Control(vout_display_t *, int, va_list);
/* */
+typedef struct _SurfaceInfo {
+uint32_tw;
+uint32_th;
+uint32_ts;
+uint32_tusage;
+uint32_tformat;
+uint32_t* bits;
+uint32_treserved[2];
+} SurfaceInfo;
+
+/* */
struct vout_display_sys_t {
picture_pool_t *pool;
void *p_library;
@@ -93,22 +110,13 @@ struct vout_display_sys_t {
picture_resource_t resource;
+int pixel_size;
+
/* density */
int i_sar_num;
int i_sar_den;
};
-/* */
-typedef struct _SurfaceInfo {
-uint32_tw;
-uint32_th;
-uint32_ts;
-uint32_tusage;
-uint32_tformat;
-uint32_t* bits;
-uint32_treserved[2];
-} SurfaceInfo;
-
struct picture_sys_t
{
void *surf;
@@ -174,12 +182,46 @@ static int Open(vlc_object_t *p_this) {
/* Setup chroma */
video_format_t fmt = vd-fmt;
-fmt.i_chroma = VLC_CODEC_RGB32;
-fmt.i_rmask = 0x00ff;
-fmt.i_gmask = 0xff00;
-fmt.i_bmask = 0x00ff;
+
+char *psz_fcc = var_InheritString(vd, CFG_PREFIX chroma);
+if( psz_fcc ) {
+fmt.i_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, psz_fcc);
+free(psz_fcc);
+} else
+fmt.i_chroma = VLC_CODEC_RGB32;
+
+switch(fmt.i_chroma) {
+case VLC_CODEC_YV12:
+/* avoid swscale usage by asking for I420 instead since the
+ * vout already has code to swap the buffers */
+fmt.i_chroma = VLC_CODEC_I420;
+case VLC_CODEC_I420:
+break;
+
+case VLC_CODEC_RGB16:
+fmt.i_bmask = 0x001f;
+fmt.i_gmask = 0x07e0;
+fmt.i_rmask = 0xf800;
+break;
+
+case VLC_CODEC_RGB32:
+fmt.i_rmask = 0x00ff;
+fmt.i_gmask = 0xff00;
+fmt.i_bmask = 0x00ff;
+break;
+
+default:
+return VLC_EGENERIC;
+}
video_format_FixRgb(fmt);
+const vlc_chroma_description_t *desc =
vlc_fourcc_GetChromaDescription(fmt.i_chroma);
+if (unlikely(!desc))
+return VLC_EGENERIC;
+sys-pixel_size = desc-pixel_size;
+
+msg_Dbg(vd, Pixel format %4.4s (%d bpp), (char*)fmt.i_chroma,
sys-pixel_size);
+
/* Create the associated picture */
picture_resource_t *rsc = sys-resource;
rsc-p_sys = malloc(sizeof(*rsc-p_sys));
@@ -251,6 +293,34 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned
count) {
return sys-pool;
}
+#define ALIGN_16_PIXELS( x ) ( ( ( x ) + 15 ) / 16 * 16 )
+static void SetupPictureYV12( SurfaceInfo* p_surfaceInfo, picture_t *p_picture
)
+{
+/* according to document of android.graphics.ImageFormat.YV12 */
+int i_stride = ALIGN_16_PIXELS( p_surfaceInfo-s );
+int i_c_stride = ALIGN_16_PIXELS( i_stride / 2 );
+
+p_picture-p-i_pitch = i_stride;
+
+/* Fill chroma planes for planar YUV */
+for( int n = 1; n p_picture-i_planes; n++ )
+{
+const plane_t *o = p_picture-p[n-1];
+plane_t *p = p_picture-p[n];
+
+p-p_pixels = o-p_pixels + o-i_lines * o-i_pitch;
+p-i_pitch = i_c_stride;
+p-i_lines = p_picture-format.i_height / 2
[vlc-commits] http: trim trailing space in field content
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Sun Oct 14
02:02:11 2012 +0800| [3ca77004b99acb706a1367bdea771aa93fd5d8aa] | committer:
Rémi Denis-Courmont
http: trim trailing space in field content
Fix incorrect redirection given in Location: http://host/path
Signed-off-by: Rémi Denis-Courmont r...@remlab.net
(cherry picked from commit a05aca783e3b2a03f839d2141ee64ee835ebf1cc)
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3ca77004b99acb706a1367bdea771aa93fd5d8aa
---
modules/access/http.c | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/modules/access/http.c b/modules/access/http.c
index c8f9ef8..392a189 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -1374,6 +1374,7 @@ static int Request( access_t *p_access, uint64_t i_tell )
{
char *psz = net_Gets( p_access, p_sys-fd, pvs );
char *p;
+char *p_trailing;
if( psz == NULL )
{
@@ -1401,7 +1402,19 @@ static int Request( access_t *p_access, uint64_t i_tell )
goto error;
}
*p++ = '\0';
-while( *p == ' ' ) p++;
+p += strspn( p, \t );
+
+/* trim trailing white space */
+p_trailing = p + strlen( p );
+if( p_trailing p )
+{
+p_trailing--;
+while( ( *p_trailing == ' ' || *p_trailing == '\t' ) p_trailing
p )
+{
+*p_trailing = '\0';
+p_trailing--;
+}
+}
if( !strcasecmp( psz, Content-Length ) )
{
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] httplive: ignore failed stream in meta list
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Wed May 30
17:41:35 2012 +0800| [5ecc28ae8ff0d2e390fb6e4dfdf77ba94703577a] | committer:
Jean-Baptiste Kempf
httplive: ignore failed stream in meta list
So we have chance to try other streams instead of just fail.
Fixes #6898
Signed-off-by: Hugo Beauzée-Luyssen beauz...@gmail.com
(cherry picked from commit e71bbc493deae0a2f1c01ea06dbb5e51a555edbe)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5ecc28ae8ff0d2e390fb6e4dfdf77ba94703577a
---
modules/stream_filter/httplive.c | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index f22e5af..98e6db2 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -954,6 +954,8 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
/* M3U8 Meta Index file */
do {
+bool failed_to_download_stream_m3u8 = false;
+
/* Next line */
line = ReadLine(p_begin, p_read, p_end - p_begin);
if (line == NULL)
@@ -976,15 +978,29 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
}
else
{
+bool new_stream_added = false;
hls_stream_t *hls = NULL;
err = parse_StreamInformation(s, streams, hls, line,
uri);
+if (err == VLC_SUCCESS)
+new_stream_added = true;
+
free(uri);
/* Download playlist file from server */
uint8_t *buf = NULL;
ssize_t len = read_M3U8_from_url(s, hls-url, buf);
if (len 0)
-err = VLC_EGENERIC;
+{
+msg_Warn(s, failed to read %s, continue for other
streams, hls-url);
+failed_to_download_stream_m3u8 = true;
+
+/* remove stream just added */
+if (new_stream_added)
+vlc_array_remove(streams,
vlc_array_count(streams) - 1);
+
+/* ignore download error, so we have chance to try
other streams */
+err = VLC_SUCCESS;
+}
else
{
/* Parse HLS m3u8 content. */
@@ -1011,6 +1027,13 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
} while (err == VLC_SUCCESS);
+size_t stream_count = vlc_array_count(streams);
+msg_Dbg(s, %d streams loaded in Meta playlist, (int)stream_count);
+if (stream_count == 0)
+{
+msg_Err(s, No playable streams found in Meta playlist);
+err = VLC_EGENERIC;
+}
}
else
{
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] httplive: ignore failed stream in meta list
vlc | branch: master | Rui Zhang bbcal...@gmail.com | Wed May 30 17:41:35
2012 +0800| [e71bbc493deae0a2f1c01ea06dbb5e51a555edbe] | committer: Hugo
Beauzée-Luyssen
httplive: ignore failed stream in meta list
So we have chance to try other streams instead of just fail.
Fixes #6898
Signed-off-by: Hugo Beauzée-Luyssen beauz...@gmail.com
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e71bbc493deae0a2f1c01ea06dbb5e51a555edbe
---
modules/stream_filter/httplive.c | 25 -
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 57825c8..12fc059 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -954,6 +954,8 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
/* M3U8 Meta Index file */
do {
+bool failed_to_download_stream_m3u8 = false;
+
/* Next line */
line = ReadLine(p_begin, p_read, p_end - p_begin);
if (line == NULL)
@@ -976,15 +978,29 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
}
else
{
+bool new_stream_added = false;
hls_stream_t *hls = NULL;
err = parse_StreamInformation(s, streams, hls, line,
uri);
+if (err == VLC_SUCCESS)
+new_stream_added = true;
+
free(uri);
/* Download playlist file from server */
uint8_t *buf = NULL;
ssize_t len = read_M3U8_from_url(s, hls-url, buf);
if (len 0)
-err = VLC_EGENERIC;
+{
+msg_Warn(s, failed to read %s, continue for other
streams, hls-url);
+failed_to_download_stream_m3u8 = true;
+
+/* remove stream just added */
+if (new_stream_added)
+vlc_array_remove(streams,
vlc_array_count(streams) - 1);
+
+/* ignore download error, so we have chance to try
other streams */
+err = VLC_SUCCESS;
+}
else
{
/* Parse HLS m3u8 content. */
@@ -1011,6 +1027,13 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
} while (err == VLC_SUCCESS);
+size_t stream_count = vlc_array_count(streams);
+msg_Dbg(s, %d streams loaded in Meta playlist, (int)stream_count);
+if (stream_count == 0)
+{
+msg_Err(s, No playable streams found in Meta playlist);
+err = VLC_EGENERIC;
+}
}
else
{
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] httplive: parse EXT-X-MEDIA-SEQUENCE only once
vlc | branch: master | Rui Zhang bbcal...@gmail.com | Tue May 29 20:42:41
2012 +0800| [4ab81377158ece056cae3a45084f20efb5df79d7] | committer: Hugo
Beauzée-Luyssen
httplive: parse EXT-X-MEDIA-SEQUENCE only once
refs #6897
Signed-off-by: Hugo Beauzée-Luyssen beauz...@gmail.com
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ab81377158ece056cae3a45084f20efb5df79d7
---
modules/stream_filter/httplive.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 12fc059..c8948b3 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1069,6 +1069,7 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
assert(hls);
/* */
+bool media_sequence_loaded = false;
int segment_duration = -1;
do
{
@@ -1083,7 +1084,15 @@ static int parse_M3U8(stream_t *s, vlc_array_t *streams,
uint8_t *buffer, const
else if (strncmp(line, #EXT-X-TARGETDURATION, 21) == 0)
err = parse_TargetDuration(s, hls, line);
else if (strncmp(line, #EXT-X-MEDIA-SEQUENCE, 21) == 0)
-err = parse_MediaSequence(s, hls, line);
+{
+/* A Playlist file MUST NOT contain more than one
EXT-X-MEDIA-SEQUENCE tag. */
+/* We only care about first one */
+if (!media_sequence_loaded)
+{
+err = parse_MediaSequence(s, hls, line);
+media_sequence_loaded = true;
+}
+}
else if (strncmp(line, #EXT-X-KEY, 10) == 0)
err = parse_Key(s, hls, line);
else if (strncmp(line, #EXT-X-PROGRAM-DATE-TIME, 24) == 0)
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
vlc/vlc-1.1 | branch: master | Rui Zhang bbcal...@gmail.com | Thu Jul 12
19:59:25 2012 +0800| [0b1cd3370b578fae5d828bd406d28683b7919b0e] | committer:
Jean-Baptiste Kempf
avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 352ea7df94b18869277457c79e7d5c10f388f075)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
In fact, it closes #7145
(cherry picked from commit 74632021986be07f4afe48347167b84f60b04d5b)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=0b1cd3370b578fae5d828bd406d28683b7919b0e
---
modules/demux/avformat/demux.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index bd7c166..ecbe7e8 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -536,8 +536,13 @@ static int Demux( demux_t *p_demux )
int64_t i_start_time;
/* Read a frame */
-if( av_read_frame( p_sys-ic, pkt ) )
+int i_av_ret = av_read_frame( p_sys-ic, pkt );
+if( i_av_ret )
{
+/* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+if( i_av_ret == AVERROR(EAGAIN) )
+return 1;
+
return 0;
}
if( pkt.stream_index 0 || pkt.stream_index = p_sys-i_tk )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Thu Jul 12
19:59:25 2012 +0800| [fa21a4ab8d241233ae08c5c30898db629a81caee] | committer:
Christoph Miebach
avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 352ea7df94b18869277457c79e7d5c10f388f075)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
In fact, it closes #7145
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=fa21a4ab8d241233ae08c5c30898db629a81caee
---
modules/demux/avformat/demux.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 3264b11..ada3849 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -571,8 +571,13 @@ static int Demux( demux_t *p_demux )
int64_t i_start_time;
/* Read a frame */
-if( av_read_frame( p_sys-ic, pkt ) )
+int i_av_ret = av_read_frame( p_sys-ic, pkt );
+if( i_av_ret )
{
+/* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+if( i_av_ret == AVERROR(EAGAIN) )
+return 1;
+
return 0;
}
if( pkt.stream_index 0 || pkt.stream_index = p_sys-i_tk )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Thu Jul 12
19:59:25 2012 +0800| [74632021986be07f4afe48347167b84f60b04d5b] | committer:
Jean-Baptiste Kempf
avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 352ea7df94b18869277457c79e7d5c10f388f075)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
In fact, it closes #7145
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=74632021986be07f4afe48347167b84f60b04d5b
---
modules/demux/avformat/demux.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 3264b11..ada3849 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -571,8 +571,13 @@ static int Demux( demux_t *p_demux )
int64_t i_start_time;
/* Read a frame */
-if( av_read_frame( p_sys-ic, pkt ) )
+int i_av_ret = av_read_frame( p_sys-ic, pkt );
+if( i_av_ret )
{
+/* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+if( i_av_ret == AVERROR(EAGAIN) )
+return 1;
+
return 0;
}
if( pkt.stream_index 0 || pkt.stream_index = p_sys-i_tk )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
vlc | branch: master | Rui Zhang bbcal...@gmail.com | Thu Jul 12 19:59:25
2012 +0800| [352ea7df94b18869277457c79e7d5c10f388f075] | committer:
Jean-Baptiste Kempf
avformat: avoid EOF if av_read_frame returns AVERROR(EAGAIN)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=352ea7df94b18869277457c79e7d5c10f388f075
---
modules/demux/avformat/demux.c |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index cce867e..21a0bf7 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -591,8 +591,13 @@ static int Demux( demux_t *p_demux )
int64_t i_start_time;
/* Read a frame */
-if( av_read_frame( p_sys-ic, pkt ) )
+int i_av_ret = av_read_frame( p_sys-ic, pkt );
+if( i_av_ret )
{
+/* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+if( i_av_ret == AVERROR(EAGAIN) )
+return 1;
+
return 0;
}
if( pkt.stream_index 0 || pkt.stream_index = p_sys-i_tk )
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Avcodec: disable delayed opening for packetized AAC data
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Sat May 19
20:59:28 2012 +0800| [a27a39a740485ae78d7cf392274df8446f85f6f6] | committer:
Jean-Baptiste Kempf
Avcodec: disable delayed opening for packetized AAC data
This is usually not visible, since you need avcodec+avformat, instead of
ts/faad. Close #6847
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit e0a4ac832b5214561944cd8212d7a94ad5d0ce87)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=a27a39a740485ae78d7cf392274df8446f85f6f6
---
modules/codec/avcodec/avcodec.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 072e0bf..f604a38 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -423,7 +423,8 @@ int ffmpeg_OpenCodec( decoder_t *p_dec )
if( p_sys-i_codec_id == CODEC_ID_VC1 ||
p_sys-i_codec_id == CODEC_ID_VORBIS ||
p_sys-i_codec_id == CODEC_ID_THEORA ||
-p_sys-i_codec_id == CODEC_ID_AAC )
+( p_sys-i_codec_id == CODEC_ID_AAC
+ !p_dec-fmt_in.b_packetized ) )
{
msg_Warn( p_dec, waiting for extra data for codec %s,
p_sys-psz_namecodec );
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] httplive: do not reset segment data without key
vlc/vlc-2.0 | branch: master | Rui Zhang bbcal...@gmail.com | Fri May 18
21:17:32 2012 +0800| [f4f5913e32b5d526458bc5db0403ccdb4344509e] | committer:
Jean-Baptiste Kempf
httplive: do not reset segment data without key
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
(cherry picked from commit 533c3fda8892754017a26d2dfe3ef9d3cbb12dbb)
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f4f5913e32b5d526458bc5db0403ccdb4344509e
---
modules/stream_filter/httplive.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index ea0a854..58229bd 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1317,7 +1317,8 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t
*hls_new, hls_stream_t *
continue;
}
/* We must free the content, because if the key was not
downloaded, content can't be decrypted */
-if (segment-data)
+if ((p-psz_key_path || p-b_key_loaded)
+segment-data)
{
block_Release(segment-data);
segment-data = NULL;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] httplive: do not reset segment data without key
vlc | branch: master | Rui Zhang bbcal...@gmail.com | Fri May 18 21:17:32
2012 +0800| [533c3fda8892754017a26d2dfe3ef9d3cbb12dbb] | committer:
Jean-Baptiste Kempf
httplive: do not reset segment data without key
Signed-off-by: Jean-Baptiste Kempf j...@videolan.org
http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=533c3fda8892754017a26d2dfe3ef9d3cbb12dbb
---
modules/stream_filter/httplive.c |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 433dca0..86f97b6 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1317,7 +1317,8 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t
*hls_new, hls_stream_t *
continue;
}
/* We must free the content, because if the key was not
downloaded, content can't be decrypted */
-if (segment-data)
+if ((p-psz_key_path || p-b_key_loaded)
+segment-data)
{
block_Release(segment-data);
segment-data = NULL;
___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits
