December 2020 - MPlayer-cvslog - lists.mplayerhq.hu

r38213 - trunk/libao2/ao_coreaudio.c
by reimar 31 Dec '20

31 Dec '20

Author: reimar Date: Thu Dec 31 21:46:32 2020 New Revision: 38213 Log: ao_coreaudio: quick hack to make it work on modern OSX. The APIs were renamed to be audio-specific. Modified: trunk/libao2/ao_coreaudio.c Modified: trunk/libao2/ao_coreaudio.c ============================================================================== --- trunk/libao2/ao_coreaudio.c Tue Dec 29 23:02:05 2020 (r38212) +++ trunk/libao2/ao_coreaudio.c Thu Dec 31 21:46:32 2020 (r38213) @@ -55,6 +55,14 @@ #include "libavutil/fifo.h" #include "subopt-helper.h" +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060 +#define Component AudioComponent +#define FindNextComponent AudioComponentFindNext +#define ComponentDescription AudioComponentDescription +#define OpenAComponent AudioComponentInstanceNew +#define CloseComponent AudioComponentInstanceDispose +#endif + static const ao_info_t info = { "Darwin/Mac OS X native audio output",

1 0

r38212 - trunk/libvo/video_out.c
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 23:02:05 2020 New Revision: 38212 Log: libvo: Add missing #ifdef. MPlayer configured for corevideo enabled but gl disabled would fail to build otherwise. Modified: trunk/libvo/video_out.c Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Tue Dec 29 15:00:23 2020 (r38211) +++ trunk/libvo/video_out.c Tue Dec 29 23:02:05 2020 (r38212) @@ -171,7 +171,9 @@ const vo_functions_t* const video_out_dr &video_out_kva, #endif #ifdef CONFIG_COREVIDEO +#ifdef CONFIG_GL &video_out_gl_nosw, +#endif &video_out_corevideo, #endif #ifdef CONFIG_QUARTZ

1 0

