Commit 92b0f7b8 authored by Felix Paul Kühne's avatar Felix Paul Kühne

iOS: fix video playback

This fixes #288
parent 14a6f2f7
......@@ -271,7 +271,7 @@
if (_currentAspectRatioMask + 1 > count - 1) {
_mediaplayer.videoAspectRatio = NULL;
_mediaplayer.videoCropGeometry = NULL;
// _mediaplayer.videoCropGeometry = NULL;
_currentAspectRatioMask = 0;
NSLog(@"crop disabled");
} else {
......@@ -281,7 +281,7 @@
UIScreen *screen = [UIScreen mainScreen];
float f_ar = screen.bounds.size.width / screen.bounds.size.height;
if (f_ar == (float)(640./1136.)) // iPhone 5 aka 16:9.01
/* if (f_ar == (float)(640./1136.)) // iPhone 5 aka 16:9.01
_mediaplayer.videoCropGeometry = "16:9";
else if (f_ar == (float)(2./3.)) // all other iPhones
_mediaplayer.videoCropGeometry = "16:10"; // libvlc doesn't support 2:3 crop
......@@ -291,12 +291,12 @@
_mediaplayer.videoCropGeometry = "16:9";
else
NSLog(@"unknown screen format %f, can't crop", f_ar);
*/
NSLog(@"FILL_TO_SCREEN");
return;
}
_mediaplayer.videoCropGeometry = NULL;
// _mediaplayer.videoCropGeometry = NULL;
_mediaplayer.videoAspectRatio = (char *)[_aspectRatios[_currentAspectRatioMask] UTF8String];
NSLog(@"crop switched to %@", _aspectRatios[_currentAspectRatioMask]);
}
......
From 6dafec4d5815e7815cb6ad3b26c0fbfaaff42fef Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:10 +0200
Subject: [PATCH 01/17] http: add vlc_http_cookies_clear
Subject: [PATCH 01/20] http: add vlc_http_cookies_clear
Clear all cookies without deleting the jar.
---
......
From 07139b673c9ed045e44ce5f9e44835c297dae725 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 16 Sep 2016 15:51:11 +0200
Subject: [PATCH 02/17] libvlc_media: add cookie_jar API
Subject: [PATCH 02/20] libvlc_media: add cookie_jar API
---
include/vlc/libvlc_media.h | 35 +++++++++++++++++++++++++++++++++++
......
From 22409f3d2566657cda2fd9b0017497f63776522b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 18 Dec 2014 22:14:55 +0100
Subject: [PATCH 03/17] arm_neon: work-around libtool issue
Subject: [PATCH 03/20] arm_neon: work-around libtool issue
---
modules/arm_neon/Makefile.am | 2 ++
......
From 11bde9a2d3f0db3439b0753c37e3f9ae42190ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Wed, 10 Dec 2014 22:14:55 +0100
Subject: [PATCH 04/17] disable neon volume plugin
Subject: [PATCH 04/20] disable neon volume plugin
---
modules/arm_neon/Makefile.am | 1 -
......
From 63c96e0db49337fc119b77612f8ed041bb45e694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Fri, 22 Jul 2016 11:11:44 +0200
Subject: [PATCH 05/17] Enable System DL
Subject: [PATCH 05/20] Enable System DL
---
contrib/src/ffmpeg/patch-as-patch-can.patch | 20 ++++++++++++++++++++
......
From fcab24938b40731c7d8f5475667e14291e7bbc31 Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 29 Sep 2017 14:49:02 +0200
Subject: [PATCH 06/17] contrib: use live555 version that is compatible with
Subject: [PATCH 06/20] contrib: use live555 version that is compatible with
LGPL2
---
......
From 0b0e3f59bd0f86b4080ac7cc86154950af343582 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Wed, 17 Jul 2019 10:34:47 +0200
Subject: [PATCH 07/17] tools: fix libtool bootstapping on macOS
Subject: [PATCH 07/20] tools: fix libtool bootstapping on macOS
---
extras/tools/tools.mak | 2 +-
......
From 55928ee0f7216acbf48b80eaab522fef535870d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 26 Mar 2018 16:44:44 +0200
Subject: [PATCH 08/17] modules:common: Use the full module name as MODULE_NAME
Subject: [PATCH 08/20] modules:common: Use the full module name as MODULE_NAME
This avoid conflicts when linking modules staticly on platforms that don't have objdump
---
......
From e489e76cd40a12913096f8932e4ae003568c99a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 10 Sep 2018 20:55:11 +0200
Subject: [PATCH 09/17] http access: retain auth struct for the runtime of the
Subject: [PATCH 09/20] http access: retain auth struct for the runtime of the
module
Previously, it was retained for a given connection only, so all information needed for a digest login was lost as soon as the module was reconnecting due to the expected 401 on attempted basic login
......
From 718c54190386e9ab704fc5099f77724c2ccfc4ba Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Mon, 1 Oct 2018 15:37:57 +0200
Subject: [PATCH 10/17] access_output: file: Add error dialog for write/open
Subject: [PATCH 10/20] access_output: file: Add error dialog for write/open
---
modules/access_output/file.c | 8 ++++++++
......
From 55aea7a102ebb1e10f9211e90e3593b44ed16b0e Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Mon, 17 Jul 2017 17:03:24 +0200
Subject: [PATCH 11/17] Replace thread local with pthread TSD
Subject: [PATCH 11/20] Replace thread local with pthread TSD
---
src/misc/interrupt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++
......
From 7676899bbb73251c05e62a258b74c7d103ff307c Mon Sep 17 00:00:00 2001
From: Carola Nitz <nitz.carola@googlemail.com>
Date: Fri, 23 Feb 2018 13:16:41 +0100
Subject: [PATCH 12/17] Work around lack of __thread storage qualifier on old
Subject: [PATCH 12/20] Work around lack of __thread storage qualifier on old
macOS
---
......
From b8f528df5cedec11b849c5b72cf9fa76a714ff4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sun, 17 Dec 2017 18:05:40 +0100
Subject: [PATCH 13/17] libvlc: add a basic API to change freetype's color,
Subject: [PATCH 13/20] libvlc: add a basic API to change freetype's color,
bold, font and size variables on-the-fly
---
......
From 5150bced77dbf54ea8fa0a1b7a9071fc4a646fe3 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 14/17] core: expose config_AutoSaveConfigFile
Subject: [PATCH 14/20] core: expose config_AutoSaveConfigFile
---
include/vlc_configuration.h | 2 ++
......
From 09020ca7bbebad74d548965d44590142d9dd328d Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Wed, 17 Jan 2018 10:06:13 +0200
Subject: [PATCH 15/17] lib: save configuration after playback/parse
Subject: [PATCH 15/20] lib: save configuration after playback/parse
The configuration is also saved when the libvlc instance is terminated but this doesn't happen often. Indeed, apps using libvlc will generally hold the libvlc instance during all its lifetime and won't be able to clean it up in a lot of case (app killed by OS to free up memory, crashes, reboot, force close...).
---
......
From 000b11a8f28bd85ea6ee9477bcd8566cc6a7751a Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Wed, 31 Oct 2018 10:08:55 +0100
Subject: [PATCH 16/17] libvlc: media_player: Add record method
Subject: [PATCH 16/20] libvlc: media_player: Add record method
---
include/vlc/libvlc_media_player.h | 13 +++++++++++++
......
From 99a76fc98892c4b27ba4a3c7411c13bad7b68d3c Mon Sep 17 00:00:00 2001
From: Soomin Lee <bubu@mikan.io>
Date: Thu, 27 Sep 2018 18:40:39 +0200
Subject: [PATCH 17/17] libvlc: events: Add callbacks for record
Subject: [PATCH 17/20] libvlc: events: Add callbacks for record
---
include/vlc/libvlc_events.h | 9 +++++++++
......
From d65fb18dff3e9f13deeb3d2280846a695465cf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 16:23:10 +0200
Subject: [PATCH 18/20] videotoolbox: require iOS 9.0
---
modules/codec/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index 313ec0db0d..e77725014c 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -340,7 +340,7 @@ libvideotoolbox_plugin_la_SOURCES = \
packetizer/hevc_nal.c packetizer/hevc_nal.h
libvideotoolbox_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
if HAVE_IOS
-libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=8.0
+libvideotoolbox_plugin_la_OBJCFLAGS += -miphoneos-version-min=9.0
endif
if HAVE_TVOS
libvideotoolbox_plugin_la_OBJCFLAGS += -mtvos-version-min=10.2
--
2.20.1 (Apple Git-117)
From 2d2305c5e7b7c23fe73e395d9d098316ca033c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 16:23:46 +0200
Subject: [PATCH 19/20] Add hack to allow execution with i386 runtime in the
simulator
---
src/misc/sort.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/misc/sort.c b/src/misc/sort.c
index fc62eb7fff..a96fb0104c 100644
--- a/src/misc/sort.c
+++ b/src/misc/sort.c
@@ -26,7 +26,11 @@
#include <vlc_common.h>
#include <vlc_sort.h>
+#ifdef I_CAN_HAZ_TSD
static thread_local struct
+#else
+static struct
+#endif
{
int (*compar)(const void *, const void *, void *);
void *arg;
--
2.20.1 (Apple Git-117)
From 2a6c5dad3e858aef8b0297daf1bb8ed9e416c8a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Mon, 22 Jul 2019 18:26:58 +0200
Subject: [PATCH 20/20] vout/ios: fix execution
---
modules/video_output/ios.m | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index d394e8a92a..4013ff22e2 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -148,7 +148,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
if (vout_display_cfg_IsWindowed(cfg))
return VLC_EGENERIC;
- vout_display_sys_t *sys = vlc_obj_calloc(vd, 1, sizeof(*sys));
+ vout_display_sys_t *sys = calloc(1, sizeof(*sys));
if (!sys)
return VLC_ENOMEM;
@@ -689,10 +689,6 @@ - (void)reshape
_place = place;
}
- vout_display_sys_t *sys = _voutDisplay->sys;
- vout_window_ReportSize(sys->embed, _viewSize.width * _scaleFactor,
- _viewSize.height * _scaleFactor);
-
vlc_mutex_unlock(&_mutex);
}
--
2.20.1 (Apple Git-117)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment