MacOS X port : native QuickTime video output, courtesy of Florian G.

Pflug <fgp@phlo.org>. Use it with -I macosx_qt.

diff --git a/AUTHORS b/AUTHORS
index 776302b1af9319fa4807e6d1114c7dc5b095b34a..d2bc095d813e02cbd4f28c0baa0c5cf20d5dd583 100644 (file)
--- 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 a4201d918833f4512aa9628609ee8c661fe1976d..d5f5aa448315289fea84c3ab22ae7146dc1b733c 100644 (file)
--- 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 ea1ecc23962909acf25e8a85c77f91e026bfb7df..7ed641a18fbdcbecc63f1be07d62b247299537fc 100755 (executable)
--- 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 <<EOF
 #define $ac_tr_hdr 1
 EOF
- 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"
    

diff --git a/configure.in b/configure.in
index 3b3e040608cd2b0f85d2eefee85bbbd940c498ee..8556cdcb82707772cb647fe4273f9db742c4871a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -491,9 +491,9 @@ AC_ARG_WITH(tuning,
 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
 
@@ -740,14 +740,14 @@ AC_ARG_ENABLE(macosx,
   [  --enable-macosx         MacOS X support (default enabled on MacOS X)],
   [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],
   [AC_CHECK_HEADERS(Carbon/Carbon.h,
-     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"
    )])

diff --git a/plugins/macosx/Makefile b/plugins/macosx/Makefile
index fcdc7b0d33fa05a7b2fc56e9c36c4671d457a02a..994f3f4ab685779ffe044b1c45196dcb8b192c6e 100644 (file)
--- a/plugins/macosx/Makefile
+++ b/plugins/macosx/Makefile
@@ -7,10 +7,16 @@
 # Objects
 #
 
-PLUGIN_MACOSX = macosx.o intf_macosx.o aout_macosx.o vout_macosx.o
-BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_%.o)
+PLUGIN_MACOSX = macosx.o intf_macosx.o vout_macosx.o
+PLUGIN_MACOSXQT = macosx_qt.o intf_macosx_qt.o vout_macosx_qt.o
+PLUGIN_MACOSXCOMMON = aout_macosx.o
 
-ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
+BUILTIN_MACOSX = $(PLUGIN_MACOSX:%.o=BUILTIN_MACOSX_%.o) \
+               $(PLUGIN_MACOSXCOMMON:%.o=BUILTIN_MACOSX_%.o)
+BUILTIN_MACOSXQT = $(PLUGIN_MACOSXQT:%.o=BUILTIN_MACOSXQT_%.o)  \
+               $(PLUGIN_MACOSXCOMMON:%.o=BUILTIN_MACOSXQT_%.o)
+
+ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX) $(PLUGIN_MACOSXQT) $(BUILTIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON)
 
 #
 # Virtual targets
@@ -18,22 +24,33 @@ ALL_OBJ = $(PLUGIN_MACOSX) $(BUILTIN_MACOSX)
 
 include ../../Makefile.modules
 
-$(PLUGIN_MACOSX): %.o: .dep/%.d
+$(PLUGIN_MACOSX) $(PLUGIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON): %.o: .dep/%.d
 $(PLUGIN_MACOSX): %.o: %.c
        $(CC) $(CFLAGS) $(PCFLAGS) -fpascal-strings -c -o $@ $<
 
-$(BUILTIN_MACOSX): BUILTIN_%.o: .dep/%.d
-$(BUILTIN_MACOSX): BUILTIN_%.o: %.c
-       $(CC) $(CFLAGS) -DBUILTIN -fpascal-strings -c -o $@ $<
+$(BUILTIN_MACOSX): BUILTIN_MACOSX_%.o: .dep/%.d
+$(BUILTIN_MACOSX): BUILTIN_MACOSX_%.o: %.c
+       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=macosx -fpascal-strings -c -o $@ $<
+
+$(BUILTIN_MACOSXQT): BUILTIN_MACOSXQT_%.o: .dep/%.d
+$(BUILTIN_MACOSXQT): BUILTIN_MACOSXQT_%.o: %.c
+       $(CC) $(CFLAGS) -DBUILTIN -DMODULE_NAME=macosx_qt -fpascal-strings -c -o $@ $<
 
 #
 # Real targets
 #
 
-../macosx.so: $(PLUGIN_MACOSX)
+../macosx.so: $(PLUGIN_MACOSX) $(PLUGIN_MACOSXCOMMON)
        $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
 
 ../macosx.a: $(BUILTIN_MACOSX)
        ar r $@ $^
        $(RANLIB) $@
 
+../macosx_qt.so: $(PLUGIN_MACOSXQT) $(PLUGIN_MACOSXCOMMON)
+       $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) $(LIB_MACOSX)
+
+../macosx_qt.a: $(BUILTIN_MACOSXQT)
+       ar r $@ $^
+       $(RANLIB) $@
+

diff --git a/plugins/macosx/aout_macosx.c b/plugins/macosx/aout_macosx.c
index 0f5b03b03742bb1744b276c86f9f27bcdc77e3b0..1b04162e0293e3a463638074e4ebf3b2d38f8259 100644 (file)
--- a/plugins/macosx/aout_macosx.c
+++ b/plugins/macosx/aout_macosx.c
@@ -2,7 +2,7 @@
  * aout_darwin.c : Darwin audio output plugin
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: aout_macosx.c,v 1.3 2001/07/12 20:44:52 reno Exp $
+ * $Id: aout_macosx.c,v 1.4 2001/10/08 16:20:25 massiot Exp $
  *
  * Authors: Colin Delacroix <colin@zoy.org>
  *
@@ -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 6b28e413aa6214fe78808c35725eb322575bf097..0fe2fab7eb9ecfff46c1f3a90f3316b103e8dc7d 100644 (file)
--- 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 76ee87cceaa070766b03e2f781c83219d70454d9..31bd1a4871823012c890382e12e3c5a67c32dd8a 100644 (file)
--- 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 <colin@zoy.org>
  *          Eugenio Jarosiewicz <ej0@cise.ufl.edu>
@@ -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 8bfc7d053613f3d709ad2b49d249011c0cfc22ee..78388a447029ab26b871c6d87ad9451db905add1 100755 (executable)
--- 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 <colin@zoy.org>
  *

diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c
index ac171ae7cb36958cfd32e46d0281a41af47b15ef..b58dae5c0104730f2269137110d71b01fe0e8f60 100644 (file)
--- 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"
 
 /*****************************************************************************