r38211 - trunk/libvo/vo_gl.c
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 15:00:23 2020 New Revision: 38211 Log: vo_gl: Enable PBO upload on Apple Silicon. It is much faster than regular texture uploads, even if an extra memcpy is needed. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Tue Dec 29 13:01:21 2020 (r38210) +++ trunk/libvo/vo_gl.c Tue Dec 29 15:00:23 2020 (r38211) @@ -540,8 +540,10 @@ static void autodetectGlExtensions(void) if (force_pbo == -1) { force_pbo = 0; // memcpy is just too slow at least on PPC. - if (ARCH_X86 && extensions && strstr(extensions, "_pixel_buffer_object")) - force_pbo = is_ati; + // PBO is vastly faster on Apple Silicon, assume that is the + // same for all AArch64 SOCs + if ((ARCH_X86 || ARCH_AARCH64) && extensions && strstr(extensions, "_pixel_buffer_object")) + force_pbo = is_ati || ARCH_AARCH64; } if (use_rectangle == -1) { use_rectangle = 0;

1 0

r38210 - trunk/libvo/video_out.c
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 13:01:21 2020 New Revision: 38210 Log: libvo: quick hack to prefer vo_gl over corevideo. Modified: trunk/libvo/video_out.c Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Tue Dec 29 12:58:51 2020 (r38209) +++ trunk/libvo/video_out.c Tue Dec 29 13:01:21 2020 (r38210) @@ -171,6 +171,7 @@ const vo_functions_t* const video_out_dr &video_out_kva, #endif #ifdef CONFIG_COREVIDEO + &video_out_gl_nosw, &video_out_corevideo, #endif #ifdef CONFIG_QUARTZ @@ -200,9 +201,11 @@ const vo_functions_t* const video_out_dr #ifdef CONFIG_XV &video_out_xv, #endif +#ifndef CONFIG_COREVIDEO #ifdef CONFIG_GL &video_out_gl_nosw, #endif +#endif #ifdef CONFIG_X11 &video_out_x11, &video_out_xover,

1 0

r38209 - trunk/libvo/vo_corevideo.m
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 12:58:51 2020 New Revision: 38209 Log: vo_corevideo: Fix it so it updates the screen on modern macOS. However it is still super-slow, so it might make much more sense to make vo_gl the default, unless it is easy to fix. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Tue Dec 29 12:33:14 2020 (r38208) +++ trunk/libvo/vo_corevideo.m Tue Dec 29 12:58:51 2020 (r38209) @@ -19,6 +19,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define GL_SILENCE_DEPRECATION + #import "vo_corevideo.h" #include <sys/types.h> #include <sys/ipc.h> @@ -244,6 +246,7 @@ static void flip_page(void) image_page = 1 - image_page; image_data = image_datas[image_page]; } + [mpGLView display]; } } @@ -458,6 +461,7 @@ static int control(uint32_t request, voi */ - (void)prepareOpenGL { + [super prepareOpenGL]; glEnable(GL_BLEND); glDisable(GL_DEPTH_TEST); glDepthMask(GL_FALSE);

1 0

r38208 - trunk/libvo/osx_objc_common.m
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 12:33:14 2020 New Revision: 38208 Log: osx_objc_common: simplify code to create menu. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Tue Dec 29 07:31:02 2020 (r38207) +++ trunk/libvo/osx_objc_common.m Tue Dec 29 12:33:14 2020 (r38208) @@ -278,55 +278,39 @@ void vo_osx_swap_buffers(void) //Create Movie Menu menu = [[NSMenu alloc] initWithTitle:@"Movie"]; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem]; - kHalfScreenCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem]; - kNormalScreenCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem]; - kDoubleScreenCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem]; - kFullScreenCmd = menuItem; - menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem]; + kHalfScreenCmd = [menu addItemWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; + kNormalScreenCmd = [menu addItemWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; + kDoubleScreenCmd = [menu addItemWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; + kFullScreenCmd = [menu addItemWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; + [menu addItem: [NSMenuItem separatorItem]]; aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"]; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - if(vo_keepaspect) [menuItem setState:NSOnState]; - kKeepAspectCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - if(vo_panscan) [menuItem setState:NSOnState]; - kPanScanCmd = menuItem; - menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem]; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - kAspectOrgCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - kAspectFullCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem]; - kAspectWideCmd = menuItem; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; + kKeepAspectCmd = [aspectMenu addItemWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; + if(vo_keepaspect) [kKeepAspectCmd setState:NSOnState]; + kPanScanCmd = [aspectMenu addItemWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; + if(vo_panscan) [kPanScanCmd setState:NSOnState]; + [aspectMenu addItem:[NSMenuItem separatorItem]]; + kAspectOrgCmd = [aspectMenu addItemWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; + kAspectFullCmd = [aspectMenu addItemWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; + kAspectWideCmd = [aspectMenu addItemWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; + menuItem = [menu addItemWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""]; [menuItem setSubmenu:aspectMenu]; - [menu addItem:menuItem]; - [aspectMenu release]; //Add to menubar - menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""]; + menuItem = [mainMenu addItemWithTitle:@"Movie" action:nil keyEquivalent:@""]; [menuItem setSubmenu:menu]; - [mainMenu addItem:menuItem]; //Create Window Menu menu = [[NSMenu alloc] initWithTitle:@"Window"]; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem]; - menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem]; + [menu addItemWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; + [menu addItemWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; //Add to menubar - menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; + menuItem = [mainMenu addItemWithTitle:@"Window" action:nil keyEquivalent:@""]; [menuItem setSubmenu:menu]; - [mainMenu addItem:menuItem]; [NSApp setWindowsMenu:menu]; [NSApp setMainMenu:mainMenu]; - - [menu release]; - [menuItem release]; } - (void)set_winSizeMult:(float)mult

1 0

r38207 - trunk/libvo/osx_objc_common.m
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 07:31:02 2020 New Revision: 38207 Log: osx_objc_common: Fix selector so fullscreen works. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Tue Dec 29 07:11:20 2020 (r38206) +++ trunk/libvo/osx_objc_common.m Tue Dec 29 07:31:02 2020 (r38207) @@ -409,7 +409,7 @@ void vo_osx_swap_buffers(void) //go fullscreen if(vo_fs) { - if ([window respondsToSelector:@selector(enterFullScreenMode)]) { + if ([window respondsToSelector:@selector(enterFullScreenMode:)]) { [window enterFullScreenMode:[self fullscreen_screen]]; } if(!vo_rootwin) @@ -434,7 +434,7 @@ void vo_osx_swap_buffers(void) } else { - if ([window respondsToSelector:@selector(exitFullScreenMode)]) { + if ([window respondsToSelector:@selector(exitFullScreenMode:)]) { [window exitFullScreenMode:[self fullscreen_screen]]; } SetSystemUIMode( kUIModeNormal, 0);

1 0

r38206 - trunk/libvo/osx_objc_common.m
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 07:11:20 2020 New Revision: 38206 Log: osx_objc_common: More "retina" display fixes. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Tue Dec 29 06:43:38 2020 (r38205) +++ trunk/libvo/osx_objc_common.m Tue Dec 29 07:11:20 2020 (r38206) @@ -141,8 +141,11 @@ void vo_osx_swap_buffers(void) { NSScreen *screen_handle = [self fullscreen_screen]; NSRect screen_frame = [screen_handle frame]; - vo_screenwidth = screen_frame.size.width; - vo_screenheight = screen_frame.size.height; + NSSize size = screen_frame.size; + if ([self respondsToSelector:@selector(convertSizeToBacking:)]) + size = [self convertSizeToBacking:size]; + vo_screenwidth = size.width; + vo_screenheight = size.height; xinerama_x = screen_frame.origin.x; xinerama_y = screen_frame.origin.y; aspect_save_screenres(vo_screenwidth, vo_screenheight); @@ -419,10 +422,13 @@ void vo_osx_swap_buffers(void) old_frame = [window frame]; //save main window size & position [self update_screen_info]; - [window setFrame:NSMakeRect(xinerama_x, xinerama_y, vo_screenwidth, vo_screenheight) display:YES animate:animate]; //zoom-in window with nice useless sfx + NSSize size = { vo_screenwidth, vo_screenheight }; + if ([self respondsToSelector:@selector(convertSizeFromBacking:)]) + size = [self convertSizeFromBacking:size]; + [window setFrame:NSMakeRect(xinerama_x, xinerama_y, size.width, size.height) display:YES animate:animate]; //zoom-in window with nice useless sfx old_view_frame = [self bounds]; - [self setFrame:NSMakeRect(0, 0, vo_screenwidth, vo_screenheight)]; + [self setFrame:NSMakeRect(0, 0, size.width, size.height)]; [self setNeedsDisplay:YES]; [window setHasShadow:NO]; }

1 0

r38205 - trunk/libvo/osx_objc_common.m
by reimar 29 Dec '20

29 Dec '20

Author: reimar Date: Tue Dec 29 06:43:38 2020 New Revision: 38205 Log: osx_objc_common: Fix video size on "retina" displays. Modified: trunk/libvo/osx_objc_common.m Modified: trunk/libvo/osx_objc_common.m ============================================================================== --- trunk/libvo/osx_objc_common.m Mon Dec 28 21:05:45 2020 (r38204) +++ trunk/libvo/osx_objc_common.m Tue Dec 29 06:43:38 2020 (r38205) @@ -20,6 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#define GL_SILENCE_DEPRECATION + #import "osx_objc_common.h" #include <Carbon/Carbon.h> #include <CoreServices/CoreServices.h> @@ -241,9 +243,13 @@ void vo_osx_swap_buffers(void) - (void)reshape { + [super reshape]; NSRect frame = [self frame]; - vo_dwidth = frame.size.width; - vo_dheight = frame.size.height; + NSSize size = frame.size; + if ([self respondsToSelector:@selector(convertSizeToBacking:)]) + size = [self convertSizeToBacking:size]; + vo_dwidth = size.width; + vo_dheight = size.height; event_flags |= VO_EVENT_RESIZE; }

1 0

r38204 - trunk/configure
by reimar 28 Dec '20

28 Dec '20

Author: reimar Date: Mon Dec 28 21:05:45 2020 New Revision: 38204 Log: configure: Add proper detection for HAVE_AS_FUNC. Fixes compilation on MacOS with M1 CPUs. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Nov 30 13:16:39 2020 (r38203) +++ trunk/configure Mon Dec 28 21:05:45 2020 (r38204) @@ -3159,6 +3159,13 @@ else have_yasm="no" fi #if x86 +echocheck "as_func" +def_as_func='#define HAVE_AS_FUNC 0' +echo '.func test +.endfunc' > $TMPS +$_as $TMPS -o $TMPEXE > /dev/null 2>&1 && def_as_func='#define HAVE_AS_FUNC 1' && as_func=yes || as_func=no +echores "$as_func" + #FIXME: This should happen before the check for CFLAGS.. def_altivec_h='#define HAVE_ALTIVEC_H 0' if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ) ; then @@ -9427,7 +9434,7 @@ $def_openssl #define HAVE_AS_ARCH_DIRECTIVE 1 #define HAVE_AS_DN_DIRECTIVE 1 #define HAVE_AS_FPU_DIRECTIVE 1 -#define HAVE_AS_FUNC 1 +$def_as_func #define HAVE_AS_OBJECT_ARCH 1 #define HAVE_ASM_MOD_Q 1 #define HAVE_ATOMICS_GCC 1

1 0