<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body><div><div style="font-family: Calibri,sans-serif; font-size: 11pt;">If vlc supports voice recognition means it will be more easy to use by controlling the player using our voice.<br>Tell me how to do it. <br>Sure I will do it.</div></div><div dir="ltr"><hr><span style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">From: </span><span style="font-family: Calibri,sans-serif; font-size: 11pt;"><a href="mailto:vlc-devel-request@videolan.org">vlc-devel-request@videolan.org</a></span><br><span style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">Sent: </span><span style="font-family: Calibri,sans-serif; font-size: 11pt;">10-04-2015 03:30 PM</span><br><span style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">To: </span><span style="font-family: Calibri,sans-serif; font-size: 11pt;"><a href="mailto:vlc-devel@videolan.org">vlc-devel@videolan.org</a></span><br><span style="font-family: Calibri,sans-serif; font-size: 11pt; font-weight: bold;">Subject: </span><span style="font-family: Calibri,sans-serif; font-size: 11pt;">vlc-devel Digest, Vol 95, Issue 12</span><br><br></div>Send vlc-devel mailing list submissions to<br> vlc-devel@videolan.org<br><br>To subscribe or unsubscribe via the World Wide Web, visit<br> https://mailman.videolan.org/listinfo/vlc-devel<br>or, via email, send a message with subject or body 'help' to<br> vlc-devel-request@videolan.org<br><br>You can reach the person managing the list at<br> vlc-devel-owner@videolan.org<br><br>When replying, please edit your Subject line so it is more specific<br>than "Re: Contents of vlc-devel digest..."<br><br><br>Today's Topics:<br><br> 1. Re: [PATCH] contrib: fix URL for QT 4.8.5 (Jean-Baptiste Kempf)<br> 2. Re: [vlc-commits] dvdnav: add Demux submodule<br> (Jean-Baptiste Kempf)<br> 3. [PATCH] macosx: non-fullscreen video windows hide mouse<br> (Aleksandr Pasechnik)<br> 4. [PATCH] contrib: flac: use -mstackrealign on win32<br> (Tristan Matthews)<br> 5. Fix links to French TV icons (Mathieu Malaterre)<br> 6. Re: [PATCH] contrib: flac: use -mstackrealign on win32<br> (Jean-Baptiste Kempf)<br> 7. [PATCH 1/4] android_window: fix segfault if PictureAlloc<br> fails (Thomas Guillem)<br> 8. [PATCH 4/4] android_window: add a fallback to SW subpicture<br> blending (Thomas Guillem)<br> 9. [PATCH 3/4] android_window: setup surface from<br> AndroidWindow_New (Thomas Guillem)<br> 10. [PATCH 2/4] android_window: move AndroidWindow_SetSurface up<br> (Thomas Guillem)<br> 11. Re: [PATCH] [Android] Implement Scrobbling compatibility<br> (#11904) (Thomas Guillem)<br> 12. Re: [PATCH] [Android] Implement Scrobbling compatibility<br> (#11904) (Guillaume)<br> 13. Re: [PATCH] demux: ts: fix compilation on OS/2 (KO Myung-Hun)<br><br><br>----------------------------------------------------------------------<br><br>Message: 1<br>Date: Thu, 9 Apr 2015 17:33:55 +0200<br>From: Jean-Baptiste Kempf <jb@videolan.org><br>To: Mailing list for VLC media player developers<br> <vlc-devel@videolan.org><br>Subject: Re: [vlc-devel] [PATCH] contrib: fix URL for QT 4.8.5<br>Message-ID: <20150409153355.GA19948@videolan.org><br>Content-Type: text/plain; charset=us-ascii<br><br>On 08 Apr, Tristan Matthews wrote :<br>> It is now under "archive" instead of "official_releases"<br><br>LGTM.<br><br>With my kindest regards,<br><br>-- <br>Jean-Baptiste Kempf<br>http://www.jbkempf.com/ - +33 672 704 734<br>Sent from my Electronic Device<br><br><br>------------------------------<br><br>Message: 2<br>Date: Thu, 9 Apr 2015 17:40:49 +0200<br>From: Jean-Baptiste Kempf <jb@videolan.org><br>To: vlc-devel@videolan.org<br>Subject: Re: [vlc-devel] [vlc-commits] dvdnav: add Demux submodule<br>Message-ID: <20150409154049.GA20086@videolan.org><br>Content-Type: text/plain; charset=us-ascii<br><br>Hello,<br><br>On 25 Mar, Thomas Guillem wrote :<br>> dvdnav: add Demux submodule<br><br>I'd like to backport this feature, with a priority of 0 (of course),<br>because I need it personally.<br><br>Any objections?<br><br>With my kindest regards,<br><br>-- <br>Jean-Baptiste Kempf<br>http://www.jbkempf.com/ - +33 672 704 734<br>Sent from my Electronic Device<br><br><br>------------------------------<br><br>Message: 3<br>Date: Thu, 9 Apr 2015 13:46:06 -0400<br>From: Aleksandr Pasechnik <al@megamicron.net><br>To: vlc-devel@videolan.org<br>Cc: Aleksandr Pasechnik <al@megamicron.net><br>Subject: [vlc-devel] [PATCH] macosx: non-fullscreen video windows hide<br> mouse<br>Message-ID: <1428601566-2766-1-git-send-email-al@megamicron.net><br><br>Allow the mouse cursor to be hidden in regular active video windws, in addition<br>to fullscreen videos.<br>---<br> modules/gui/macosx/Windows.m | 2 +-<br> 1 file changed, 1 insertion(+), 1 deletion(-)<br><br>diff --git a/modules/gui/macosx/Windows.m b/modules/gui/macosx/Windows.m<br>index 331da61..89d7031 100644<br>--- a/modules/gui/macosx/Windows.m<br>+++ b/modules/gui/macosx/Windows.m<br>@@ -638,7 +638,7 @@<br> // Called automatically if window's acceptsMouseMovedEvents property is true<br> - (void)mouseMoved:(NSEvent *)theEvent<br> {<br>- if (b_fullscreen)<br>+ if (b_fullscreen || (b_has_active_video && [self isKeyWindow]))<br> [self recreateHideMouseTimer];<br> <br> [super mouseMoved: theEvent];<br>-- <br>2.3.5<br><br><br><br>------------------------------<br><br>Message: 4<br>Date: Fri, 10 Apr 2015 00:40:32 -0400<br>From: Tristan Matthews <tmatth@videolan.org><br>To: vlc-devel@videolan.org<br>Subject: [vlc-devel] [PATCH] contrib: flac: use -mstackrealign on<br> win32<br>Message-ID: <1428640832-19266-1-git-send-email-tmatth@videolan.org><br><br>Fixes #14104<br>---<br> contrib/src/flac/rules.mak | 7 ++++++-<br> 1 file changed, 6 insertions(+), 1 deletion(-)<br><br>diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak<br>index 7e5ad72..53cf8e0 100644<br>--- a/contrib/src/flac/rules.mak<br>+++ b/contrib/src/flac/rules.mak<br>@@ -42,10 +42,15 @@ FLACCONF += --disable-asm-optimizations<br> endif<br> endif<br> <br>+FLAC_CFLAGS := $(CFLAGS)<br>+ifdef HAVE_WIN32<br>+FLAC_CFLAGS += -mstackrealign<br>+endif<br>+<br> DEPS_flac = ogg $(DEPS_ogg)<br> <br> .flac: flac<br>- cd $< && $(HOSTVARS) ./configure $(FLACCONF)<br>+ cd $< && $(HOSTVARS) CFLAGS="$(FLAC_CFLAGS)" ./configure $(FLACCONF)<br> cd $</include && $(MAKE) install<br> cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install<br> touch $@<br>-- <br>2.1.4<br><br><br><br>------------------------------<br><br>Message: 5<br>Date: Fri, 10 Apr 2015 08:54:01 +0200<br>From: Mathieu Malaterre <malat@debian.org><br>To: vlc-devel@videolan.org, 782229@bugs.debian.org<br>Subject: [vlc-devel] Fix links to French TV icons<br>Message-ID:<br> <CA+7wUsyarrFFdNYTHU1S8bn8LqzMCcidvwAofkrfh_CaYv8r1g@mail.gmail.com><br>Content-Type: text/plain; charset="utf-8"<br><br>Control: forwarded -1 vlc-devel@videolan.org<br><br>Hi,<br><br>Some links pointing to TV icons were broken. Attached patch fixes that.<br>Original report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782229<br><br>Typical output:<br><br>[0x1e2ba18] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1e2ba18] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1e2ba18] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/4/4b/Logo_de_TMC.gif'<br>[0x1e3fbc8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1e3fbc8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1e3fbc8] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/4/4b/Logo_de_TMC.gif'<br>[0x4b52bc8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x4b52bc8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x4b52bc8] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/9/98/Public-Senat-LCP-An_logo_2010.png'<br>[0x7fd8cc0133e8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x7fd8cc0133e8] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x7fd8cc0133e8] access_mms access error: error: HTTP/1.1 403<br>Requested target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/9/98/Public-Senat-LCP-An_logo_2010.png'<br>[0x3567038] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x3567038] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x3567038] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/3/30/Bfm_tv.jpg'<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/3/30/Bfm_tv.jpg'<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/3/30/Bfm_tv.jpg'<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_http access error: error: HTTP/1.1 404 Not Found<br>[0x1ba7748] access_mms access error: error: HTTP/1.1 403 Requested<br>target domain not allowed.<br>[0x1b3f7a8] main playlist error: no suitable access module for<br>`http://upload.wikimedia.org/wikipedia/fr/5/56/Logo_I_tele.png'<br>-------------- next part --------------<br>A non-text attachment was scrubbed...<br>Name: frenchtv.patch<br>Type: text/x-patch<br>Size: 1315 bytes<br>Desc: not available<br>URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20150410/9f984d9c/attachment-0001.bin><br><br>------------------------------<br><br>Message: 6<br>Date: Fri, 10 Apr 2015 09:41:41 +0200<br>From: Jean-Baptiste Kempf <jb@videolan.org><br>To: Mailing list for VLC media player developers<br> <vlc-devel@videolan.org><br>Subject: Re: [vlc-devel] [PATCH] contrib: flac: use -mstackrealign on<br> win32<br>Message-ID: <20150410074141.GA2828@videolan.org><br>Content-Type: text/plain; charset=us-ascii<br><br>Ship it.<br><br>On 10 Apr, Tristan Matthews wrote :<br>> Fixes #14104<br>> ---<br>> contrib/src/flac/rules.mak | 7 ++++++-<br>> 1 file changed, 6 insertions(+), 1 deletion(-)<br>> <br>> diff --git a/contrib/src/flac/rules.mak b/contrib/src/flac/rules.mak<br>> index 7e5ad72..53cf8e0 100644<br>> --- a/contrib/src/flac/rules.mak<br>> +++ b/contrib/src/flac/rules.mak<br>> @@ -42,10 +42,15 @@ FLACCONF += --disable-asm-optimizations<br>> endif<br>> endif<br>> <br>> +FLAC_CFLAGS := $(CFLAGS)<br>> +ifdef HAVE_WIN32<br>> +FLAC_CFLAGS += -mstackrealign<br>> +endif<br>> +<br>> DEPS_flac = ogg $(DEPS_ogg)<br>> <br>> .flac: flac<br>> - cd $< && $(HOSTVARS) ./configure $(FLACCONF)<br>> + cd $< && $(HOSTVARS) CFLAGS="$(FLAC_CFLAGS)" ./configure $(FLACCONF)<br>> cd $</include && $(MAKE) install<br>> cd $</src && $(MAKE) -C share install && $(MAKE) -C libFLAC install<br>> touch $@<br>> -- <br>> 2.1.4<br>> <br>> _______________________________________________<br>> vlc-devel mailing list<br>> To unsubscribe or modify your subscription options:<br>> https://mailman.videolan.org/listinfo/vlc-devel<br><br>-- <br>With my kindest regards,<br><br>-- <br>Jean-Baptiste Kempf<br>http://www.jbkempf.com/ - +33 672 704 734<br>Sent from my Electronic Device<br><br><br>------------------------------<br><br>Message: 7<br>Date: Fri, 10 Apr 2015 09:52:02 +0200<br>From: Thomas Guillem <thomas@gllm.fr><br>To: vlc-devel@videolan.org<br>Subject: [vlc-devel] [PATCH 1/4] android_window: fix segfault if<br> PictureAlloc fails<br>Message-ID: <1428652325-9462-1-git-send-email-thomas@gllm.fr><br><br>---<br> modules/video_output/android/android_window.c | 2 +-<br> 1 file changed, 1 insertion(+), 1 deletion(-)<br><br>diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c<br>index f17bb0d..406058f 100644<br>--- a/modules/video_output/android/android_window.c<br>+++ b/modules/video_output/android/android_window.c<br>@@ -996,7 +996,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture,<br> <br> if (!sys->p_sub_pic && SetupWindowSubtitleSurface(sys) == 0)<br> sys->p_sub_pic = PictureAlloc(sys, &sys->p_sub_window->fmt);<br>- if (!sys->p_spu_blend)<br>+ if (!sys->p_spu_blend && sys->p_sub_pic)<br> sys->p_spu_blend = filter_NewBlend(VLC_OBJECT(vd),<br> &sys->p_sub_pic->format);<br> <br>-- <br>2.1.3<br><br><br><br>------------------------------<br><br>Message: 8<br>Date: Fri, 10 Apr 2015 09:52:05 +0200<br>From: Thomas Guillem <thomas@gllm.fr><br>To: vlc-devel@videolan.org<br>Subject: [vlc-devel] [PATCH 4/4] android_window: add a fallback to SW<br> subpicture blending<br>Message-ID: <1428652325-9462-4-git-send-email-thomas@gllm.fr><br><br>Fallback to SW subpicture blending if there is no subtitle surfaces.<br>---<br> modules/video_output/android/android_window.c | 38 ++++++++++++++++-----------<br> 1 file changed, 22 insertions(+), 16 deletions(-)<br><br>diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c<br>index 9adc4fa..a1de1d6 100644<br>--- a/modules/video_output/android/android_window.c<br>+++ b/modules/video_output/android/android_window.c<br>@@ -190,13 +190,17 @@ static picture_t *PictureAlloc(vout_display_sys_t *sys, video_format_t *fmt)<br> <br> static void FixSubtitleFormat(vout_display_sys_t *sys)<br> {<br>- video_format_t *p_subfmt = &sys->p_sub_window->fmt;<br>+ video_format_t *p_subfmt;<br> video_format_t fmt;<br> int i_width, i_height;<br> int i_video_width, i_video_height;<br> int i_display_width, i_display_height;<br> double aspect;<br> <br>+ if (!sys->p_sub_window)<br>+ return;<br>+ p_subfmt = &sys->p_sub_window->fmt;<br>+<br> video_format_ApplyRotation(&fmt, &sys->p_window->fmt);<br> <br> if (fmt.i_visible_width == 0 || fmt.i_visible_height == 0) {<br>@@ -688,21 +692,23 @@ static int Open(vlc_object_t *p_this)<br> (sys->p_window->b_use_priv ? "ANWP" : "ANW"));<br> <br> jsurf = jni_LockAndGetSubtitlesSurface();<br>- if (!jsurf)<br>- goto error;<br>- video_format_ApplyRotation(&sub_fmt, &vd->fmt);<br>- sub_fmt.i_chroma = subpicture_chromas[0];<br>- SetRGBMask(&sub_fmt);<br>- video_format_FixRgb(&sub_fmt);<br>- sys->p_sub_window = AndroidWindow_New(sys, &sub_fmt, jsurf, false);<br>- jni_UnlockAndroidSurface();<br>- if (!sys->p_sub_window)<br>- goto error;<br>- FixSubtitleFormat(sys);<br>- sys->i_sub_last_order = -1;<br>+ if (jsurf) {<br>+ video_format_ApplyRotation(&sub_fmt, &vd->fmt);<br>+ sub_fmt.i_chroma = subpicture_chromas[0];<br>+ SetRGBMask(&sub_fmt);<br>+ video_format_FixRgb(&sub_fmt);<br>+<br>+ sys->p_sub_window = AndroidWindow_New(sys, &sub_fmt, jsurf, false);<br>+ jni_UnlockAndroidSurface();<br>+ if (!sys->p_sub_window)<br>+ goto error;<br>+<br>+ FixSubtitleFormat(sys);<br>+ sys->i_sub_last_order = -1;<br> <br>- /* Export the subpicture capability of this vout. */<br>- vd->info.subpicture_chromas = subpicture_chromas;<br>+ /* Export the subpicture capability of this vout. */<br>+ vd->info.subpicture_chromas = subpicture_chromas;<br>+ }<br> <br> /* Setup vout_display */<br> vd->pool = Pool;<br>@@ -971,7 +977,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture,<br> <br> SendEventDisplaySize(vd);<br> <br>- if (subpicture) {<br>+ if (subpicture && sys->p_sub_window) {<br> if (sys->b_sub_invalid) {<br> sys->b_sub_invalid = false;<br> if (sys->p_sub_pic) {<br>-- <br>2.1.3<br><br><br><br>------------------------------<br><br>Message: 9<br>Date: Fri, 10 Apr 2015 09:52:04 +0200<br>From: Thomas Guillem <thomas@gllm.fr><br>To: vlc-devel@videolan.org<br>Subject: [vlc-devel] [PATCH 3/4] android_window: setup surface from<br> AndroidWindow_New<br>Message-ID: <1428652325-9462-3-git-send-email-thomas@gllm.fr><br><br>---<br> modules/video_output/android/android_window.c | 51 ++++++++++++---------------<br> 1 file changed, 22 insertions(+), 29 deletions(-)<br><br>diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c<br>index 312e02e..9adc4fa 100644<br>--- a/modules/video_output/android/android_window.c<br>+++ b/modules/video_output/android/android_window.c<br>@@ -317,6 +317,7 @@ static int AndroidWindow_SetSurface(vout_display_sys_t *sys,<br> <br> static android_window *AndroidWindow_New(vout_display_sys_t *sys,<br> video_format_t *p_fmt,<br>+ jobject jsurf,<br> bool b_use_priv)<br> {<br> android_window *p_window = calloc(1, sizeof(android_window));<br>@@ -354,6 +355,12 @@ static android_window *AndroidWindow_New(vout_display_sys_t *sys,<br> else<br> video_format_ApplyRotation(&p_window->fmt, p_fmt);<br> p_window->i_pic_count = 1;<br>+<br>+ if (AndroidWindow_SetSurface(sys, p_window, jsurf) != 0) {<br>+ free(p_window);<br>+ return NULL;<br>+ }<br>+<br> return p_window;<br> }<br> <br>@@ -573,30 +580,6 @@ static int AndroidWindow_LockPicture(vout_display_sys_t *sys,<br> return 0;<br> }<br> <br>-static int SetupWindowSurface(vout_display_sys_t *sys, unsigned i_pic_count)<br>-{<br>- int err;<br>- jobject jsurf = jni_LockAndGetAndroidJavaSurface();<br>- if (!jsurf)<br>- return -1;<br>- err = AndroidWindow_SetSurface(sys, sys->p_window, jsurf);<br>- jni_UnlockAndroidSurface();<br>- err = err == 0 ? AndroidWindow_Setup(sys, sys->p_window, i_pic_count) : err;<br>- return err;<br>-}<br>-<br>-static int SetupWindowSubtitleSurface(vout_display_sys_t *sys)<br>-{<br>- int err;<br>- jobject jsurf = jni_LockAndGetSubtitlesSurface();<br>- if (!jsurf)<br>- return -1;<br>- err = AndroidWindow_SetSurface(sys, sys->p_sub_window, jsurf);<br>- jni_UnlockAndroidSurface();<br>- err = err == 0 ? AndroidWindow_Setup(sys, sys->p_sub_window, 1) : err;<br>- return err;<br>-}<br>-<br> static void SetRGBMask(video_format_t *p_fmt)<br> {<br> switch(p_fmt->i_chroma) {<br>@@ -633,6 +616,7 @@ static int Open(vlc_object_t *p_this)<br> vout_display_t *vd = (vout_display_t*)p_this;<br> vout_display_sys_t *sys;<br> video_format_t sub_fmt;<br>+ jobject jsurf;<br> <br> if (vout_display_IsWindowed(vd))<br> return VLC_EGENERIC;<br>@@ -685,11 +669,15 @@ static int Open(vlc_object_t *p_this)<br> }<br> }<br> <br>- sys->p_window = AndroidWindow_New(sys, &vd->fmt, true);<br>+ jsurf = jni_LockAndGetAndroidJavaSurface();<br>+ if (!jsurf)<br>+ goto error;<br>+ sys->p_window = AndroidWindow_New(sys, &vd->fmt, jsurf, true);<br>+ jni_UnlockAndroidSurface();<br> if (!sys->p_window)<br> goto error;<br> <br>- if (SetupWindowSurface(sys, 0) != 0)<br>+ if (AndroidWindow_Setup(sys, sys->p_window, 0) != 0)<br> goto error;<br> <br> /* use software rotation if we don't use private anw */<br>@@ -699,11 +687,15 @@ static int Open(vlc_object_t *p_this)<br> msg_Dbg(vd, "using %s", sys->p_window->b_opaque ? "opaque" :<br> (sys->p_window->b_use_priv ? "ANWP" : "ANW"));<br> <br>+ jsurf = jni_LockAndGetSubtitlesSurface();<br>+ if (!jsurf)<br>+ goto error;<br> video_format_ApplyRotation(&sub_fmt, &vd->fmt);<br> sub_fmt.i_chroma = subpicture_chromas[0];<br> SetRGBMask(&sub_fmt);<br> video_format_FixRgb(&sub_fmt);<br>- sys->p_sub_window = AndroidWindow_New(sys, &sub_fmt, false);<br>+ sys->p_sub_window = AndroidWindow_New(sys, &sub_fmt, jsurf, false);<br>+ jni_UnlockAndroidSurface();<br> if (!sys->p_sub_window)<br> goto error;<br> FixSubtitleFormat(sys);<br>@@ -805,7 +797,7 @@ static picture_pool_t *PoolAlloc(vout_display_t *vd, unsigned requested_count)<br> unsigned int i = 0;<br> <br> msg_Dbg(vd, "PoolAlloc: request %d frames", requested_count);<br>- if (SetupWindowSurface(sys, requested_count) != 0)<br>+ if (AndroidWindow_Setup(sys, sys->p_window, requested_count) != 0)<br> goto error;<br> <br> requested_count = sys->p_window->i_pic_count;<br>@@ -994,7 +986,8 @@ static void Prepare(vout_display_t *vd, picture_t *picture,<br> sys->p_sub_buffer_bounds = NULL;<br> }<br> <br>- if (!sys->p_sub_pic && SetupWindowSubtitleSurface(sys) == 0)<br>+ if (!sys->p_sub_pic<br>+ && AndroidWindow_Setup(sys, sys->p_sub_window, 1) == 0)<br> sys->p_sub_pic = PictureAlloc(sys, &sys->p_sub_window->fmt);<br> if (!sys->p_spu_blend && sys->p_sub_pic)<br> sys->p_spu_blend = filter_NewBlend(VLC_OBJECT(vd),<br>-- <br>2.1.3<br><br><br><br>------------------------------<br><br>Message: 10<br>Date: Fri, 10 Apr 2015 09:52:03 +0200<br>From: Thomas Guillem <thomas@gllm.fr><br>To: vlc-devel@videolan.org<br>Subject: [vlc-devel] [PATCH 2/4] android_window: move<br> AndroidWindow_SetSurface up<br>Message-ID: <1428652325-9462-2-git-send-email-thomas@gllm.fr><br><br>---<br> modules/video_output/android/android_window.c | 62 +++++++++++++--------------<br> 1 file changed, 31 insertions(+), 31 deletions(-)<br><br>diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c<br>index 406058f..312e02e 100644<br>--- a/modules/video_output/android/android_window.c<br>+++ b/modules/video_output/android/android_window.c<br>@@ -284,6 +284,37 @@ static void SetupPictureYV12(picture_t *p_picture, uint32_t i_in_stride)<br> }<br> }<br> <br>+static int AndroidWindow_SetSurface(vout_display_sys_t *sys,<br>+ android_window *p_window,<br>+ <br><br><div>[The entire original message is not included.]</div></body></html>