date:20180202

[vlc-commits] chromecast: Disable CA check

2018-02-02 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Thu Jan 18 
11:25:33 2018 +0100| [1c24e8b96435c1e438653c4fa017634072ca99cf] | committer: 
Thomas Guillem

chromecast: Disable CA check

The certificate on the chromecast is an unchecked self-generated one,
with a validity of 3 days. There is no way and no point into checking
its CA and warning the user about it.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1c24e8b96435c1e438653c4fa017634072ca99cf
---

 modules/stream_out/chromecast/chromecast_communication.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/stream_out/chromecast/chromecast_communication.cpp 
b/modules/stream_out/chromecast/chromecast_communication.cpp
index e20bb19817..6e8310949e 100644
--- a/modules/stream_out/chromecast/chromecast_communication.cpp
+++ b/modules/stream_out/chromecast/chromecast_communication.cpp
@@ -49,6 +49,8 @@ ChromecastCommunication::ChromecastCommunication( 
vlc_object_t* p_module, const
 if (m_creds == NULL)
 throw std::runtime_error( "Failed to create TLS client" );
 
+/* Ignore ca checks */
+m_creds->obj.flags |= OBJECT_FLAGS_INSECURE;
 m_tls = vlc_tls_SocketOpenTLS( m_creds, targetIP, devicePort, "tcps",
NULL, NULL );
 if (m_tls == NULL)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: replace API deprecated in 10.10

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Feb  2 16:40:58 
2018 +0100| [255ded1ff80327b324fbc12e8116729f4682651f] | committer: Felix Paul 
Kühne

macosx: replace API deprecated in 10.10

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=255ded1ff80327b324fbc12e8116729f4682651f
---

 modules/gui/macosx/VLCAboutWindowController.m  |  4 ++--
 modules/gui/macosx/VLCAudioEffectsWindowController.m   |  8 
 modules/gui/macosx/VLCConvertAndSaveWindowController.m | 10 +-
 modules/gui/macosx/VLCLogWindowController.m|  2 +-
 modules/gui/macosx/VLCMain+OldPrefs.m  |  2 +-
 modules/gui/macosx/VLCMain.m   |  4 ++--
 modules/gui/macosx/VLCMainMenu.m   |  4 ++--
 modules/gui/macosx/VLCOpenWindowController.m   |  8 
 modules/gui/macosx/VLCPopupPanelController.h   |  2 +-
 modules/gui/macosx/VLCPopupPanelController.m   |  2 +-
 modules/gui/macosx/VLCSimplePrefsController.m  |  4 ++--
 modules/gui/macosx/VLCTextfieldPanelController.h   |  2 +-
 modules/gui/macosx/VLCTextfieldPanelController.m   |  2 +-
 modules/gui/macosx/VLCTimeSelectionPanelController.h   |  2 +-
 modules/gui/macosx/VLCTimeSelectionPanelController.m   |  2 +-
 modules/gui/macosx/VLCVideoEffectsWindowController.m   |  4 ++--
 modules/gui/macosx/prefs_widgets.m |  2 +-
 17 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/modules/gui/macosx/VLCAboutWindowController.m 
b/modules/gui/macosx/VLCAboutWindowController.m
index dea4585d27..6230a6b5c5 100644
--- a/modules/gui/macosx/VLCAboutWindowController.m
+++ b/modules/gui/macosx/VLCAboutWindowController.m
@@ -164,8 +164,8 @@
  * Note: this icon doesn't represent an endorsement of The Coca-Cola 
Company.
  */
 NSCalendar *gregorian =
-[[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit 
inUnit:NSYearCalendarUnit forDate:[NSDate date]];
+[[NSCalendar alloc] 
initWithCalendarIdentifier:NSCalendarIdentifierGregorian];
+NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSCalendarUnitDay 
inUnit:NSCalendarUnitYear forDate:[NSDate date]];
 
 if (dayOfYear >= 354)
 [o_icon_view setImage: [NSImage imageNamed:@"VLC-Xmas"]];
diff --git a/modules/gui/macosx/VLCAudioEffectsWindowController.m 
b/modules/gui/macosx/VLCAudioEffectsWindowController.m
index 1f630cc661..ae91698ba7 100644
--- a/modules/gui/macosx/VLCAudioEffectsWindowController.m
+++ b/modules/gui/macosx/VLCAudioEffectsWindowController.m
@@ -515,7 +515,7 @@
 [_textfieldPanel runModalForWindow:self.window 
completionHandler:^(NSInteger returnCode, NSString *resultingText) {
 
 NSInteger currentProfileIndex = [_self currentProfileIndex];
-if (returnCode != NSOKButton) {
+if (returnCode != NSModalResponseOK) {
 [_profilePopup selectItemAtIndex:currentProfileIndex];
 return;
 }
@@ -573,7 +573,7 @@
 [_popupPanel runModalForWindow:self.window completionHandler:^(NSInteger 
returnCode, NSInteger selectedIndex) {
 
 NSInteger currentProfileIndex = [_self currentProfileIndex];
-if (returnCode != NSOKButton) {
+if (returnCode != NSModalResponseOK) {
 [_profilePopup selectItemAtIndex:currentProfileIndex];
 return;
 }
@@ -828,7 +828,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 
 // EQ settings
-if (returnCode != NSOKButton || [resultingText length] == 0)
+if (returnCode != NSModalResponseOK || [resultingText length] == 0)
 return;
 
 NSString *decomposedStringWithCanonicalMapping = [resultingText 
decomposedStringWithCanonicalMapping];
@@ -872,7 +872,7 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 __unsafe_unretained typeof(self) _self = self;
 [_popupPanel runModalForWindow:self.window completionHandler:^(NSInteger 
returnCode, NSInteger selectedIndex) {
 
-if (returnCode != NSOKButton)
+if (returnCode != NSModalResponseOK)
 return;
 
 /* remove requested profile from the arrays */
diff --git a/modules/gui/macosx/VLCConvertAndSaveWindowController.m 
b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
index d03c1e679f..6d3755408f 100644
--- a/modules/gui/macosx/VLCConvertAndSaveWindowController.m
+++ b/modules/gui/macosx/VLCConvertAndSaveWindowController.m
@@ -313,7 +313,7 @@
 [openPanel setResolvesAliases:YES];
 [openPanel setAllowsMultipleSelection:NO];
 [openPanel beginSheetModalForWindow:self.window 
completionHandler:^(NSInteger returnCode) {
-if (returnCode == NSOKButton)
+if (returnCode == NSModalResponseOK)
 {
 [self setMRL:

[vlc-commits] tls: Add a way to ignore CA check.

2018-02-02 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Thu Jan 18 
11:25:32 2018 +0100| [0d8b5004b5df9b235a945da00eec50163a5e8e5c] | committer: 
Thomas Guillem

tls: Add a way to ignore CA check.

Without breaking ABI.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0d8b5004b5df9b235a945da00eec50163a5e8e5c
---

 include/vlc_objects.h | 1 +
 modules/misc/gnutls.c | 7 +++
 2 files changed, 8 insertions(+)

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a5b5dc21dc..4a2814187a 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -31,6 +31,7 @@
 /* Object flags */
 #define OBJECT_FLAGS_QUIET   0x0002
 #define OBJECT_FLAGS_NOINTERACT  0x0004
+#define OBJECT_FLAGS_INSECURE0x1000 /* VLC 3.0 only, will be removed */
 
 /*
  * The vlc_object_t type. Yes, it's that simple :-)
diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c
index 1cca9c14a7..57429a0b99 100644
--- a/modules/misc/gnutls.c
+++ b/modules/misc/gnutls.c
@@ -445,6 +445,13 @@ static int gnutls_ClientHandshake(vlc_tls_creds_t *creds, 
vlc_tls_t *tls,
 gnutls_free (desc.data);
 }
 
+if (status == (GNUTLS_CERT_SIGNER_NOT_FOUND | GNUTLS_CERT_INVALID) &&
+(creds->obj.flags & OBJECT_FLAGS_INSECURE))
+{
+msg_Info( creds, "Accepting self-signed/untrusted CA certificate." );
+return 0;
+}
+
 status &= ~GNUTLS_CERT_INVALID; /* always set / catch-all error */
 status &= ~GNUTLS_CERT_SIGNER_NOT_FOUND; /* unknown CA */
 status &= ~GNUTLS_CERT_UNEXPECTED_OWNER; /* mismatched hostname */

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: replace Carbon implementation with its BSD counter-part

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Fri Feb  2 17:30:38 
2018 +0100| [535112f6c6cbc7810c510838cb0ebefb4a5282bb] | committer: Felix Paul 
Kühne

macosx: replace Carbon implementation with its BSD counter-part

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=535112f6c6cbc7810c510838cb0ebefb4a5282bb
---

 modules/gui/macosx/VLCStringUtility.m | 78 +++
 1 file changed, 15 insertions(+), 63 deletions(-)

diff --git a/modules/gui/macosx/VLCStringUtility.m 
b/modules/gui/macosx/VLCStringUtility.m
index 4487187659..c564878838 100644
--- a/modules/gui/macosx/VLCStringUtility.m
+++ b/modules/gui/macosx/VLCStringUtility.m
@@ -1,7 +1,7 @@
 /*
  * VLCStringUtility.m: MacOS X interface module
  *
- * Copyright (C) 2002-2014 VLC authors and VideoLAN
+ * Copyright (C) 2002-2018 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen 
@@ -29,6 +29,9 @@
 #import "VLCMain.h"
 #import "CompatibilityFixes.h"
 
+#import 
+#import 
+
 #import 
 #import 
 #import 
@@ -383,77 +386,26 @@ NSString *toNSStr(const char *str) {
 
 - (NSString *) getBSDNodeFromMountPath:(NSString *)mountPath
 {
-OSStatus err;
-FSRef ref;
-FSVolumeRefNum actualVolume;
-err = FSPathMakeRef ((const UInt8 *) [mountPath fileSystemRepresentation], 
, NULL);
-
-// get a FSVolumeRefNum from mountPath
-if (noErr == err) {
-FSCatalogInfo   catalogInfo;
-err = FSGetCatalogInfo (,
-kFSCatInfoVolume,
-,
-NULL,
-NULL,
-NULL
-);
-if (noErr == err)
-actualVolume = catalogInfo.volume;
-else
-return @"";
-}
-else
+struct statfs stf;
+int ret = statfs([mountPath fileSystemRepresentation], );
+if (ret != 0) {
 return @"";
-
-GetVolParmsInfoBuffer volumeParms;
-err = FSGetVolumeParms(actualVolume, , sizeof(volumeParms));
-if (noErr == err) {
-NSString *bsdName = [NSString stringWithUTF8String:(char 
*)volumeParms.vMDeviceID];
-return [NSString stringWithFormat:@"/dev/r%@", bsdName];
 }
 
-return @"";
+return [NSString stringWithFormat:@"r%s", stf.f_mntfromname];
 }
 
 - (NSString *)getVolumeTypeFromMountPath:(NSString *)mountPath
 {
-OSStatus err;
-FSRef ref;
-FSVolumeRefNum actualVolume;
-NSString *returnValue;
-err = FSPathMakeRef ((const UInt8 *) [mountPath fileSystemRepresentation], 
, NULL);
-
-// get a FSVolumeRefNum from mountPath
-if (noErr == err) {
-FSCatalogInfo   catalogInfo;
-err = FSGetCatalogInfo (,
-kFSCatInfoVolume,
-,
-NULL,
-NULL,
-NULL
-);
-if (noErr == err)
-actualVolume = catalogInfo.volume;
-else
-goto out;
-}
-else
-goto out;
-
-GetVolParmsInfoBuffer volumeParms;
-err = FSGetVolumeParms(actualVolume, , sizeof(volumeParms));
-
-CFMutableDictionaryRef matchingDict;
-io_service_t service;
-
-if (!volumeParms.vMDeviceID) {
-goto out;
+struct statfs stf;
+int ret = statfs([mountPath fileSystemRepresentation], );
+if (ret != 0) {
+return @"";
 }
 
-matchingDict = IOBSDNameMatching(kIOMasterPortDefault, 0, 
volumeParms.vMDeviceID);
-service = IOServiceGetMatchingService(kIOMasterPortDefault, matchingDict);
+CFMutableDictionaryRef matchingDict = 
IOBSDNameMatching(kIOMasterPortDefault, 0, stf.f_mntfromname);
+io_service_t service = IOServiceGetMatchingService(kIOMasterPortDefault, 
matchingDict);
+NSString *returnValue;
 
 if (IO_OBJECT_NULL != service) {
 if (IOObjectConformsTo(service, kIOCDMediaClass))

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: android: remove PRE-ICS setBuffersGeometry hack

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 17:03:41 
2018 +0100| [a16a24bce5e7e8fa6b2c05e63f5524e1d8df0640] | committer: Thomas 
Guillem

vout: android: remove PRE-ICS setBuffersGeometry hack

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a16a24bce5e7e8fa6b2c05e63f5524e1d8df0640
---

 modules/video_output/android/display.c | 29 -
 modules/video_output/android/utils.c   | 21 -
 modules/video_output/android/utils.h   | 10 --
 3 files changed, 60 deletions(-)

diff --git a/modules/video_output/android/display.c 
b/modules/video_output/android/display.c
index 9824a417e8..7e306da7c5 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -393,31 +393,6 @@ static void AndroidWindow_Destroy(vout_display_t *vd,
 free(p_window);
 }
 
-static int AndroidWindow_ConfigureJavaSurface(vout_display_sys_t *sys,
-  android_window *p_window,
-  bool *p_java_configured)
-{
-/* setBuffersGeometry is broken before ics. Use
- * AJavaWindow_setBuffersGeometry to configure the surface on the java side
- * synchronously.  AJavaWindow_setBuffersGeometry return en error when you
- * don't need to call it (ie, after ics). if this call succeed, you need to
- * get a new surface handle. That's why AndroidWindow_DisconnectSurface is
- * called here. */
-if (AWindowHandler_setBuffersGeometry(sys->p_awh, p_window->id,
-  p_window->fmt.i_width,
-  p_window->fmt.i_height,
-  p_window->i_android_hal) == 
VLC_SUCCESS)
-{
-*p_java_configured = true;
-AndroidWindow_DisconnectSurface(sys, p_window);
-if (AndroidWindow_ConnectSurface(sys, p_window) != 0)
-return -1;
-} else
-*p_java_configured = false;
-
-return 0;
-}
-
 static int AndroidWindow_SetupANW(vout_display_sys_t *sys,
   android_window *p_window,
   bool b_java_configured)
@@ -453,10 +428,6 @@ static int AndroidWindow_Setup(vout_display_sys_t *sys,
 p_window->fmt.i_width = (p_pic->format.i_width + align_pixels) & 
~align_pixels;
 picture_Release(p_pic);
 
-if (AndroidWindow_ConfigureJavaSurface(sys, p_window,
-   _java_configured) != 0)
-return -1;
-
 if (AndroidWindow_SetupANW(sys, p_window, b_java_configured) != 0)
 return -1;
 } else {
diff --git a/modules/video_output/android/utils.c 
b/modules/video_output/android/utils.c
index b59035ef89..de65746f18 100644
--- a/modules/video_output/android/utils.c
+++ b/modules/video_output/android/utils.c
@@ -79,7 +79,6 @@ static struct
 jmethodID getSubtitlesSurface;
 jmethodID registerNative;
 jmethodID unregisterNative;
-jmethodID setBuffersGeometry;
 jmethodID setVideoLayout;
 } AndroidNativeWindow;
 struct {
@@ -424,8 +423,6 @@ InitJNIFields(JNIEnv *env, vlc_object_t *p_obj, jobject 
*jobj)
"registerNative", "(J)I", true);
 GET_METHOD(AndroidNativeWindow.unregisterNative,
"unregisterNative", "()V", true);
-GET_METHOD(AndroidNativeWindow.setBuffersGeometry,
-   "setBuffersGeometry", "(Landroid/view/Surface;III)Z", true);
 GET_METHOD(AndroidNativeWindow.setVideoLayout,
"setVideoLayout", "(II)V", true);
 
@@ -685,24 +682,6 @@ AndroidNativeWindow_onWindowSize(JNIEnv* env, jobject 
clazz, jlong handle,
 p_awh->event.cb.on_new_window_size(p_awh->wnd, width, height);
 }
 
-int
-AWindowHandler_setBuffersGeometry(AWindowHandler *p_awh, enum AWindow_ID id,
-  int i_width, int i_height, int i_format)
-{
-jobject jsurf;
-JNIEnv *p_env = AWindowHandler_getEnv(p_awh);
-if (!p_env)
-return VLC_EGENERIC;
-
-jsurf = AWindowHandler_getSurface(p_awh, id);
-if (!jsurf)
-return VLC_EGENERIC;
-
-return JNI_ANWCALL(CallBooleanMethod, setBuffersGeometry,
-   jsurf, i_width, i_height, i_format) ? VLC_SUCCESS
-   : VLC_EGENERIC;
-}
-
 bool
 AWindowHandler_canSetVideoLayout(AWindowHandler *p_awh)
 {
diff --git a/modules/video_output/android/utils.h 
b/modules/video_output/android/utils.h
index 3684cd4eca..5d61a30991 100644
--- a/modules/video_output/android/utils.h
+++ b/modules/video_output/android/utils.h
@@ -118,16 +118,6 @@ ANativeWindow 
*AWindowHandler_getANativeWindow(AWindowHandler *p_awh,
  */
 void AWindowHandler_releaseANativeWindow(AWindowHandler *p_awh,
  enum AWindow_ID id);
-/**
- * Pre-ICS hack of ANativeWindow_setBuffersGeometry
- *
- * This

[vlc-commits] vout: android: remove ANW private API usage

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 16:57:08 
2018 +0100| [9763dbf8dacae7a80fae8ec899904e68a3425a6f] | committer: Thomas 
Guillem

vout: android: remove ANW private API usage

It's not legal to use it since Android 5.0 and we prefer the gles2 vout.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9763dbf8dacae7a80fae8ec899904e68a3425a6f
---

 modules/video_output/android/display.c  | 169 ++
 modules/video_output/android/nativewindowpriv.c | 426 
 modules/video_output/android/utils.c|  31 --
 modules/video_output/android/utils.h|  32 --
 4 files changed, 24 insertions(+), 634 deletions(-)

diff --git a/modules/video_output/android/display.c 
b/modules/video_output/android/display.c
index f7c71b4439..9824a417e8 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -96,13 +96,11 @@ struct android_window
 unsigned int i_angle;
 unsigned int i_pic_count;
 unsigned int i_min_undequeued;
-bool b_use_priv;
 bool b_opaque;
 
 enum AWindow_ID id;
 ANativeWindow *p_surface;
 jobject   *p_jsurface;
-native_window_priv *p_surface_priv;
 };
 
 typedef struct buffer_bounds buffer_bounds;
@@ -122,8 +120,6 @@ struct vout_display_sys_t
 
 AWindowHandler *p_awh;
 native_window_api_t *anw;
-native_window_priv_api_t anwp;
-bool b_has_anwp;
 
 android_window *p_window;
 android_window *p_sub_window;
@@ -160,8 +156,7 @@ static inline int ChromaToAndroidHal(vlc_fourcc_t i_chroma)
 }
 }
 
-static int UpdateVideoSize(vout_display_sys_t *sys, video_format_t *p_fmt,
-   bool b_cropped)
+static int UpdateVideoSize(vout_display_sys_t *sys, video_format_t *p_fmt)
 {
 unsigned int i_width, i_height;
 unsigned int i_sar_num = 1, i_sar_den = 1;
@@ -173,13 +168,8 @@ static int UpdateVideoSize(vout_display_sys_t *sys, 
video_format_t *p_fmt,
 i_sar_num = rot_fmt.i_sar_num;
 i_sar_den = rot_fmt.i_sar_den;
 }
-if (b_cropped) {
-i_width = rot_fmt.i_visible_width;
-i_height = rot_fmt.i_visible_height;
-} else {
-i_width = rot_fmt.i_width;
-i_height = rot_fmt.i_height;
-}
+i_width = rot_fmt.i_width;
+i_height = rot_fmt.i_height;
 
 AWindowHandler_setVideoLayout(sys->p_awh, i_width, i_height,
   rot_fmt.i_visible_width,
@@ -323,10 +313,6 @@ static void SetupPictureYV12(picture_t *p_picture, 
uint32_t i_in_stride)
 static void AndroidWindow_DisconnectSurface(vout_display_sys_t *sys,
 android_window *p_window)
 {
-if (p_window->p_surface_priv) {
-sys->anwp.disconnect(p_window->p_surface_priv);
-p_window->p_surface_priv = NULL;
-}
 if (p_window->p_surface) {
 AWindowHandler_releaseANativeWindow(sys->p_awh, p_window->id);
 p_window->p_surface = NULL;
@@ -351,8 +337,7 @@ static int AndroidWindow_ConnectSurface(vout_display_sys_t 
*sys,
 
 static android_window *AndroidWindow_New(vout_display_t *vd,
  video_format_t *p_fmt,
- enum AWindow_ID id,
- bool b_use_priv)
+ enum AWindow_ID id)
 {
 vout_display_sys_t *sys = vd->sys;
 android_window *p_window = NULL;
@@ -364,8 +349,6 @@ static android_window *AndroidWindow_New(vout_display_t *vd,
 p_window->id = id;
 p_window->b_opaque = p_fmt->i_chroma == VLC_CODEC_ANDROID_OPAQUE;
 if (!p_window->b_opaque) {
-p_window->b_use_priv = sys->b_has_anwp && b_use_priv;
-
 p_window->i_android_hal = ChromaToAndroidHal(p_fmt->i_chroma);
 if (p_window->i_android_hal == -1)
 goto error;
@@ -385,10 +368,7 @@ static android_window *AndroidWindow_New(vout_display_t 
*vd,
 default:
 p_window->i_angle = 0;
 }
-if (p_window->b_use_priv)
-p_window->fmt = *p_fmt;
-else
-video_format_ApplyRotation(_window->fmt, p_fmt);
+video_format_ApplyRotation(_window->fmt, p_fmt);
 p_window->i_pic_count = 1;
 
 if (AndroidWindow_ConnectSurface(sys, p_window) != 0)
@@ -413,73 +393,6 @@ static void AndroidWindow_Destroy(vout_display_t *vd,
 free(p_window);
 }
 
-static int AndroidWindow_UpdateCrop(vout_display_sys_t *sys,
-android_window *p_window)
-{
-if (!p_window->p_surface_priv)
-return -1;
-
-return sys->anwp.setCrop(p_window->p_surface_priv,
- p_window->fmt.i_x_offset,
- p_window->fmt.i_y_offset,
- p_window->fmt.i_visible_width,
- p_window->fmt.i_visible_height);
-}
-
-static int AndroidWindow_SetupANWP(vout_display_sys_t *sys,
-

[vlc-commits] demux:mkv: always start from the first Cluster when we don't know we to seek

2018-02-02 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Fri Feb  2 16:57:14 
2018 +0100| [465af7493db8ec8e48d95832e5a5d111e2849762] | committer: Steve Lhomme

demux:mkv: always start from the first Cluster when we don't know we to seek

When the file is truncated some previous seek may have failed and we need to
reset the OEF.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=465af7493db8ec8e48d95832e5a5d111e2849762
---

 modules/demux/mkv/matroska_segment_seeker.cpp | 5 +
 1 file changed, 5 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment_seeker.cpp 
b/modules/demux/mkv/matroska_segment_seeker.cpp
index e6f8a5b13d..bb38ee31de 100644
--- a/modules/demux/mkv/matroska_segment_seeker.cpp
+++ b/modules/demux/mkv/matroska_segment_seeker.cpp
@@ -486,6 +486,11 @@ SegmentSeeker::mkv_jump_to( matroska_segment_c& ms, fptr_t 
fpos )
 mark_range_as_searched( Range( i_cluster_pos, 
ms.es.I_O().getFilePointer() ) );
 }
 }
+else if (ms.cluster != NULL)
+{
+// make sure we start reading after the Cluster start
+ms.es.I_O().setFilePointer(ms.cluster->GetDataStart());
+}
 
 ms.ep.Down();
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux:mkv: unmark the EOF if the seek failed and we're still in usable data

2018-02-02 Thread Steve Lhomme

vlc | branch: master | Steve Lhomme  | Fri Feb  2 16:24:26 
2018 +0100| [42b2aee790300d175c2141657d47c325442213c2] | committer: Steve Lhomme

demux:mkv: unmark the EOF if the seek failed and we're still in usable data

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=42b2aee790300d175c2141657d47c325442213c2
---

 modules/demux/mkv/stream_io_callback.cpp | 9 +
 1 file changed, 9 insertions(+)

diff --git a/modules/demux/mkv/stream_io_callback.cpp 
b/modules/demux/mkv/stream_io_callback.cpp
index 570229e262..6a50745f13 100644
--- a/modules/demux/mkv/stream_io_callback.cpp
+++ b/modules/demux/mkv/stream_io_callback.cpp
@@ -64,7 +64,16 @@ void vlc_stream_io_callback::setFilePointer(int64_t 
i_offset, seek_mode mode )
 }
 
 if(i_pos == i_current)
+{
+if (mb_eof)
+{
+// if previous setFilePointer() failed we may be back in the 
available data
+i_size = stream_Size( s );
+if ( i_size != 0 && i_pos < i_size )
+mb_eof = vlc_stream_Seek( s, i_pos ) != VLC_SUCCESS;
+}
 return;
+}
 
 if( i_pos < 0 || ( ( i_size = stream_Size( s ) ) != 0 && i_pos >= i_size ) 
)
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caca: merge event thread library

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
16:57:19 2018 +0200| [ad5a38ab182eb3afed785b8f6624fe4ceaaee723] | committer: 
Rémi Denis-Courmont

caca: merge event thread library

(With removal of AA, this is now the only user.)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad5a38ab182eb3afed785b8f6624fe4ceaaee723
---

 modules/video_output/Makefile.am|   7 +--
 modules/video_output/caca.c |  73 -
 modules/video_output/event_thread.c | 103 
 modules/video_output/event_thread.h |  30 ---
 4 files changed, 73 insertions(+), 140 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 1718a20cff..17967b51af 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -406,7 +406,7 @@ vout_LTLIBRARIES += $(LTLIBfb)
 ### Coloured ASCII art ###
 libcaca_plugin_la_SOURCES = video_output/caca.c
 libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
-libcaca_plugin_la_LIBADD = libevent_thread.la $(CACA_LIBS)
+libcaca_plugin_la_LIBADD = $(CACA_LIBS)
 if !HAVE_WIN32
 if !HAVE_DARWIN
 libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
@@ -430,8 +430,3 @@ vout_LTLIBRARIES += \
libvdummy_plugin.la \
libvmem_plugin.la \
libyuv_plugin.la
-
-libevent_thread_la_SOURCES = \
-   video_output/event_thread.c video_output/event_thread.h
-libevent_thread_la_LDFLAGS = -static
-noinst_LTLIBRARIES += libevent_thread.la
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index a4442ce636..25e80f2f8e 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -30,7 +30,11 @@
 # include "config.h"
 #endif
 
+#include 
+#include 
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -42,7 +46,74 @@
 #endif
 
 #include 
-#include "event_thread.h"
+
+typedef struct vout_display_event_thread {
+vout_display_t *vd;
+block_fifo_t *fifo;
+vlc_thread_t thread;
+} vout_display_event_thread_t;
+
+noreturn static void *VoutDisplayEventKeyDispatch(void *data)
+{
+vout_display_event_thread_t *vdet = data;
+vout_display_t *vd = vdet->vd;
+block_fifo_t *fifo = vdet->fifo;
+
+for (;;) {
+block_t *event = block_FifoGet(fifo);
+
+int cancel = vlc_savecancel();
+int key;
+
+memcpy(, event->p_buffer, sizeof (key));
+block_Release(event);
+vout_display_SendEventKey(vd, key);
+vlc_restorecancel(cancel);
+}
+}
+
+static void VoutDisplayEventKey(vout_display_event_thread_t *vdet, int key)
+{
+if (unlikely(vdet == NULL))
+return;
+
+block_t *event = block_Alloc(sizeof (key));
+if (likely(event != NULL)) {
+memcpy(event->p_buffer, , sizeof (key));
+block_FifoPut(vdet->fifo, event);
+}
+}
+
+static struct vout_display_event_thread *
+VoutDisplayEventCreateThread(vout_display_t *vd)
+{
+vout_display_event_thread_t *vdet = malloc(sizeof (*vdet));
+if (unlikely(vdet == NULL))
+return NULL;
+
+vdet->vd = vd;
+vdet->fifo = block_FifoNew();
+if (unlikely(vdet->fifo == NULL)) {
+free(vdet);
+return NULL;
+}
+
+if (vlc_clone(>thread, VoutDisplayEventKeyDispatch, vdet,
+  VLC_THREAD_PRIORITY_LOW)) {
+block_FifoRelease(vdet->fifo);
+free(vdet);
+return NULL;
+}
+return vdet;
+}
+
+static void VoutDisplayEventKillThread(vout_display_event_thread_t *vdet)
+{
+vlc_cancel(vdet->thread);
+vlc_join(vdet->thread, NULL);
+block_FifoRelease(vdet->fifo);
+free(vdet);
+}
 
 /*
  * Module descriptor
diff --git a/modules/video_output/event_thread.c 
b/modules/video_output/event_thread.c
deleted file mode 100644
index 817de309a8..00
--- a/modules/video_output/event_thread.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * event.c: event thread for broken old video output display plugins
- *
- * Copyright (C) 2009 Laurent Aimar
- * $Id$
- *
- * Authors: Laurent Aimar 
- *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc.,

[vlc-commits] caca: inline event thread

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
17:42:38 2018 +0200| [ca60ed72872ad7d13c9091076750d89c715d0e79] | committer: 
Rémi Denis-Courmont

caca: inline event thread

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ca60ed72872ad7d13c9091076750d89c715d0e79
---

 modules/video_output/caca.c | 86 -
 1 file changed, 30 insertions(+), 56 deletions(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 23c5d4e675..ffea9625cc 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -47,17 +47,22 @@
 
 #include 
 
-typedef struct vout_display_event_thread {
-vout_display_t *vd;
+/* */
+struct vout_display_sys_t {
+cucul_canvas_t *cv;
+caca_display_t *dp;
+cucul_dither_t *dither;
+
+picture_pool_t *pool;
 block_fifo_t *fifo;
 vlc_thread_t thread;
-} vout_display_event_thread_t;
+};
 
 noreturn static void *VoutDisplayEventKeyDispatch(void *data)
 {
-vout_display_event_thread_t *vdet = data;
-vout_display_t *vd = vdet->vd;
-block_fifo_t *fifo = vdet->fifo;
+vout_display_t *vd = data;
+vout_display_sys_t *sys = vd->sys;
+block_fifo_t *fifo = sys->fifo;
 
 for (;;) {
 block_t *event = block_FifoGet(fifo);
@@ -72,59 +77,15 @@ noreturn static void *VoutDisplayEventKeyDispatch(void 
*data)
 }
 }
 
-static void VoutDisplayEventKey(vout_display_event_thread_t *vdet, int key)
+static void VoutDisplayEventKey(vout_display_sys_t *sys, int key)
 {
-if (unlikely(vdet == NULL))
-return;
-
 block_t *event = block_Alloc(sizeof (key));
 if (likely(event != NULL)) {
 memcpy(event->p_buffer, , sizeof (key));
-block_FifoPut(vdet->fifo, event);
-}
-}
-
-static struct vout_display_event_thread *
-VoutDisplayEventCreateThread(vout_display_t *vd)
-{
-vout_display_event_thread_t *vdet = malloc(sizeof (*vdet));
-if (unlikely(vdet == NULL))
-return NULL;
-
-vdet->vd = vd;
-vdet->fifo = block_FifoNew();
-if (unlikely(vdet->fifo == NULL)) {
-free(vdet);
-return NULL;
-}
-
-if (vlc_clone(>thread, VoutDisplayEventKeyDispatch, vdet,
-  VLC_THREAD_PRIORITY_LOW)) {
-block_FifoRelease(vdet->fifo);
-free(vdet);
-return NULL;
+block_FifoPut(sys->fifo, event);
 }
-return vdet;
 }
 
-static void VoutDisplayEventKillThread(vout_display_event_thread_t *vdet)
-{
-vlc_cancel(vdet->thread);
-vlc_join(vdet->thread, NULL);
-block_FifoRelease(vdet->fifo);
-free(vdet);
-}
-
-/* */
-struct vout_display_sys_t {
-cucul_canvas_t *cv;
-caca_display_t *dp;
-cucul_dither_t *dither;
-
-picture_pool_t *pool;
-vout_display_event_thread_t *et;
-};
-
 /**
  * Return a pool of direct buffers
  */
@@ -364,12 +325,12 @@ static void Manage(vout_display_t *vd)
 const int vlc = keys[i].vlc;
 
 if (vlc >= 0)
-VoutDisplayEventKey(sys->et, vlc);
+VoutDisplayEventKey(sys, vlc);
 return;
 }
 }
 if (caca >= 0x20 && caca <= 0x7f) {
-VoutDisplayEventKey(sys->et, caca);
+VoutDisplayEventKey(sys, caca);
 return;
 }
 break;
@@ -513,7 +474,16 @@ static int Open(vlc_object_t *object)
 caca_set_display_title(sys->dp,
VOUT_TITLE "(Colour AsCii Art)");
 
-sys->et = VoutDisplayEventCreateThread(vd);
+block_fifo_t *fifo = block_FifoNew();
+if (likely(fifo != NULL)) {
+sys->fifo = fifo;
+
+if (vlc_clone(>thread, VoutDisplayEventKeyDispatch, vd,
+  VLC_THREAD_PRIORITY_LOW)) {
+block_FifoRelease(fifo);
+sys->fifo = NULL;
+}
+}
 
 /* Fix format */
 video_format_t fmt = vd->fmt;
@@ -566,7 +536,11 @@ static void Close(vlc_object_t *object)
 vout_display_t *vd = (vout_display_t *)object;
 vout_display_sys_t *sys = vd->sys;
 
-VoutDisplayEventKillThread(sys->et);
+if (sys->fifo != NULL) {
+vlc_cancel(sys->thread);
+vlc_join(sys->thread, NULL);
+block_FifoRelease(sys->fifo);
+}
 if (sys->pool)
 picture_pool_Release(sys->pool);
 if (sys->dither)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caca: actually use the event thread

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
16:53:06 2018 +0200| [6c0f8bd638a13ee0688ba2e98a1a2e09ef564c25] | committer: 
Rémi Denis-Courmont

caca: actually use the event thread

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c0f8bd638a13ee0688ba2e98a1a2e09ef564c25
---

 modules/video_output/caca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 33a0409820..a4442ce636 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -485,12 +485,12 @@ static void Manage(vout_display_t *vd)
 const int vlc = keys[i].vlc;
 
 if (vlc >= 0)
-vout_display_SendEventKey(vd, vlc);
+VoutDisplayEventKey(sys->et, vlc);
 return;
 }
 }
 if (caca >= 0x20 && caca <= 0x7f) {
-vout_display_SendEventKey(vd, caca);
+VoutDisplayEventKey(sys->et, caca);
 return;
 }
 break;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caca: reorder to avoid forward declarations

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
17:12:29 2018 +0200| [57151f6ba8ea1c73efab46c9ead03138dfeac87e] | committer: 
Rémi Denis-Courmont

caca: reorder to avoid forward declarations

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=57151f6ba8ea1c73efab46c9ead03138dfeac87e
---

 modules/video_output/caca.c | 439 +---
 1 file changed, 211 insertions(+), 228 deletions(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 25e80f2f8e..23c5d4e675 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -115,34 +115,6 @@ static void 
VoutDisplayEventKillThread(vout_display_event_thread_t *vdet)
 free(vdet);
 }
 
-/*
- * Module descriptor
- */
-static int  Open (vlc_object_t *);
-static void Close(vlc_object_t *);
-
-vlc_module_begin()
-set_shortname("Caca")
-set_category(CAT_VIDEO)
-set_subcategory(SUBCAT_VIDEO_VOUT)
-set_description(N_("Color ASCII art video output"))
-set_capability("vout display", 15)
-set_callbacks(Open, Close)
-vlc_module_end()
-
-/*
- * Local prototypes
- */
-static picture_pool_t *Pool  (vout_display_t *, unsigned);
-static void   Prepare(vout_display_t *, picture_t *, subpicture_t *);
-static voidPictureDisplay(vout_display_t *, picture_t *, subpicture_t *);
-static intControl(vout_display_t *, int, va_list);
-
-/* */
-static void Manage(vout_display_t *);
-static void Refresh(vout_display_t *);
-static void Place(vout_display_t *, vout_display_place_t *);
-
 /* */
 struct vout_display_sys_t {
 cucul_canvas_t *cv;
@@ -154,179 +126,61 @@ struct vout_display_sys_t {
 };
 
 /**
- * This function initializes libcaca vout method.
+ * Return a pool of direct buffers
  */
-static int Open(vlc_object_t *object)
+static picture_pool_t *Pool(vout_display_t *vd, unsigned count)
 {
-vout_display_t *vd = (vout_display_t *)object;
-vout_display_sys_t *sys;
-
-if (vout_display_IsWindowed(vd))
-return VLC_EGENERIC;
-#if !defined(__APPLE__) && !defined(_WIN32)
-# ifndef X_DISPLAY_MISSING
-if (!vlc_xlib_init(object))
-return VLC_EGENERIC;
-# endif
-#endif
-
-#if defined(_WIN32)
-CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
-SMALL_RECT rect;
-COORD coord;
-HANDLE hstdout;
-
-if (!AllocConsole()) {
-msg_Err(vd, "cannot create console");
-return VLC_EGENERIC;
-}
-
-hstdout =
-CreateConsoleScreenBuffer(GENERIC_READ | GENERIC_WRITE,
-  FILE_SHARE_READ | FILE_SHARE_WRITE,
-  NULL, CONSOLE_TEXTMODE_BUFFER, NULL);
-if (!hstdout || hstdout == INVALID_HANDLE_VALUE) {
-msg_Err(vd, "cannot create screen buffer");
-FreeConsole();
-return VLC_EGENERIC;
-}
-
-if (!SetConsoleActiveScreenBuffer(hstdout)) {
-msg_Err(vd, "cannot set active screen buffer");
-FreeConsole();
-return VLC_EGENERIC;
-}
-
-coord = GetLargestConsoleWindowSize(hstdout);
-msg_Dbg(vd, "SetConsoleWindowInfo: %ix%i", coord.X, coord.Y);
-
-/* Force size for now */
-coord.X = 100;
-coord.Y = 40;
-
-if (!SetConsoleScreenBufferSize(hstdout, coord))
-msg_Warn(vd, "SetConsoleScreenBufferSize %i %i",
-  coord.X, coord.Y);
-
-/* Get the current screen buffer size and window position. */
-if (GetConsoleScreenBufferInfo(hstdout, )) {
-rect.Top = 0; rect.Left = 0;
-rect.Right = csbiInfo.dwMaximumWindowSize.X - 1;
-rect.Bottom = csbiInfo.dwMaximumWindowSize.Y - 1;
-if (!SetConsoleWindowInfo(hstdout, TRUE, ))
-msg_Dbg(vd, "SetConsoleWindowInfo failed: %ix%i",
- rect.Right, rect.Bottom);
-}
-#endif
-
-/* Allocate structure */
-vd->sys = sys = calloc(1, sizeof(*sys));
-if (!sys)
-goto error;
-
-sys->cv = cucul_create_canvas(0, 0);
-if (!sys->cv) {
-msg_Err(vd, "cannot initialize libcucul");
-goto error;
-}
-
-const char *driver = NULL;
-#ifdef __APPLE__
-// Make sure we don't try to open a window.
-driver = "ncurses";
-#endif
-
-sys->dp = caca_create_display_with_driver(sys->cv, driver);
-if (!sys->dp) {
-msg_Err(vd, "cannot initialize libcaca");
-goto error;
-}
-
-if (vd->cfg->display.title)
-caca_set_display_title(sys->dp,
-   vd->cfg->display.title);
-else
-caca_set_display_title(sys->dp,
-   VOUT_TITLE "(Colour AsCii Art)");
-
-sys->et = VoutDisplayEventCreateThread(vd);
-
-/* Fix format

[vlc-commits] avcodec: reduce the default maximum number threads

2018-02-02 Thread Jean-Baptiste Kempf

vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf  | Fri 
Feb  2 16:08:04 2018 +0100| [842a64f5ee09cd039eda891f41977d01e10f1035] | 
committer: Jean-Baptiste Kempf

avcodec: reduce the default maximum number threads

Close #19490

(cherry picked from commit d5e4b89167e97f3bac7bd1dbd76e2ea36f779aca)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=842a64f5ee09cd039eda891f41977d01e10f1035
---

 modules/codec/avcodec/video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index b056c1b86f..b7f2b8e3f3 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -542,7 +542,7 @@ int InitVideoDec( vlc_object_t *obj )
 i_thread_count++;
 
 //FIXME: take in count the decoding time
-i_thread_count = __MIN( i_thread_count, p_codec->id == 
AV_CODEC_ID_HEVC ? 12 : 6 );
+i_thread_count = __MIN( i_thread_count, p_codec->id == 
AV_CODEC_ID_HEVC ? 10 : 6 );
 }
 i_thread_count = __MIN( i_thread_count, p_codec->id == AV_CODEC_ID_HEVC ? 
32 : 16 );
 msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] avcodec: reduce the default maximum number threads

2018-02-02 Thread Jean-Baptiste Kempf

vlc | branch: master | Jean-Baptiste Kempf  | Fri Feb  2 
16:08:04 2018 +0100| [d5e4b89167e97f3bac7bd1dbd76e2ea36f779aca] | committer: 
Jean-Baptiste Kempf

avcodec: reduce the default maximum number threads

Close #19490

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d5e4b89167e97f3bac7bd1dbd76e2ea36f779aca
---

 modules/codec/avcodec/video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index c763a2d754..3e9601eed9 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -556,7 +556,7 @@ int InitVideoDec( vlc_object_t *obj )
 i_thread_count++;
 
 //FIXME: take in count the decoding time
-i_thread_count = __MIN( i_thread_count, p_codec->id == 
AV_CODEC_ID_HEVC ? 12 : 6 );
+i_thread_count = __MIN( i_thread_count, p_codec->id == 
AV_CODEC_ID_HEVC ? 10 : 6 );
 }
 i_thread_count = __MIN( i_thread_count, p_codec->id == AV_CODEC_ID_HEVC ? 
32 : 16 );
 msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count );

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caca: actually use the event thread

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
16:53:06 2018 +0200| [5df29c87cda78b84406c83e11e9e03c05c5d20e9] | committer: 
Thomas Guillem

caca: actually use the event thread

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5df29c87cda78b84406c83e11e9e03c05c5d20e9
---

 modules/video_output/caca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 33a0409820..3fe1da41a7 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -485,12 +485,12 @@ static void Manage(vout_display_t *vd)
 const int vlc = keys[i].vlc;
 
 if (vlc >= 0)
-vout_display_SendEventKey(vd, vlc);
+VoutDisplayEventKey(vd, vlc);
 return;
 }
 }
 if (caca >= 0x20 && caca <= 0x7f) {
-vout_display_SendEventKey(vd, caca);
+VoutDisplayEventKey(vd, caca);
 return;
 }
 break;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: remove omxil output

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 15:36:38 
2018 +0100| [90ab989e739b93803eae223a90c8f720e7c7e37e] | committer: Thomas 
Guillem

vout: remove omxil output

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=90ab989e739b93803eae223a90c8f720e7c7e37e
---

 NEWS   |   1 +
 configure.ac   |  14 +-
 modules/MODULES_LIST   |   1 -
 modules/codec/Makefile.am  |   9 +-
 modules/codec/omxil/vout.c | 461 -
 po/POTFILES.in |   1 -
 6 files changed, 5 insertions(+), 482 deletions(-)

diff --git a/NEWS b/NEWS
index f7afadbd31..c8a9d462db 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Codecs:
 Video ouput:
  * Remove aa plugin
  * Remove evas plugin
+ * Remove omxil_vout plugin
 
 Changes between 2.2.x and 3.0.0-git:
 
diff --git a/configure.ac b/configure.ac
index 92e127fa60..0dbdbca342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2195,24 +2195,14 @@ then
 fi
 
 dnl
-dnl openmax il vout plugin
-dnl
-AC_ARG_ENABLE(omxil-vout,
-  [  --enable-omxil-vout openmax il video output module (default 
disabled)])
-if test "${enable_omxil_vout}" = "yes"
-then
-  VLC_ADD_PLUGIN([omxil_vout])
-fi
-
-dnl
 dnl raspberry pi openmax il configuration
 dnl
 AC_ARG_ENABLE(rpi-omxil,
   [  --enable-rpi-omxil openmax il configured for raspberry pi (default 
disabled)])
 if test "${enable_rpi_omxil}" = "yes"
 then
-  VLC_ADD_PLUGIN([omxil omxil_vout])
-  VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX])
+  VLC_ADD_PLUGIN([omxil])
+  VLC_ADD_CFLAGS([omxil],[-DRPI_OMX])
 fi
 
 dnl
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 6acae780e8..169218d330 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -276,7 +276,6 @@ $Id$
  * oldmovie: oldmovie style video filter
  * oldrc: old interface module using stdio
  * omxil: OpenMAX IL audio/video decoder
- * omxil_vout: OpenMAX IL video output
  * opencv_example: OpenCV example (face identification)
  * opencv_wrapper: OpenCV wrapper video filter
  * opensles_android: OpenSL ES audio output for Android
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index a52d37d68e..1ac244bcb4 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -482,11 +482,6 @@ libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
-I$(srcdir)/codec/omxil $(CFLAGS_om
 libomxil_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
 libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 
-libomxil_vout_plugin_la_SOURCES = codec/omxil/vout.c codec/omxil/omxil_core.c 
codec/omxil/utils.c codec/omxil/qcom.c
-libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil 
$(CFLAGS_omxil_vout)
-libomxil_vout_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
-libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-
 libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil
 libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c 
codec/omxil/mediacodec.h \
codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c 
codec/omxil/utils.c \
@@ -497,8 +492,8 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c 
codec/omxil/mediacode
packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/hevc_nal.c packetizer/hevc_nal.h
 libmediacodec_plugin_la_LIBADD = libchroma_copy.la
-codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
-EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
+codec_LTLIBRARIES += $(LTLIBomxil)
+EXTRA_LTLIBRARIES += libomxil_plugin.la
 if HAVE_ANDROID
 codec_LTLIBRARIES += libmediacodec_plugin.la
 endif
diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
deleted file mode 100644
index a735466d5e..00
--- a/modules/codec/omxil/vout.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * vout.c: OpenMAX IL video output
- *
- * Copyright © 2013 VideoLAN
- *
- * Authors: Martin Storsjo 
- *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include

[vlc-commits] input: decoder: notify discontinuity on fifo drop

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Wed Jan 
31 11:27:36 2018 +0100| [06fd6c9d1381bd73404c940ee3c6de55ddc343dc] | committer: 
Jean-Baptiste Kempf

input: decoder: notify discontinuity on fifo drop

(cherry picked from commit bbac7da531a09d334e5c93fc53c446f48d497f33)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=06fd6c9d1381bd73404c940ee3c6de55ddc343dc
---

 src/input/decoder.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 58bbe8e851..c5ec930b2a 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2034,6 +2034,7 @@ void input_DecoderDecode( decoder_t *p_dec, block_t 
*p_block, bool b_do_pace )
 msg_Warn( p_dec, "decoder/packetizer fifo full (data not "
   "consumed quickly enough), resetting fifo!" );
 block_ChainRelease( vlc_fifo_DequeueAllUnlocked( p_owner->p_fifo ) 
);
+p_block->i_flags |= BLOCK_FLAG_DISCONTINUITY;
 }
 }
 else

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout/macosx: Do not check call to disableScreenUpdatesUntilFlush

2018-02-02 Thread Marvin Scholz

vlc/vlc-3.0 | branch: master | Marvin Scholz  | Tue Jan 30 
15:46:59 2018 +0100| [96689d6992803d0807b5d345b18f1079626810d7] | committer: 
Jean-Baptiste Kempf

vout/macosx: Do not check call to disableScreenUpdatesUntilFlush

NSWindows disableScreenUpdatesUntilFlush is available since macOS 10.4,
so there is no need to check if NSWindow responds to it.

Additionally clarify the comment about why it is there by replacing it
with a comment taken from Apple sample code that explains it very well.

(cherry picked from commit 64ec400081755265ebb8e233192b9a01d61f54a7)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=96689d6992803d0807b5d345b18f1079626810d7
---

 modules/video_output/macosx.m | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 98e505cd00..050cc073a1 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -714,11 +714,18 @@ static void OpenglSwap (vlc_gl_t *gl)
 
 - (void)renewGState
 {
-NSWindow *window = [self window];
-
-// Remove flashes with splitter view.
-if ([window respondsToSelector:@selector(disableScreenUpdatesUntilFlush)])
-[window disableScreenUpdatesUntilFlush];
+// Comment take from Apple GLEssentials sample code:
+// https://developer.apple.com/library/content/samplecode/GLEssentials
+//
+// OpenGL rendering is not synchronous with other rendering on the OSX.
+// Therefore, call disableScreenUpdatesUntilFlush so the window server
+// doesn't render non-OpenGL content in the window asynchronously from
+// OpenGL content, which could cause flickering.  (non-OpenGL content
+// includes the title bar and drawing done by the app with other APIs)
+
+// In macOS 10.13 and later, window updates are automatically batched
+// together and this no longer needs to be called (effectively a no-op)
+[[self window] disableScreenUpdatesUntilFlush];
 
 [super renewGState];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: pass full url to proxy

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Wed Jan 
31 23:09:26 2018 +0100| [a091c81949e91bae0ca9cdc2c6ece551312f5a38] | committer: 
Jean-Baptiste Kempf

demux: adaptive: pass full url to proxy

as reported by Ramon Gabarró

(cherry picked from commit e5a3e37f9a420ee0dd74398f7c6a94d353a44079)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a091c81949e91bae0ca9cdc2c6ece551312f5a38
---

 modules/demux/adaptive/http/HTTPConnection.cpp | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp 
b/modules/demux/adaptive/http/HTTPConnection.cpp
index bdc109350f..971f0c84a7 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -139,8 +139,13 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 msg_Dbg(p_object, "Retrieving %s @%zu", params.getUrl().c_str(),
range.isValid() ? range.getStartByte() : 0);
 
+std::string querypath;
 if(!proxyparams.getHostname().empty())
+{
 msg_Dbg(p_object, "Using proxy %s", proxyparams.getUrl().c_str());
+querypath = params.getUrl();
+}
+else querypath = path;
 
 if(!connected() && ( params.getHostname().empty() || !connect() ))
 return VLC_EGENERIC;
@@ -149,7 +154,7 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 if(range.isValid() && range.getEndByte() > 0)
 contentLength = range.getEndByte() - range.getStartByte() + 1;
 
-std::string header = buildRequestHeader(path);
+std::string header = buildRequestHeader(querypath);
 if(connectionClose)
 header.append("Connection: close\r\n");
 header.append("\r\n");

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout/macosx: Remove useless access of NSWindow

2018-02-02 Thread Marvin Scholz

vlc/vlc-3.0 | branch: master | Marvin Scholz  | Tue Jan 30 
14:40:37 2018 +0100| [4bc79a4e0ba2b222088e9c3151caa8233a873cc7] | committer: 
Jean-Baptiste Kempf

vout/macosx: Remove useless access of NSWindow

The window is only ever used to query its minSize, which is then not
used anywhere in the following code, so this code can be removed.

(cherry picked from commit 89c1c9575b06bae5085234363c0d49770f020f7c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4bc79a4e0ba2b222088e9c3151caa8233a873cc7
---

 modules/video_output/macosx.m | 8 
 1 file changed, 8 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 4a73950ff6..98e505cd00 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -366,14 +366,6 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
 case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
 {
-
-id o_window = [sys->glView window];
-if (!o_window) {
-return VLC_SUCCESS; // this is okay, since the event will 
occur again when we have a window
-}
-
-NSSize windowMinSize = [o_window minSize];
-
 const vout_display_cfg_t *cfg;
 
 if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == 
VOUT_DISPLAY_CHANGE_SOURCE_CROP) {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bin: fix installation when compiling for macOS with the VLC executable disabled

2018-02-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jan 24 
21:36:52 2018 +0100| [d08296ea77d0599b637459aa933a01c9cb39b846] | committer: 
Jean-Baptiste Kempf

bin: fix installation when compiling for macOS with the VLC executable disabled

(cherry picked from commit 9e12a2ca6eec8f47befcc2048708bf3e57142cf0)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d08296ea77d0599b637459aa933a01c9cb39b846
---

 bin/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9ccb755cd3..2877e8b0ea 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -130,10 +130,12 @@ endif
 MOSTLYCLEANFILES = $(noinst_DATA)
 
 if HAVE_OSX
+if BUILD_VLC
 install-data-local:
cd $(bindir); mv vlc-osx vlc
 
 endif
+endif
 
 .PHONY: ../modules/plugins.dat
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] caca: actually use the event thread

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
16:53:06 2018 +0200| [2c65ed66c752a1a06411c11f26b9ef6ef343f5b9] | committer: 
Rémi Denis-Courmont

caca: actually use the event thread

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c65ed66c752a1a06411c11f26b9ef6ef343f5b9
---

 modules/video_output/caca.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 33a0409820..3fe1da41a7 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -485,12 +485,12 @@ static void Manage(vout_display_t *vd)
 const int vlc = keys[i].vlc;
 
 if (vlc >= 0)
-vout_display_SendEventKey(vd, vlc);
+VoutDisplayEventKey(vd, vlc);
 return;
 }
 }
 if (caca >= 0x20 && caca <= 0x7f) {
-vout_display_SendEventKey(vd, caca);
+VoutDisplayEventKey(vd, caca);
 return;
 }
 break;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] youtube.lua: support gaming.youtube.com

2018-02-02 Thread Ludovic Fauvet

vlc/vlc-3.0 | branch: master | Ludovic Fauvet  | Fri Feb  2 
15:22:24 2018 +0100| [4212130f8bc874330faef684702f07116e1f6a16] | committer: 
Jean-Baptiste Kempf

youtube.lua: support gaming.youtube.com

The page content of gaming.y.o is different, yet the main website plays
video from gaming.y.o the same way, therefore a simple redirect do the
trick.

(cherry picked from commit b9bb5396c84f81f8c5b46dbc03a92cebe8d9d60d)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4212130f8bc874330faef684702f07116e1f6a16
---

 share/lua/playlist/youtube.lua | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index fc9a68c483..a7eeeb375d 100644
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -227,8 +227,10 @@ end
 -- Probe function.
 function probe()
 return ( ( vlc.access == "http" or vlc.access == "https" )
- and string.match( vlc.path, "^www%.youtube%.com/" )
  and (
+   string.match( vlc.path, "^www%.youtube%.com/" )
+or string.match( vlc.path, "^gaming%.youtube%.com/" )
+ ) and (
string.match( vlc.path, "/watch%?" ) -- the html page
 or string.match( vlc.path, "/live$" ) -- user live stream html page
 or string.match( vlc.path, "/live%?" ) -- user live stream html 
page
@@ -240,6 +242,10 @@ end
 
 -- Parse function.
 function parse()
+if string.match( vlc.path, "^gaming%.youtube%.com/" ) then
+url = string.gsub( vlc.path, "^gaming%.youtube%.com", 
"www.youtube.com" )
+return { { path = vlc.access.."://"..url } }
+end
 if string.match( vlc.path, "/watch%?" )
 or string.match( vlc.path, "/live$" )
 or string.match( vlc.path, "/live%?" )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/gpg-error: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jan 24 
21:37:40 2018 +0100| [0d70f4114b60c50c35428320393892318a8efad7] | committer: 
Jean-Baptiste Kempf

contrib/gpg-error: fix compilation for macOS when cross-compiling

(cherry picked from commit a48b98b1b40a153b29d7a2f8ca3f7349a9e10188)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0d70f4114b60c50c35428320393892318a8efad7
---

 contrib/src/gpg-error/rules.mak | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 025fdc0455..7ec95c1f47 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -32,11 +32,15 @@ ifeq ($(TIZEN_ABI), x86)
cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h 
$@/src/syscfg/lock-obj-pub.linux-gnueabi.h
 endif
 endif
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 else
+ifeq ($(ARCH),aarch64)
cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+else
+   cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 endif
 endif
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations

2018-02-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jan 24 
21:38:53 2018 +0100| [625bc3ced2120b50efa35fa8c2e4fac8270f85f2] | committer: 
Jean-Baptiste Kempf

contrib: move macOS compilation flags to the script where they belong and 
generalize Darwin OS environment manipulations

(cherry picked from commit 6c6bc89cf0d8377532fa04394d23bc0cea4d9eab)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=625bc3ced2120b50efa35fa8c2e4fac8270f85f2
---

 contrib/src/main.mak   | 13 +
 extras/package/macosx/build.sh | 14 ++
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0398a5ad1a..e6da70cc27 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -113,10 +113,7 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-MIN_OSX_VERSION=10.7
-EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 EXTRA_CXXFLAGS += -stdlib=libc++
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 ifeq ($(ARCH),x86_64)
 EXTRA_CFLAGS += -m64
 EXTRA_LDFLAGS += -m64
@@ -132,18 +129,10 @@ endif
 CCAS=$(CC) -c
 
 ifdef HAVE_IOS
-CC=xcrun clang
-CXX=xcrun clang++
 ifdef HAVE_NEON
 AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
-else
-CCAS=$(CC) -c
 endif
-AR=xcrun ar
-LD=xcrun ld
-STRIP=xcrun strip
-RANLIB=xcrun ranlib
 EXTRA_CFLAGS += $(CFLAGS)
 endif
 
@@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
 
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 AUTORECONF = AUTOPOINT=true autoreconf
 else
 AUTORECONF = autoreconf
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 72c2320d73..146dd7aeb7 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 
 info()
 {
@@ -193,9 +192,16 @@ spopd
 #   enabled. (e.g. ffmpeg)
 # - This will fail the build if a partially available symbol is added later on
 #   in contribs and not mentioned in the list of symbols above.
-export CFLAGS="-Werror=partial-availability"
-export CXXFLAGS="-Werror=partial-availability"
-export OBJCFLAGS="-Werror=partial-availability"
+CFLAGS="-Werror=partial-availability "
+CXXFLAGS="-Werror=partial-availability "
+OBJCFLAGS="-Werror=partial-availability "
+
+CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" 
-mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+
+export CFLAGS=${CFLAGS}
+export CXXFLAGS=${CXXFLAGS}
+export LDFLAGS=${LDFLAGS}
 
 info "Building contribs"
 spushd "${vlcroot}/contrib"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/vpx: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc/vlc-3.0 | branch: master | Felix Paul Kühne  | Wed Jan 24 
21:38:07 2018 +0100| [a827770243533838663640f45a96ced0ca51be41] | committer: 
Jean-Baptiste Kempf

contrib/vpx: fix compilation for macOS when cross-compiling

(cherry picked from commit 47c02c9dec5ba4782483bfcf08e40cf8f4ce0ca6)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a827770243533838663640f45a96ced0ca51be41
---

 contrib/src/vpx/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index efec7cb484..ea0ff9c3ea 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -66,6 +66,7 @@ VPX_OS := darwin9
 else
 VPX_OS := darwin10
 endif
+VPX_CROSS :=
 else ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 VPX_OS := darwin

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: improve old icons

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri Feb  
2 12:51:34 2018 +0100| [695dc75756211a210a21ff720ec79da2ebd41d74] | committer: 
Jean-Baptiste Kempf

Qt: improve old icons

change +20% light/+20% saturation on Red Yellow Green on cone
orange areas, to make it closer to ff8800

(cherry picked from commit eaefcb7d6acbc9e7af472e2cdbf39d1893421b8c)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=695dc75756211a210a21ff720ec79da2ebd41d74
---

 modules/gui/qt/pixmaps/noart-64.png | Bin 5398 -> 5473 bytes
 modules/gui/qt/pixmaps/noart.png| Bin 15346 -> 15524 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Audio_64.png| Bin 5333 -> 5398 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png  | Bin 6670 -> 6743 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Input_64.png| Bin 5709 -> 5805 bytes
 .../qt/pixmaps/prefs/spref_cone_Interface_64.png| Bin 4367 -> 4482 bytes
 .../qt/pixmaps/prefs/spref_cone_Subtitles_64.png| Bin 4891 -> 4987 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Video_64.png| Bin 5514 -> 5579 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt/pixmaps/noart-64.png 
b/modules/gui/qt/pixmaps/noart-64.png
index 1bd20df640..9f75a7ba5f 100644
Binary files a/modules/gui/qt/pixmaps/noart-64.png and 
b/modules/gui/qt/pixmaps/noart-64.png differ
diff --git a/modules/gui/qt/pixmaps/noart.png b/modules/gui/qt/pixmaps/noart.png
index b62fcddb36..5c040809f4 100644
Binary files a/modules/gui/qt/pixmaps/noart.png and 
b/modules/gui/qt/pixmaps/noart.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png
index f9dcc9e90a..0c1608aeed 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png
index ae1f87b811..f9e9feb505 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png
index 39ec254d96..fbb2928486 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png
index 06ded0b6a8..db333f0aa6 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png
index 2bf62be42f..9f4d006c51 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png
index 267aa8c55c..a646859faa 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png differ

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: caf: fix double TS_0

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Thu Feb  
1 17:20:33 2018 +0100| [fd000fea8d98fd6acb5c19a1cd5491b55c7af3c8] | committer: 
Jean-Baptiste Kempf

demux: caf: fix double TS_0

(cherry picked from commit 66779d5bd8f89deb8a970dd294cd81da3c77a093)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fd000fea8d98fd6acb5c19a1cd5491b55c7af3c8
---

 modules/demux/caf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/caf.c b/modules/demux/caf.c
index 0157e51d9e..b1a621f594 100644
--- a/modules/demux/caf.c
+++ b/modules/demux/caf.c
@@ -333,9 +333,9 @@ static int FrameSpanAddDescription( demux_t *p_demux, 
uint64_t i_desc_offset, fr
 static inline mtime_t FrameSpanGetTime( frame_span_t *span, uint32_t 
i_sample_rate )
 {
 if( !i_sample_rate )
-return 0;
+return VLC_TS_INVALID;
 
-return ( span->i_samples * CLOCK_FREQ ) / i_sample_rate + 1;
+return ( span->i_samples * CLOCK_FREQ ) / i_sample_rate + VLC_TS_0;
 }
 
 /* SetSpanWithSample returns the span from the beginning of the file up to and
@@ -998,7 +998,7 @@ static int Demux( demux_t *p_demux )
 }
 
 p_block->i_dts =
-p_block->i_pts = VLC_TS_0 + FrameSpanGetTime( _sys->position, 
p_sys->fmt.audio.i_rate );
+p_block->i_pts = FrameSpanGetTime( _sys->position, 
p_sys->fmt.audio.i_rate );
 
 FrameSpanAddSpan( _sys->position,  );
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] packetizer: hevc: check before replacing xps

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Tue Jan 
30 14:14:00 2018 +0100| [be9603be709348c60cdd66d7b6362bc2143d33e9] | committer: 
Jean-Baptiste Kempf

packetizer: hevc: check before replacing xps

(cherry picked from commit b6ebaba1a1f0c80392170124e94f63eccb7ddfd8)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=be9603be709348c60cdd66d7b6362bc2143d33e9
---

 modules/packetizer/hevc.c | 13 +
 1 file changed, 13 insertions(+)

diff --git a/modules/packetizer/hevc.c b/modules/packetizer/hevc.c
index d5c6b11f14..ec8873af7c 100644
--- a/modules/packetizer/hevc.c
+++ b/modules/packetizer/hevc.c
@@ -375,6 +375,19 @@ static bool InsertXPS(decoder_t *p_dec, uint8_t 
i_nal_type, uint8_t i_id,
 return false;
 }
 
+/* Check if we really need to re-decode/replace */
+if(*pp_nal)
+{
+const uint8_t *p_stored = (*pp_nal)->p_buffer;
+size_t i_stored = (*pp_nal)->i_buffer;
+hxxx_strip_AnnexB_startcode(_stored, _stored);
+const uint8_t *p_new = p_nalb->p_buffer;
+size_t i_new = p_nalb->i_buffer;
+hxxx_strip_AnnexB_startcode(_new, _new);
+if(i_stored == i_new && !memcmp(p_stored, p_new, i_new))
+return true;
+}
+
 /* Free associated decoded version */
 if(*pp_decoded)
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dbus: remove old --inhibit option

2018-02-02 Thread Rémi Denis-Courmont

vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont  | Fri Feb  
2 11:30:01 2018 +0200| [0cc645de9107c04f45b3ca9faae1bad501a884c6] | committer: 
Jean-Baptiste Kempf

dbus: remove old --inhibit option

This is not longer used for anything.

(cherry picked from commit 8131670072809412e8a155f9b173207cf9601eb2)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0cc645de9107c04f45b3ca9faae1bad501a884c6
---

 src/libvlc-module.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index cc816873f7..9d29d24b4e 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -371,10 +371,6 @@ static const char *const ppsz_pos_descriptions[] =
 #define SS_TEXT N_("Disable screensaver")
 #define SS_LONGTEXT N_("Disable the screensaver during video playback." )
 
-#define INHIBIT_TEXT N_("Inhibit the power management daemon during playback")
-#define INHIBIT_LONGTEXT N_("Inhibits the power management daemon during any " 
\
-"playback, to avoid the computer being suspended because of inactivity.")
-
 #define VIDEO_DECO_TEXT N_("Window decorations")
 #define VIDEO_DECO_LONGTEXT N_( \
 "VLC can avoid creating window caption, frames, etc... around the video" \
@@ -2032,8 +2028,7 @@ vlc_module_begin ()
 #endif
 
 #if defined(HAVE_DBUS)
-add_bool( "inhibit", 1, INHIBIT_TEXT,
-  INHIBIT_LONGTEXT, true )
+add_obsolete_bool( "inhibit" ) /* since 3.0.0 */
 #endif
 
 #if defined(_WIN32) || defined(__OS2__)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] chromecast: Remove trailing whitespaces

2018-02-02 Thread Hugo Beauzée-Luyssen

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen  | Thu Feb 
 1 10:52:35 2018 +0100| [a47d6c83a729e5724e8b862bb2caf36b422940c0] | committer: 
Jean-Baptiste Kempf

chromecast: Remove trailing whitespaces

(cherry picked from commit 8a0dca3accd1ca0b1e0f9d18b135b2bd7985ce99)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a47d6c83a729e5724e8b862bb2caf36b422940c0
---

 modules/stream_out/chromecast/chromecast_communication.cpp | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/stream_out/chromecast/chromecast_communication.cpp 
b/modules/stream_out/chromecast/chromecast_communication.cpp
index e8a91ce28d..e20bb19817 100644
--- a/modules/stream_out/chromecast/chromecast_communication.cpp
+++ b/modules/stream_out/chromecast/chromecast_communication.cpp
@@ -278,15 +278,15 @@ std::string ChromecastCommunication::GetMedia( unsigned 
int i_port,
 if( b_music )
 {
 if( psz_artist )
-ss << ",\"artist\":\"" << psz_artist << "\""; 
+ss << ",\"artist\":\"" << psz_artist << "\"";
 if( psz_album )
-ss << ",\"album\":\"" << psz_album << "\""; 
+ss << ",\"album\":\"" << psz_album << "\"";
 if( psz_albumartist )
-ss << ",\"albumArtist\":\"" << psz_albumartist << "\""; 
+ss << ",\"albumArtist\":\"" << psz_albumartist << "\"";
 if( psz_tracknumber )
-ss << ",\"trackNumber\":\"" << psz_tracknumber << "\""; 
+ss << ",\"trackNumber\":\"" << psz_tracknumber << "\"";
 if( psz_discnumber )
-ss << ",\"discNumber\":\"" << psz_discnumber << "\""; 
+ss << ",\"discNumber\":\"" << psz_discnumber << "\"";
 }
 
 if ( psz_artwork && !strncmp( psz_artwork, "http", 4 ) )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux:mkv: add support for V_PRORES

2018-02-02 Thread Steve Lhomme

vlc/vlc-3.0 | branch: master | Steve Lhomme  | Tue Jan 30 
09:02:14 2018 +0100| [ce068422edb2955cd452cd7b82e12647f42c9262] | committer: 
Jean-Baptiste Kempf

demux:mkv: add support for V_PRORES

The decoder wants the atom header that has been stripped so we add it on every
frame we read.

Fixes #19568

(cherry picked from commit 488e6712143de4ea71acf828c82df9c9f88f)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ce068422edb2955cd452cd7b82e12647f42c9262
---

 modules/demux/mkv/matroska_segment_parse.cpp | 4 
 modules/demux/mkv/mkv.cpp| 7 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp 
b/modules/demux/mkv/matroska_segment_parse.cpp
index cfd39dea03..46ba14cd68 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1632,6 +1632,10 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
 vars.p_fmt->i_codec = VLC_CODEC_FFV1;
 fill_extra_data( vars.p_tk, 0 );
 }
+S_CASE("V_PRORES") {
+vars.p_fmt->i_codec = VLC_CODEC_PRORES;
+fill_extra_data( vars.p_tk, 0 );
+}
 S_CASE("A_MS/ACM") {
 mkv_track_t * p_tk = vars.p_tk;
 es_format_t * p_fmt = _tk->fmt;
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index e6dd08a795..bbeba71471 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -545,15 +545,16 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, 
KaxSimpleBlock *simpleblock
 msg_Warn( p_demux, "Cannot read frame (too long or no frame)" );
 break;
 }
+size_t extra_data = track.fmt.i_codec == VLC_CODEC_PRORES ? 8 : 0;
 
 if( track.i_compression_type == MATROSKA_COMPRESSION_HEADER &&
 track.p_compression_data != NULL &&
 track.i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
-p_block = MemToBlock( data->Buffer(), data->Size(), 
track.p_compression_data->GetSize() );
+p_block = MemToBlock( data->Buffer(), data->Size(), 
track.p_compression_data->GetSize() + extra_data );
 else if( unlikely( track.fmt.i_codec == VLC_CODEC_WAVPACK ) )
 p_block = packetize_wavpack( track, data->Buffer(), data->Size() );
 else
-p_block = MemToBlock( data->Buffer(), data->Size(), 0 );
+p_block = MemToBlock( data->Buffer(), data->Size(), extra_data );
 
 if( p_block == NULL )
 {
@@ -575,6 +576,8 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, 
KaxSimpleBlock *simpleblock
 {
 memcpy( p_block->p_buffer, track.p_compression_data->GetBuffer(), 
track.p_compression_data->GetSize() );
 }
+if ( track.fmt.i_codec == VLC_CODEC_PRORES )
+memcpy( p_block->p_buffer + 4, "icpf", 4 );
 
 if ( b_key_picture )
 p_block->i_flags |= BLOCK_FLAG_TYPE_I;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] packetizer: hevc: fix use after free regression

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Tue Jan 
30 14:06:16 2018 +0100| [da339b030032d17b6bda810d9a4dcf98a99b446e] | committer: 
Jean-Baptiste Kempf

packetizer: hevc: fix use after free regression

(cherry picked from commit 4e15e79f66418a0b8a433d8a1f23501176759e83)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=da339b030032d17b6bda810d9a4dcf98a99b446e
---

 modules/packetizer/hevc.c | 12 
 1 file changed, 12 insertions(+)

diff --git a/modules/packetizer/hevc.c b/modules/packetizer/hevc.c
index 7f8c930317..d5c6b11f14 100644
--- a/modules/packetizer/hevc.c
+++ b/modules/packetizer/hevc.c
@@ -345,6 +345,7 @@ static bool InsertXPS(decoder_t *p_dec, uint8_t i_nal_type, 
uint8_t i_id,
 {
 decoder_sys_t *p_sys = p_dec->p_sys;
 void **pp_decoded;
+void **pp_active;
 block_t **pp_nal;
 
 switch(i_nal_type)
@@ -354,18 +355,21 @@ static bool InsertXPS(decoder_t *p_dec, uint8_t 
i_nal_type, uint8_t i_id,
 return false;
 pp_decoded = _sys->rg_vps[i_id].p_decoded;
 pp_nal = _sys->rg_vps[i_id].p_nal;
+pp_active = (void**)_sys->p_active_vps;
 break;
 case HEVC_NAL_SPS:
 if(i_id > HEVC_SPS_ID_MAX)
 return false;
 pp_decoded = _sys->rg_sps[i_id].p_decoded;
 pp_nal = _sys->rg_sps[i_id].p_nal;
+pp_active = (void**)_sys->p_active_sps;
 break;
 case HEVC_NAL_PPS:
 if(i_id > HEVC_PPS_ID_MAX)
 return false;
 pp_decoded = _sys->rg_pps[i_id].p_decoded;
 pp_nal = _sys->rg_pps[i_id].p_nal;
+pp_active = (void**)_sys->p_active_pps;
 break;
 default:
 return false;
@@ -386,8 +390,13 @@ static bool InsertXPS(decoder_t *p_dec, uint8_t 
i_nal_type, uint8_t i_id,
 hevc_rbsp_release_pps(*pp_decoded);
 break;
 }
+if(*pp_active == *pp_decoded)
+*pp_active = NULL;
+else
+pp_active = NULL; /* don't change pointer */
 *pp_decoded = NULL;
 }
+else pp_active = NULL;
 
 /* Free raw stored version */
 if(*pp_nal)
@@ -429,6 +438,9 @@ static bool InsertXPS(decoder_t *p_dec, uint8_t i_nal_type, 
uint8_t i_id,
 break;
 }
 
+if(*pp_decoded && pp_active) /* restore active by id */
+*pp_active = *pp_decoded;
+
 *pp_nal = block_Duplicate((block_t *)p_nalb);
 
 return true;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] input: es_out: compute position from buffering only on update

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Fri Jan 
26 17:52:39 2018 +0100| [463554234ab8e6f2ad38d7e75b6b055a86527222] | committer: 
Jean-Baptiste Kempf

input: es_out: compute position from buffering only on update

Position value from es_out depends on buffering but they are
not updated at the same rate (when not byte based). This causes
growing buffering being substracted from a stalled position (based on
pcr, or other interval) and the computed position to regress as the
position isn't updated yet by demuxer.

(cherry picked from commit 5e3a04980044b94bfd5aa38390846544a43a4c21)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=463554234ab8e6f2ad38d7e75b6b055a86527222
---

 src/input/es_out.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index ac91fa8005..4b7db14ac4 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -175,6 +175,9 @@ struct es_out_sys_t
 
 /* Used only to limit debugging output */
 int i_prev_stream_level;
+
+/* For positions updates */
+double  f_prev_position;
 };
 
 static es_out_id_t *EsOutAdd( es_out_t *, const es_format_t * );
@@ -332,6 +335,7 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, int 
i_rate )
 p_sys->b_buffering = true;
 p_sys->i_preroll_end = -1;
 p_sys->i_prev_stream_level = -1;
+p_sys->f_prev_position = -1;
 
 return out;
 }
@@ -2765,10 +2769,10 @@ static int EsOutControlLocked( es_out_t *out, int 
i_query, va_list args )
 
 input_SendEventLength( p_sys->p_input, i_length );
 
-if( !p_sys->b_buffering )
+if( !p_sys->b_buffering && f_position != p_sys->f_prev_position )
 {
 mtime_t i_delay;
-
+p_sys->f_prev_position = f_position;
 /* Fix for buffering delay */
 if( !input_priv(p_sys->p_input)->p_sout ||
 !input_priv(p_sys->p_input)->b_out_pace_control )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Qt: sout: fix useless option

2018-02-02 Thread Francois Cartegnie

vlc/vlc-3.0 | branch: master | Francois Cartegnie  | Tue Jan 
30 16:24:15 2018 +0100| [6ccd7b85454ddb8b294948bee5dc41c99fd47d88] | committer: 
Jean-Baptiste Kempf

Qt: sout: fix useless option

never reflected changes by f2f0361f350efcb6f6921a0b497114e6890bdd7a

(cherry picked from commit 263e1767479efc49f767bbf8aef9604ce48bb86b)
Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6ccd7b85454ddb8b294948bee5dc41c99fd47d88
---

 modules/gui/qt/dialogs/sout.cpp | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/dialogs/sout.cpp b/modules/gui/qt/dialogs/sout.cpp
index 8958f3270a..1a6213bf35 100644
--- a/modules/gui/qt/dialogs/sout.cpp
+++ b/modules/gui/qt/dialogs/sout.cpp
@@ -217,7 +217,10 @@ void SoutDialog::updateMRL()
 
 mrl = smrl.getMrl();
 
-if( ui.soutAll->isChecked() ) mrl.append( " :sout-all" );
+if( ui.soutAll->isChecked() )
+mrl.append( " :sout-all" );
+else
+mrl.append( " :no-sout-all" );
 
 mrl.append( " :sout-keep" );
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] codec: remove iomx support (android)

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 15:28:51 
2018 +0100| [73bd473e66f44de647ecfc4cc125698304fa1a7f] | committer: Thomas 
Guillem

codec: remove iomx support (android)

The API is private and we are not allowed to use it on recent devices (and
MediaCodec support is far more advanced).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=73bd473e66f44de647ecfc4cc125698304fa1a7f
---

 NEWS |   1 +
 modules/MODULES_LIST |   1 -
 modules/codec/Makefile.am|  10 +-
 modules/codec/omxil/iomx.cpp | 456 ---
 modules/codec/omxil/omxil.c  | 787 +--
 modules/codec/omxil/omxil.h  |  28 --
 modules/codec/omxil/omxil_core.c |  23 +-
 modules/codec/omxil/omxil_core.h |   5 -
 8 files changed, 11 insertions(+), 1300 deletions(-)

diff --git a/NEWS b/NEWS
index 90eb307dae..f7afadbd31 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Platform support changes:
 Codecs:
  * Support for experimental AV1 video encoding
  * WebVTT encoder
+ * Remove iomx support for Android
 
 Video ouput:
  * Remove aa plugin
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 747ea67d59..6acae780e8 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -204,7 +204,6 @@ $Id$
  * inflate: zlib decompression stream_filter module
  * integer_mixer: Integer audio mixer
  * invert: inverse video filter
- * iomx: IPC/OpenMaxIL for Android
  * jack: jack server audio output
  * jpeg: JPEG image decoder
  * kai: OS/2 audio output
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index d4df5a7a90..a52d37d68e 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -478,10 +478,6 @@ libomxil_plugin_la_SOURCES = \
packetizer/hevc_nal.c packetizer/hevc_nal.h \
codec/omxil/qcom.c codec/omxil/qcom.h \
codec/omxil/omxil.c codec/omxil/omxil.h codec/omxil/omxil_core.c 
codec/omxil/omxil_core.h
-if HAVE_ANDROID
-libomxil_plugin_la_SOURCES += video_output/android/utils.c 
video_output/android/utils.h \
-   video_output/android/display.h
-endif
 libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil 
$(CFLAGS_omxil)
 libomxil_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
 libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
@@ -491,10 +487,6 @@ libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
-I$(srcdir)/codec/omxil $(CFLA
 libomxil_vout_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
 libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 
-libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES)
-libiomx_plugin_la_CPPFLAGS = $(libomxil_plugin_la_CPPFLAGS) -DUSE_IOMX
-libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
-
 libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil
 libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c 
codec/omxil/mediacodec.h \
codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c 
codec/omxil/utils.c \
@@ -508,7 +500,7 @@ libmediacodec_plugin_la_LIBADD = libchroma_copy.la
 codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
 EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
 if HAVE_ANDROID
-codec_LTLIBRARIES += libiomx_plugin.la libmediacodec_plugin.la
+codec_LTLIBRARIES += libmediacodec_plugin.la
 endif
 
 
diff --git a/modules/codec/omxil/iomx.cpp b/modules/codec/omxil/iomx.cpp
deleted file mode 100644
index 894b09a200..00
--- a/modules/codec/omxil/iomx.cpp
+++ /dev/null
@@ -1,456 +0,0 @@
-/*
- * iomx.cpp: OpenMAX interface implementation based on IOMX
- *
- * Copyright (C) 2011 VLC authors and VideoLAN
- *
- * Authors: Martin Storsjo 
- *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-/*
- * Preamble
- */
-
-#include 
-#include 
-#include 
-#include 
-
-#define PREFIX(x) I ## x
-
-#if ANDROID_API >= 11

[vlc-commits] vout: remove omxil output

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 15:36:38 
2018 +0100| [bb10b4603cb7b9c38a3618dad63ee6f1d091afcb] | committer: Thomas 
Guillem

vout: remove omxil output

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bb10b4603cb7b9c38a3618dad63ee6f1d091afcb
---

 NEWS   |   1 +
 configure.ac   |  14 +-
 modules/MODULES_LIST   |   1 -
 modules/codec/Makefile.am  |   9 +-
 modules/codec/omxil/vout.c | 461 -
 5 files changed, 5 insertions(+), 481 deletions(-)

diff --git a/NEWS b/NEWS
index f7afadbd31..c8a9d462db 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Codecs:
 Video ouput:
  * Remove aa plugin
  * Remove evas plugin
+ * Remove omxil_vout plugin
 
 Changes between 2.2.x and 3.0.0-git:
 
diff --git a/configure.ac b/configure.ac
index 92e127fa60..0dbdbca342 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2195,24 +2195,14 @@ then
 fi
 
 dnl
-dnl openmax il vout plugin
-dnl
-AC_ARG_ENABLE(omxil-vout,
-  [  --enable-omxil-vout openmax il video output module (default 
disabled)])
-if test "${enable_omxil_vout}" = "yes"
-then
-  VLC_ADD_PLUGIN([omxil_vout])
-fi
-
-dnl
 dnl raspberry pi openmax il configuration
 dnl
 AC_ARG_ENABLE(rpi-omxil,
   [  --enable-rpi-omxil openmax il configured for raspberry pi (default 
disabled)])
 if test "${enable_rpi_omxil}" = "yes"
 then
-  VLC_ADD_PLUGIN([omxil omxil_vout])
-  VLC_ADD_CFLAGS([omxil omxil_vout],[-DRPI_OMX])
+  VLC_ADD_PLUGIN([omxil])
+  VLC_ADD_CFLAGS([omxil],[-DRPI_OMX])
 fi
 
 dnl
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 6acae780e8..169218d330 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -276,7 +276,6 @@ $Id$
  * oldmovie: oldmovie style video filter
  * oldrc: old interface module using stdio
  * omxil: OpenMAX IL audio/video decoder
- * omxil_vout: OpenMAX IL video output
  * opencv_example: OpenCV example (face identification)
  * opencv_wrapper: OpenCV wrapper video filter
  * opensles_android: OpenSL ES audio output for Android
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index a52d37d68e..1ac244bcb4 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -482,11 +482,6 @@ libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) 
-I$(srcdir)/codec/omxil $(CFLAGS_om
 libomxil_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
 libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
 
-libomxil_vout_plugin_la_SOURCES = codec/omxil/vout.c codec/omxil/omxil_core.c 
codec/omxil/utils.c codec/omxil/qcom.c
-libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil 
$(CFLAGS_omxil_vout)
-libomxil_vout_plugin_la_LIBADD = libchroma_copy.la $(LIBDL)
-libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
-
 libmediacodec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/codec/omxil
 libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c 
codec/omxil/mediacodec.h \
codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c 
codec/omxil/utils.c \
@@ -497,8 +492,8 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c 
codec/omxil/mediacode
packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/hevc_nal.c packetizer/hevc_nal.h
 libmediacodec_plugin_la_LIBADD = libchroma_copy.la
-codec_LTLIBRARIES += $(LTLIBomxil) $(LTLIBomxil_vout)
-EXTRA_LTLIBRARIES += libomxil_plugin.la libomxil_vout_plugin.la
+codec_LTLIBRARIES += $(LTLIBomxil)
+EXTRA_LTLIBRARIES += libomxil_plugin.la
 if HAVE_ANDROID
 codec_LTLIBRARIES += libmediacodec_plugin.la
 endif
diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
deleted file mode 100644
index a735466d5e..00
--- a/modules/codec/omxil/vout.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
- * vout.c: OpenMAX IL video output
- *
- * Copyright © 2013 VideoLAN
- *
- * Authors: Martin Storsjo 
- *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include

[vlc-commits] Qt: improve old icons

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Fri Feb  2 
12:51:34 2018 +0100| [eaefcb7d6acbc9e7af472e2cdbf39d1893421b8c] | committer: 
Francois Cartegnie

Qt: improve old icons

change +20% light/+20% saturation on Red Yellow Green on cone
orange areas, to make it closer to ff8800

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eaefcb7d6acbc9e7af472e2cdbf39d1893421b8c
---

 modules/gui/qt/pixmaps/noart-64.png | Bin 5398 -> 5473 bytes
 modules/gui/qt/pixmaps/noart.png| Bin 15346 -> 15524 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Audio_64.png| Bin 5333 -> 5398 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png  | Bin 6670 -> 6743 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Input_64.png| Bin 5709 -> 5805 bytes
 .../qt/pixmaps/prefs/spref_cone_Interface_64.png| Bin 4367 -> 4482 bytes
 .../qt/pixmaps/prefs/spref_cone_Subtitles_64.png| Bin 4891 -> 4987 bytes
 .../gui/qt/pixmaps/prefs/spref_cone_Video_64.png| Bin 5514 -> 5579 bytes
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt/pixmaps/noart-64.png 
b/modules/gui/qt/pixmaps/noart-64.png
index 1bd20df640..9f75a7ba5f 100644
Binary files a/modules/gui/qt/pixmaps/noart-64.png and 
b/modules/gui/qt/pixmaps/noart-64.png differ
diff --git a/modules/gui/qt/pixmaps/noart.png b/modules/gui/qt/pixmaps/noart.png
index b62fcddb36..5c040809f4 100644
Binary files a/modules/gui/qt/pixmaps/noart.png and 
b/modules/gui/qt/pixmaps/noart.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png
index f9dcc9e90a..0c1608aeed 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Audio_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png
index ae1f87b811..f9e9feb505 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Hotkeys_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png
index 39ec254d96..fbb2928486 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Input_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png
index 06ded0b6a8..db333f0aa6 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Interface_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png
index 2bf62be42f..9f4d006c51 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Subtitles_64.png differ
diff --git a/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png
index 267aa8c55c..a646859faa 100644
Binary files a/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png and 
b/modules/gui/qt/pixmaps/prefs/spref_cone_Video_64.png differ

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] youtube.lua: support gaming.youtube.com

2018-02-02 Thread Ludovic Fauvet

vlc | branch: master | Ludovic Fauvet  | Fri Feb  2 15:22:24 
2018 +0100| [b9bb5396c84f81f8c5b46dbc03a92cebe8d9d60d] | committer: Ludovic 
Fauvet

youtube.lua: support gaming.youtube.com

The page content of gaming.y.o is different, yet the main website plays
video from gaming.y.o the same way, therefore a simple redirect do the
trick.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b9bb5396c84f81f8c5b46dbc03a92cebe8d9d60d
---

 share/lua/playlist/youtube.lua | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/share/lua/playlist/youtube.lua b/share/lua/playlist/youtube.lua
index fc9a68c483..a7eeeb375d 100644
--- a/share/lua/playlist/youtube.lua
+++ b/share/lua/playlist/youtube.lua
@@ -227,8 +227,10 @@ end
 -- Probe function.
 function probe()
 return ( ( vlc.access == "http" or vlc.access == "https" )
- and string.match( vlc.path, "^www%.youtube%.com/" )
  and (
+   string.match( vlc.path, "^www%.youtube%.com/" )
+or string.match( vlc.path, "^gaming%.youtube%.com/" )
+ ) and (
string.match( vlc.path, "/watch%?" ) -- the html page
 or string.match( vlc.path, "/live$" ) -- user live stream html page
 or string.match( vlc.path, "/live%?" ) -- user live stream html 
page
@@ -240,6 +242,10 @@ end
 
 -- Parse function.
 function parse()
+if string.match( vlc.path, "^gaming%.youtube%.com/" ) then
+url = string.gsub( vlc.path, "^gaming%.youtube%.com", 
"www.youtube.com" )
+return { { path = vlc.access.."://"..url } }
+end
 if string.match( vlc.path, "/watch%?" )
 or string.match( vlc.path, "/live$" )
 or string.match( vlc.path, "/live%?" )

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: remove aa output

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 14:54:49 
2018 +0100| [7d141bf19fa57c79c1deb4617441b5966d8762fc] | committer: Thomas 
Guillem

vout: remove aa output

Because caca is the future.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7d141bf19fa57c79c1deb4617441b5966d8762fc
---

 NEWS |   3 +
 configure.ac |  15 --
 contrib/src/sdl/rules.mak|   1 -
 modules/MODULES_LIST |   1 -
 modules/video_output/Makefile.am |  11 --
 modules/video_output/aa.c| 330 ---
 po/POTFILES.in   |   1 -
 7 files changed, 3 insertions(+), 359 deletions(-)

diff --git a/NEWS b/NEWS
index b24492471e..90eb307dae 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ Codecs:
  * Support for experimental AV1 video encoding
  * WebVTT encoder
 
+Video ouput:
+ * Remove aa plugin
+ * Remove evas plugin
 
 Changes between 2.2.x and 3.0.0-git:
 
diff --git a/configure.ac b/configure.ac
index d76d9f772b..92e127fa60 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3347,21 +3347,6 @@ AC_CHECK_HEADER([linux/fb.h], [
   VLC_ADD_PLUGIN([fb])
 ])
 
-
-dnl
-dnl  AA plugin
-dnl
-AC_ARG_ENABLE(aa,
-  [  --enable-aa aalib output (default disabled)])
-if test "${enable_aa}" = "yes"
-then
-  AC_CHECK_HEADER(aalib.h,have_aa="true",have_aa="false")
-  if test "${have_aa}" = "true"
-  then
-VLC_ADD_PLUGIN([aa])
-  fi
-fi
-
 dnl
 dnl  libcaca plugin
 dnl
diff --git a/contrib/src/sdl/rules.mak b/contrib/src/sdl/rules.mak
index 4b16cc90f3..4a933b5486 100644
--- a/contrib/src/sdl/rules.mak
+++ b/contrib/src/sdl/rules.mak
@@ -31,7 +31,6 @@ SDLCONF := $(HOSTCONF) \
--disable-file \
--disable-assembly \
--disable-video-x11 \
-   --disable-video-aalib \
--disable-video-dga \
--disable-video-fbcon \
--disable-video-directfb \
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 3bfccb0c65..747ea67d59 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -2,7 +2,6 @@ List of VLC plugins:
 $Id$
 
  * a52: A/52 audio decoder plugin, using liba52
- * aa: Ascii art video output
  * access_alsa: Alsa access module
  * access_concat: concatenated access
  * access_imem: memory bitstream access module
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 4a10df9fd4..1718a20cff 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -403,17 +403,6 @@ EXTRA_LTLIBRARIES += libfb_plugin.la
 vout_LTLIBRARIES += $(LTLIBfb)
 
 
-### ASCII Art ###
-libaa_plugin_la_SOURCES = video_output/aa.c
-libaa_plugin_la_LIBADD = libevent_thread.la -laa
-if !HAVE_WIN32
-libaa_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
-endif
-libaa_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-EXTRA_LTLIBRARIES += libaa_plugin.la
-vout_LTLIBRARIES += $(LTLIBaa)
-
-
 ### Coloured ASCII art ###
 libcaca_plugin_la_SOURCES = video_output/caca.c
 libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
deleted file mode 100644
index e9146d082c..00
--- a/modules/video_output/aa.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
- * aa.c: "vout display" module using aalib
- *
- * Copyright (C) 2002-2009 VLC authors and VideoLAN
- * $Id$
- *
- * Authors: Sigmund Augdal Helberg 
- *
- * 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
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- */
-
-/*
- * Preamble
- */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include 
-#include 
-#include 
-#include 
-
-#include 
-#include 
-
-#ifndef _WIN32
-# ifdef X_DISPLAY_MISSING
-#  error Xlib required due to XInitThreads
-# endif
-# include 
-#endif
-
-#include "event_thread.h"
-
-/* TODO
- * - what about RGB palette ?
- */

[vlc-commits] lib: hide libvlc_media_player_set_evas_object

2018-02-02 Thread Thomas Guillem

vlc/vlc-3.0 | branch: master | Thomas Guillem  | Fri Feb  2 
14:48:32 2018 +0100| [b8601266fea867d33604278cdbfaf7d2135b0672] | committer: 
Thomas Guillem

lib: hide libvlc_media_player_set_evas_object

Will be removed in VLC 4.0.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b8601266fea867d33604278cdbfaf7d2135b0672
---

 lib/libvlc.sym | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index c86b33f696..482d95f6f1 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -190,7 +190,6 @@ libvlc_media_player_set_agl
 libvlc_media_player_set_android_context
 libvlc_media_player_set_chapter
 libvlc_media_player_set_equalizer
-libvlc_media_player_set_evas_object
 libvlc_media_player_set_hwnd
 libvlc_media_player_set_media
 libvlc_media_player_set_nsobject

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/vpx: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:38:07 
2018 +0100| [47c02c9dec5ba4782483bfcf08e40cf8f4ce0ca6] | committer: Felix Paul 
Kühne

contrib/vpx: fix compilation for macOS when cross-compiling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47c02c9dec5ba4782483bfcf08e40cf8f4ce0ca6
---

 contrib/src/vpx/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index efec7cb484..ea0ff9c3ea 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -66,6 +66,7 @@ VPX_OS := darwin9
 else
 VPX_OS := darwin10
 endif
+VPX_CROSS :=
 else ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 VPX_OS := darwin

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:38:53 
2018 +0100| [6c6bc89cf0d8377532fa04394d23bc0cea4d9eab] | committer: Felix Paul 
Kühne

contrib: move macOS compilation flags to the script where they belong and 
generalize Darwin OS environment manipulations

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c6bc89cf0d8377532fa04394d23bc0cea4d9eab
---

 contrib/src/main.mak   | 13 +
 extras/package/macosx/build.sh | 14 ++
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0398a5ad1a..e6da70cc27 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -113,10 +113,7 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-MIN_OSX_VERSION=10.7
-EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 EXTRA_CXXFLAGS += -stdlib=libc++
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 ifeq ($(ARCH),x86_64)
 EXTRA_CFLAGS += -m64
 EXTRA_LDFLAGS += -m64
@@ -132,18 +129,10 @@ endif
 CCAS=$(CC) -c
 
 ifdef HAVE_IOS
-CC=xcrun clang
-CXX=xcrun clang++
 ifdef HAVE_NEON
 AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
-else
-CCAS=$(CC) -c
 endif
-AR=xcrun ar
-LD=xcrun ld
-STRIP=xcrun strip
-RANLIB=xcrun ranlib
 EXTRA_CFLAGS += $(CFLAGS)
 endif
 
@@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
 
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 AUTORECONF = AUTOPOINT=true autoreconf
 else
 AUTORECONF = autoreconf
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d996e1f94d..8158bc7bed 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 
 info()
 {
@@ -193,9 +192,16 @@ spopd
 #   enabled. (e.g. ffmpeg)
 # - This will fail the build if a partially available symbol is added later on
 #   in contribs and not mentioned in the list of symbols above.
-export CFLAGS="-Werror=partial-availability"
-export CXXFLAGS="-Werror=partial-availability"
-export OBJCFLAGS="-Werror=partial-availability"
+CFLAGS="-Werror=partial-availability "
+CXXFLAGS="-Werror=partial-availability "
+OBJCFLAGS="-Werror=partial-availability "
+
+CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" 
-mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+
+export CFLAGS=${CFLAGS}
+export CXXFLAGS=${CXXFLAGS}
+export LDFLAGS=${LDFLAGS}
 
 info "Building contribs"
 spushd "${vlcroot}/contrib"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/gpg-error: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:37:40 
2018 +0100| [a48b98b1b40a153b29d7a2f8ca3f7349a9e10188] | committer: Felix Paul 
Kühne

contrib/gpg-error: fix compilation for macOS when cross-compiling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a48b98b1b40a153b29d7a2f8ca3f7349a9e10188
---

 contrib/src/gpg-error/rules.mak | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 025fdc0455..7ec95c1f47 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -32,11 +32,15 @@ ifeq ($(TIZEN_ABI), x86)
cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h 
$@/src/syscfg/lock-obj-pub.linux-gnueabi.h
 endif
 endif
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 else
+ifeq ($(ARCH),aarch64)
cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+else
+   cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 endif
 endif
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bin: fix installation when compiling for macOS with the VLC executable disabled

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:36:52 
2018 +0100| [9e12a2ca6eec8f47befcc2048708bf3e57142cf0] | committer: Felix Paul 
Kühne

bin: fix installation when compiling for macOS with the VLC executable disabled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9e12a2ca6eec8f47befcc2048708bf3e57142cf0
---

 bin/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9ccb755cd3..2877e8b0ea 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -130,10 +130,12 @@ endif
 MOSTLYCLEANFILES = $(noinst_DATA)
 
 if HAVE_OSX
+if BUILD_VLC
 install-data-local:
cd $(bindir); mv vlc-osx vlc
 
 endif
+endif
 
 .PHONY: ../modules/plugins.dat
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout: remove evas output

2018-02-02 Thread Thomas Guillem

vlc | branch: master | Thomas Guillem  | Fri Feb  2 14:42:22 
2018 +0100| [869280963b473224ea9545dfe44fcf14f6480774] | committer: Thomas 
Guillem

vout: remove evas output

Not built and tested since a long time. The good way to go is to use the
openGLES2 vout.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=869280963b473224ea9545dfe44fcf14f6480774
---

 NEWS  |1 -
 configure.ac  |   19 -
 include/vlc/libvlc_media_player.h |   13 -
 lib/libvlc.sym|1 -
 lib/media_player.c|   21 -
 modules/MODULES_LIST  |1 -
 modules/video_output/Makefile.am  |   11 -
 modules/video_output/evas.c   | 1335 -
 po/POTFILES.in|1 -
 9 files changed, 1403 deletions(-)

diff --git a/NEWS b/NEWS
index 051556080f..b24492471e 100644
--- a/NEWS
+++ b/NEWS
@@ -319,7 +319,6 @@ libVLC:
  * Deprecate libvlc_video_get_title_description, 
libvlc_video_get_chapter_description,
libvlc_media_player_get_agl, libvlc_media_player_set_agl
  * Add libvlc_media_player_set_android_context to integrate in an Android 
surface
- * Add libvlc_media_player_set_evas_object to draw on an EFL/Evas Object
  * Add a new libvlc dialog API to forward dialogs requests to the applications:
libvlc_dialog_set_context, libvlc_dialog_get_context, 
libvlc_dialog_set_callbacks,
libvlc_dialog_dismiss, libvlc_dialog_post_action, libvlc_dialog_post_login
diff --git a/configure.ac b/configure.ac
index 2055a6dc96..d76d9f772b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3420,25 +3420,6 @@ fi
 AM_CONDITIONAL([HAVE_MMAL], [test "${have_mmal}" = "yes"])
 
 dnl
-dnl evas plugin
-dnl
-AC_ARG_ENABLE(evas,
-  [AS_HELP_STRING([--enable-evas],
-[use evas output module (default disabled)])])
-have_evas="no"
-AS_IF([test "${enable_evas}" = "yes"], [
-  PKG_CHECK_MODULES(EVAS, [evas >= 1.15.99 ecore >= 1.15.99], [
-  have_evas="yes"
-  AC_DEFINE([HAVE_EVAS], [1], [Define to 1 if evas is enabled.])
-],[
-AS_IF([test "x${enable_evas}" != "x"], [
-  AC_MSG_ERROR([$EVAS_PKG_ERRORS. libevas and libecore 1.15.99 or later 
required.])
-])
-  ])
-])
-AM_CONDITIONAL([HAVE_EVAS], [test "${have_evas}" = "yes"])
-
-dnl
 dnl  Audio plugins
 dnl
 
diff --git a/include/vlc/libvlc_media_player.h 
b/include/vlc/libvlc_media_player.h
index 4336df9442..7348728d9e 100644
--- a/include/vlc/libvlc_media_player.h
+++ b/include/vlc/libvlc_media_player.h
@@ -587,19 +587,6 @@ LIBVLC_API void libvlc_media_player_set_android_context( 
libvlc_media_player_t *
  void 
*p_awindow_handler );
 
 /**
- * Set the EFL Evas Object.
- *
- * \version LibVLC 3.0.0 and later.
- *
- * \param p_mi the media player
- * \param p_evas_object a valid EFL Evas Object (Evas_Object)
- * \return -1 if an error was detected, 0 otherwise.
- */
-LIBVLC_API int libvlc_media_player_set_evas_object( libvlc_media_player_t 
*p_mi,
-void *p_evas_object );
-
-
-/**
  * Callback prototype for audio playback.
  *
  * The LibVLC media player decodes and post-processes the audio signal
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index c86b33f696..482d95f6f1 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -190,7 +190,6 @@ libvlc_media_player_set_agl
 libvlc_media_player_set_android_context
 libvlc_media_player_set_chapter
 libvlc_media_player_set_equalizer
-libvlc_media_player_set_evas_object
 libvlc_media_player_set_hwnd
 libvlc_media_player_set_media
 libvlc_media_player_set_nsobject
diff --git a/lib/media_player.c b/lib/media_player.c
index a9a22fee15..60ef18b4d4 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -646,9 +646,6 @@ libvlc_media_player_new( libvlc_instance_t *instance )
 #ifdef __ANDROID__
 var_Create (mp, "drawable-androidwindow", VLC_VAR_ADDRESS);
 #endif
-#ifdef HAVE_EVAS
-var_Create (mp, "drawable-evasobject", VLC_VAR_ADDRESS);
-#endif
 
 var_Create (mp, "keyboard-events", VLC_VAR_BOOL);
 var_SetBool (mp, "keyboard-events", true);
@@ -1269,24 +1266,6 @@ void libvlc_media_player_set_android_context( 
libvlc_media_player_t *p_mi,
 #endif
 }
 
-/**
- * set_evas_object
- **/
-int libvlc_media_player_set_evas_object( libvlc_media_player_t *p_mi,
- void *p_evas_object )
-{
-assert (p_mi != NULL);
-#ifdef HAVE_EVAS
-var_SetString (p_mi, "vout", "evas");
-var_SetString (p_mi, "window", "none");
-var_SetAddress (p_mi, "drawable-evasobject", p_evas_object);
-return 0;
-#else
-(void) p_mi; (void) p_evas_object;
-return -1;
-#endif
-}
-
 void libvlc_audio_set_callbacks( libvlc_media_player_t *mp,
  libvlc_audio_play_cb play_cb,

[vlc-commits] demux: adaptive: pass full url to proxy

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Wed Jan 31 
23:09:26 2018 +0100| [e5a3e37f9a420ee0dd74398f7c6a94d353a44079] | committer: 
Thomas Guillem

demux: adaptive: pass full url to proxy

as reported by Ramon Gabarró

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e5a3e37f9a420ee0dd74398f7c6a94d353a44079
---

 modules/demux/adaptive/http/HTTPConnection.cpp | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp 
b/modules/demux/adaptive/http/HTTPConnection.cpp
index bdc109350f..971f0c84a7 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -139,8 +139,13 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 msg_Dbg(p_object, "Retrieving %s @%zu", params.getUrl().c_str(),
range.isValid() ? range.getStartByte() : 0);
 
+std::string querypath;
 if(!proxyparams.getHostname().empty())
+{
 msg_Dbg(p_object, "Using proxy %s", proxyparams.getUrl().c_str());
+querypath = params.getUrl();
+}
+else querypath = path;
 
 if(!connected() && ( params.getHostname().empty() || !connect() ))
 return VLC_EGENERIC;
@@ -149,7 +154,7 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 if(range.isValid() && range.getEndByte() > 0)
 contentLength = range.getEndByte() - range.getStartByte() + 1;
 
-std::string header = buildRequestHeader(path);
+std::string header = buildRequestHeader(querypath);
 if(connectionClose)
 header.append("Connection: close\r\n");
 header.append("\r\n");

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: move macOS compilation flags to the script where they belong and generalize Darwin OS environment manipulations

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:38:53 
2018 +0100| [9341582f488592430384006dc3f316ab3374b4bf] | committer: Felix Paul 
Kühne

contrib: move macOS compilation flags to the script where they belong and 
generalize Darwin OS environment manipulations

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9341582f488592430384006dc3f316ab3374b4bf
---

 contrib/src/main.mak   | 13 +
 extras/package/macosx/build.sh | 14 ++
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0398a5ad1a..e6da70cc27 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -113,10 +113,7 @@ endif
 endif
 
 ifdef HAVE_MACOSX
-MIN_OSX_VERSION=10.7
-EXTRA_CFLAGS += -isysroot $(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 EXTRA_CXXFLAGS += -stdlib=libc++
-EXTRA_LDFLAGS += -Wl,-syslibroot,$(MACOSX_SDK) 
-mmacosx-version-min=$(MIN_OSX_VERSION) -isysroot $(MACOSX_SDK) 
-DMACOSX_DEPLOYMENT_TARGET=$(MIN_OSX_VERSION)
 ifeq ($(ARCH),x86_64)
 EXTRA_CFLAGS += -m64
 EXTRA_LDFLAGS += -m64
@@ -132,18 +129,10 @@ endif
 CCAS=$(CC) -c
 
 ifdef HAVE_IOS
-CC=xcrun clang
-CXX=xcrun clang++
 ifdef HAVE_NEON
 AS=perl $(abspath ../../extras/tools/build/bin/gas-preprocessor.pl) $(CC)
 CCAS=gas-preprocessor.pl $(CC) -c
-else
-CCAS=$(CC) -c
 endif
-AR=xcrun ar
-LD=xcrun ld
-STRIP=xcrun strip
-RANLIB=xcrun ranlib
 EXTRA_CFLAGS += $(CFLAGS)
 endif
 
@@ -346,7 +335,7 @@ UPDATE_AUTOCONFIG = for dir in $(AUTOMAKE_DATA_DIRS); do \
fi; \
done
 
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 AUTORECONF = AUTOPOINT=true autoreconf
 else
 AUTORECONF = autoreconf
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d996e1f94d..8158bc7bed 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 set -e
-set -x
 
 info()
 {
@@ -193,9 +192,16 @@ spopd
 #   enabled. (e.g. ffmpeg)
 # - This will fail the build if a partially available symbol is added later on
 #   in contribs and not mentioned in the list of symbols above.
-export CFLAGS="-Werror=partial-availability"
-export CXXFLAGS="-Werror=partial-availability"
-export OBJCFLAGS="-Werror=partial-availability"
+CFLAGS="-Werror=partial-availability "
+CXXFLAGS="-Werror=partial-availability "
+OBJCFLAGS="-Werror=partial-availability "
+
+CFLAGS+="-isysroot "$SDKROOT" -mmacosx-version-min="$MINIMAL_OSX_VERSION" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+LDFLAGS+="-Wl,-syslibroot,"$SDKROOT" 
-mmacosx-version-min="$MINIMAL_OSX_VERSION" -isysroot "$SDKROOT" 
-DMACOSX_DEPLOYMENT_TARGET="$MINIMAL_OSX_VERSION
+
+export CFLAGS=${CFLAGS}
+export CXXFLAGS=${CXXFLAGS}
+export LDFLAGS=${LDFLAGS}
 
 info "Building contribs"
 spushd "${vlcroot}/contrib"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/vpx: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:38:07 
2018 +0100| [5897f59bbd85c155ee25cf537e265a3bf5f37c84] | committer: Felix Paul 
Kühne

contrib/vpx: fix compilation for macOS when cross-compiling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5897f59bbd85c155ee25cf537e265a3bf5f37c84
---

 contrib/src/vpx/rules.mak | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index efec7cb484..ea0ff9c3ea 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -66,6 +66,7 @@ VPX_OS := darwin9
 else
 VPX_OS := darwin10
 endif
+VPX_CROSS :=
 else ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 VPX_OS := darwin

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib/gpg-error: fix compilation for macOS when cross-compiling

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:37:40 
2018 +0100| [7f0d8272cad17d1d9363100bcfc63ad76b3d59de] | committer: Felix Paul 
Kühne

contrib/gpg-error: fix compilation for macOS when cross-compiling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f0d8272cad17d1d9363100bcfc63ad76b3d59de
---

 contrib/src/gpg-error/rules.mak | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 025fdc0455..7ec95c1f47 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -32,11 +32,15 @@ ifeq ($(TIZEN_ABI), x86)
cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h 
$@/src/syscfg/lock-obj-pub.linux-gnueabi.h
 endif
 endif
-ifdef HAVE_IOS
+ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
 else
+ifeq ($(ARCH),aarch64)
cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+else
+   cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 endif
 endif
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bin: fix installation when compiling for macOS with the VLC executable disabled

2018-02-02 Thread Felix Paul Kühne

vlc | branch: master | Felix Paul Kühne  | Wed Jan 24 21:36:52 
2018 +0100| [ad9a948e4f1ea59294f817495d0a7f6c98ee9d2b] | committer: Felix Paul 
Kühne

bin: fix installation when compiling for macOS with the VLC executable disabled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad9a948e4f1ea59294f817495d0a7f6c98ee9d2b
---

 bin/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9ccb755cd3..2877e8b0ea 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -130,10 +130,12 @@ endif
 MOSTLYCLEANFILES = $(noinst_DATA)
 
 if HAVE_OSX
+if BUILD_VLC
 install-data-local:
cd $(bindir); mv vlc-osx vlc
 
 endif
+endif
 
 .PHONY: ../modules/plugins.dat
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] demux: adaptive: pass full url to proxy

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Wed Jan 31 
23:09:26 2018 +0100| [989664f299d80bc7ef5d2cbbb0448ea812e5e943] | committer: 
Francois Cartegnie

demux: adaptive: pass full url to proxy

as reported by Ramon Gabarró

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=989664f299d80bc7ef5d2cbbb0448ea812e5e943
---

 modules/demux/adaptive/http/HTTPConnection.cpp | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/demux/adaptive/http/HTTPConnection.cpp 
b/modules/demux/adaptive/http/HTTPConnection.cpp
index bdc109350f..67f20b8c51 100644
--- a/modules/demux/adaptive/http/HTTPConnection.cpp
+++ b/modules/demux/adaptive/http/HTTPConnection.cpp
@@ -139,8 +139,13 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 msg_Dbg(p_object, "Retrieving %s @%zu", params.getUrl().c_str(),
range.isValid() ? range.getStartByte() : 0);
 
+const std::string 
 if(!proxyparams.getHostname().empty())
+{
 msg_Dbg(p_object, "Using proxy %s", proxyparams.getUrl().c_str());
+querypath = params.getUrl();
+}
+else querypath = path;
 
 if(!connected() && ( params.getHostname().empty() || !connect() ))
 return VLC_EGENERIC;
@@ -149,7 +154,7 @@ int HTTPConnection::request(const std::string , const 
BytesRange )
 if(range.isValid() && range.getEndByte() > 0)
 contentLength = range.getEndByte() - range.getStartByte() + 1;
 
-std::string header = buildRequestHeader(path);
+std::string header = buildRequestHeader(querypath);
 if(connectionClose)
 header.append("Connection: close\r\n");
 header.append("\r\n");

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout/macosx: Do not check call to disableScreenUpdatesUntilFlush

2018-02-02 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Tue Jan 30 15:46:59 
2018 +0100| [64ec400081755265ebb8e233192b9a01d61f54a7] | committer: Marvin 
Scholz

vout/macosx: Do not check call to disableScreenUpdatesUntilFlush

NSWindows disableScreenUpdatesUntilFlush is available since macOS 10.4,
so there is no need to check if NSWindow responds to it.

Additionally clarify the comment about why it is there by replacing it
with a comment taken from Apple sample code that explains it very well.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=64ec400081755265ebb8e233192b9a01d61f54a7
---

 modules/video_output/macosx.m | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index d527f2f819..0ab61fc52b 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -713,11 +713,18 @@ static void OpenglSwap (vlc_gl_t *gl)
 
 - (void)renewGState
 {
-NSWindow *window = [self window];
-
-// Remove flashes with splitter view.
-if ([window respondsToSelector:@selector(disableScreenUpdatesUntilFlush)])
-[window disableScreenUpdatesUntilFlush];
+// Comment take from Apple GLEssentials sample code:
+// https://developer.apple.com/library/content/samplecode/GLEssentials
+//
+// OpenGL rendering is not synchronous with other rendering on the OSX.
+// Therefore, call disableScreenUpdatesUntilFlush so the window server
+// doesn't render non-OpenGL content in the window asynchronously from
+// OpenGL content, which could cause flickering.  (non-OpenGL content
+// includes the title bar and drawing done by the app with other APIs)
+
+// In macOS 10.13 and later, window updates are automatically batched
+// together and this no longer needs to be called (effectively a no-op)
+[[self window] disableScreenUpdatesUntilFlush];
 
 [super renewGState];
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] vout/macosx: Remove useless access of NSWindow

2018-02-02 Thread Marvin Scholz

vlc | branch: master | Marvin Scholz  | Tue Jan 30 14:40:37 
2018 +0100| [89c1c9575b06bae5085234363c0d49770f020f7c] | committer: Marvin 
Scholz

vout/macosx: Remove useless access of NSWindow

The window is only ever used to query its minSize, which is then not
used anywhere in the following code, so this code can be removed.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=89c1c9575b06bae5085234363c0d49770f020f7c
---

 modules/video_output/macosx.m | 8 
 1 file changed, 8 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 1e519988cd..d527f2f819 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -366,14 +366,6 @@ static int Control (vout_display_t *vd, int query, va_list 
ap)
 case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
 case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
 {
-
-id o_window = [sys->glView window];
-if (!o_window) {
-return VLC_SUCCESS; // this is okay, since the event will 
occur again when we have a window
-}
-
-NSSize windowMinSize = [o_window minSize];
-
 const vout_display_cfg_t *cfg;
 
 if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == 
VOUT_DISPLAY_CHANGE_SOURCE_CROP) {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dbus: remove old --inhibit option

2018-02-02 Thread Rémi Denis-Courmont

vlc | branch: master | Rémi Denis-Courmont  | Fri Feb  2 
11:30:01 2018 +0200| [8131670072809412e8a155f9b173207cf9601eb2] | committer: 
Rémi Denis-Courmont

dbus: remove old --inhibit option

This is not longer used for anything.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8131670072809412e8a155f9b173207cf9601eb2
---

 src/libvlc-module.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index cc816873f7..9d29d24b4e 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -371,10 +371,6 @@ static const char *const ppsz_pos_descriptions[] =
 #define SS_TEXT N_("Disable screensaver")
 #define SS_LONGTEXT N_("Disable the screensaver during video playback." )
 
-#define INHIBIT_TEXT N_("Inhibit the power management daemon during playback")
-#define INHIBIT_LONGTEXT N_("Inhibits the power management daemon during any " 
\
-"playback, to avoid the computer being suspended because of inactivity.")
-
 #define VIDEO_DECO_TEXT N_("Window decorations")
 #define VIDEO_DECO_LONGTEXT N_( \
 "VLC can avoid creating window caption, frames, etc... around the video" \
@@ -2032,8 +2028,7 @@ vlc_module_begin ()
 #endif
 
 #if defined(HAVE_DBUS)
-add_bool( "inhibit", 1, INHIBIT_TEXT,
-  INHIBIT_LONGTEXT, true )
+add_obsolete_bool( "inhibit" ) /* since 3.0.0 */
 #endif
 
 #if defined(_WIN32) || defined(__OS2__)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sout: chromecast: remove direct call to pf_control

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Wed Jan 31 
18:22:32 2018 +0100| [3d7667ddcd7877ae90b44550637bdf72bf2446cf] | committer: 
Francois Cartegnie

sout: chromecast: remove direct call to pf_control

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3d7667ddcd7877ae90b44550637bdf72bf2446cf
---

 modules/stream_out/chromecast/cast.cpp | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/stream_out/chromecast/cast.cpp 
b/modules/stream_out/chromecast/cast.cpp
index 8903f7fe6c..7dd2705f70 100644
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -1041,10 +1041,7 @@ static int Control(sout_stream_t *p_stream, int i_query, 
va_list args)
 return VLC_SUCCESS;
 }
 
-if ( !p_sys->p_out->pf_control )
-return VLC_EGENERIC;
-
-return p_sys->p_out->pf_control( p_sys->p_out, i_query, args );
+return sout_StreamControlVa( p_sys->p_out, i_query, args );
 }
 
 /*

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] input: don't wait data to create sout input

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Mon Jan 29 
18:14:39 2018 +0100| [2816e5e7d68f35a172115e4a4637a6eaa21edd62] | committer: 
Francois Cartegnie

input: don't wait data to create sout input

No sout mux buffer parameters is sufficient
as spu can arrive really late.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2816e5e7d68f35a172115e4a4637a6eaa21edd62
---

 src/input/decoder.c | 16 
 1 file changed, 16 insertions(+)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 6bcadfcbc8..98817e6f39 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1930,6 +1930,22 @@ static decoder_t *decoder_New( vlc_object_t *p_parent, 
input_thread_t *p_input,
 else
 i_priority = VLC_THREAD_PRIORITY_VIDEO;
 
+#ifdef ENABLE_SOUT
+/* Do not delay sout creation for SPU or DATA. */
+if( p_sout && fmt->b_packetized &&
+(fmt->i_cat != VIDEO_ES && fmt->i_cat != AUDIO_ES) )
+{
+decoder_owner_sys_t *p_owner = p_dec->p_owner;
+p_owner->p_sout_input = sout_InputNew( p_owner->p_sout, fmt );
+if( p_owner->p_sout_input == NULL )
+{
+msg_Err( p_dec, "cannot create sout input (%4.4s)",
+ (char *)>i_codec );
+p_owner->error = true;
+}
+}
+#endif
+
 /* Spawn the decoder thread */
 if( vlc_clone( _dec->p_owner->thread, DecoderThread, p_dec, i_priority ) 
)
 {

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] sout: remove useless check

2018-02-02 Thread Francois Cartegnie

vlc | branch: master | Francois Cartegnie  | Wed Jan 31 
18:23:08 2018 +0100| [382dab15d434b4e44c29e3d64fe095b44a539c4b] | committer: 
Francois Cartegnie

sout: remove useless check

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=382dab15d434b4e44c29e3d64fe095b44a539c4b
---

 include/vlc_sout.h | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 6773ebe73b..0165e95134 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -257,10 +257,7 @@ static inline int sout_StreamControl( sout_stream_t *s, 
int i_query, ... )
 int i_result;
 
 va_start( args, i_query );
-if ( !s->pf_control )
-i_result = VLC_EGENERIC;
-else
-i_result = sout_StreamControlVa( s, i_query, args );
+i_result = sout_StreamControlVa( s, i_query, args );
 va_end( args );
 return i_result;
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

58 matches

Mail list logo