From: Christophe Massiot Date: Mon, 8 Oct 2001 16:20:25 +0000 (+0000) Subject: MacOS X port : native QuickTime video output, courtesy of Florian G. X-Git-Tag: 0.2.91~81 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=28c71156ee8820ea39f183ec9a9b8d7fcc386ea3;p=vlc MacOS X port : native QuickTime video output, courtesy of Florian G. Pflug . Use it with -I macosx_qt. --- diff --git a/AUTHORS b/AUTHORS index 776302b1af..d2bc095d81 100644 --- a/AUTHORS +++ b/AUTHORS @@ -55,8 +55,8 @@ E: ndeb@ece.cmu.edu D: Minor autoconf and Makefile fixes N: Cyril Deguet -C: asmax E: asmax@via.ecp.fr +C: asmax D: PS input packet allocator N: Colin Delacroix @@ -190,11 +190,16 @@ C: massiot D: MPEG PS input D: bitstream and input core functions D: MPEG video decoder +D: Many ports N: Arkadiusz Miskiewicz E: misiek@pld.ORG.PL D: autoconf and Makefile patches +N: Florian G. Pflug +E: fgp@phlo.org +D: MacOS X port + N: Olivier Pomel E: pomel@via.ecp.fr C: pomel diff --git a/Makefile b/Makefile index a4201d9188..d5f5aa4483 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ PLUGINS_DIR := alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downm # # All possible plugin objects # -PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext idct/idctaltivec imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx mga/mga motion/motion motion/motionmmx motion/motionmmxext motion/motion3dnow motion/motionaltivec mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx +PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext idct/idctaltivec imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx macosx/macosx_qt mga/mga motion/motion motion/motionmmx motion/motionmmxext motion/motion3dnow motion/motionaltivec mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx # # C Objects diff --git a/configure b/configure index ea1ecc2396..7ed641a18f 100755 --- a/configure +++ b/configure @@ -4330,9 +4330,9 @@ fi if test "x$withval" != "x"; then TUNING=$withval else - if test x$ARCH = xi686; then TUNING="pentiumpro" + if test x${target_cpu} = xi686; then TUNING="pentiumpro" else - if test x$ARCH = ppc; then TUNING="750"; fi + if test x${target_cpu} = xpowerpc; then TUNING="750"; fi fi fi @@ -4677,8 +4677,8 @@ if test "${enable_macosx+set}" = set; then enableval="$enable_macosx" if test x$enable_macosx = xyes then - BUILTINS="${BUILTINS} macosx" - LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL" + BUILTINS="${BUILTINS} macosx macosx_qt" + LIB_MACOSX="-framework CoreAudio -framework Carbon -framework AGL -framework QuickTime" LIB_TS="${LIB_TS} -framework AGL -framework Carbon" LIB_SDL="${LIB_SDL} -framework AGL -framework Carbon" fi @@ -4717,8 +4717,8 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then cat >> confdefs.h < * @@ -34,7 +34,6 @@ * Find 8 bits files and adapt output */ -#define MODULE_NAME macosx #include "modules_inner.h" /***************************************************************************** @@ -96,17 +95,17 @@ static void aout_Play ( aout_thread_t *p_aout, byte_t *buffer, int i_size ); static void aout_Close ( aout_thread_t *p_aout ); -OSStatus appIOProc( AudioDeviceID inDevice, const AudioTimeStamp* inNow, +static OSStatus appIOProc( AudioDeviceID inDevice, const AudioTimeStamp* inNow, const void* inInputData, const AudioTimeStamp* inInputTime, AudioBufferList* outOutputData, const AudioTimeStamp* inOutputTime, void* threadGlobals ); -void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, +static void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, UInt32 ui_totalBytes ); -void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, +static void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, UInt32 p_totalBytes ); -void Convert8BitIntegerTo32Float( Ptr in8BitDataPtr, Ptr p_out32BitDataPtr, +static void Convert8BitIntegerTo32Float( Ptr in8BitDataPtr, Ptr p_out32BitDataPtr, UInt32 ui_totalBytes ); /***************************************************************************** @@ -371,7 +370,7 @@ static long aout_GetBufInfo( aout_thread_t *p_aout, long l_buffer_limit ) /***************************************************************************** * appIOProc : callback for audio output *****************************************************************************/ -OSStatus appIOProc( AudioDeviceID inDevice, const AudioTimeStamp* inNow, +static OSStatus appIOProc( AudioDeviceID inDevice, const AudioTimeStamp* inNow, const void* inInputData, const AudioTimeStamp* inInputTime, AudioBufferList* outOutputData, const AudioTimeStamp* inOutputTime, void* threadGlobals ) @@ -436,7 +435,7 @@ static void aout_Close( aout_thread_t *p_aout ) /***************************************************************************** * Convert16BitIntegerTo32Float *****************************************************************************/ -void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, +static void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, UInt32 ui_totalBytes ) { UInt32 i, ui_samples = ui_totalBytes / 2 /* each 16 bit sample is 2 bytes */; @@ -458,7 +457,7 @@ void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, /***************************************************************************** * Convert16BitIntegerTo32FloatWithByteSwap *****************************************************************************/ -void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, +static void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, UInt32 ui_totalBytes ) { @@ -482,7 +481,7 @@ void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, /***************************************************************************** * Convert8BitIntegerTo32Float *****************************************************************************/ -void Convert8BitIntegerTo32Float( Ptr p_in8BitDataPtr, Ptr p_out32BitDataPtr, +static void Convert8BitIntegerTo32Float( Ptr p_in8BitDataPtr, Ptr p_out32BitDataPtr, UInt32 ui_totalBytes ) { UInt32 i, ui_samples = ui_totalBytes; diff --git a/plugins/macosx/intf_macosx.c b/plugins/macosx/intf_macosx.c index 6b28e413aa..0fe2fab7eb 100644 --- a/plugins/macosx/intf_macosx.c +++ b/plugins/macosx/intf_macosx.c @@ -20,7 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#define MODULE_NAME macosx #include "modules_inner.h" /***************************************************************************** diff --git a/plugins/macosx/macosx.c b/plugins/macosx/macosx.c index 76ee87ccea..31bd1a4871 100644 --- a/plugins/macosx/macosx.c +++ b/plugins/macosx/macosx.c @@ -2,7 +2,7 @@ * macosx.c : MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $Id: macosx.c,v 1.5 2001/05/30 17:03:12 sam Exp $ + * $Id: macosx.c,v 1.6 2001/10/08 16:20:25 massiot Exp $ * * Authors: Colin Delacroix * Eugenio Jarosiewicz @@ -22,7 +22,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#define MODULE_NAME macosx #include "modules_inner.h" /***************************************************************************** diff --git a/plugins/macosx/macosx_common.h b/plugins/macosx/macosx_common.h index 8bfc7d0536..78388a4470 100755 --- a/plugins/macosx/macosx_common.h +++ b/plugins/macosx/macosx_common.h @@ -2,7 +2,7 @@ * macosx.c : MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN - * $$ + * $Id: macosx_common.h,v 1.3 2001/10/08 16:20:25 massiot Exp $ * * Authors: Colin Delacroix * diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c index ac171ae7cb..b58dae5c01 100644 --- a/plugins/macosx/vout_macosx.c +++ b/plugins/macosx/vout_macosx.c @@ -20,7 +20,6 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ -#define MODULE_NAME macosx #include "modules_inner.h" /*****************************************************************************