From: Sam Hocevar Date: Wed, 21 Mar 2001 13:42:35 +0000 (+0000) Subject: * Header cleaning: filled all empty authors fields, added CVS $Id stuff. X-Git-Tag: 0.2.70~31 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4f551c2bf0d189405e96cbbb8234ed3edd9d6d3e;p=vlc * Header cleaning: filled all empty authors fields, added CVS $Id stuff. * Fixes to aout_darwin.c by Colin Delacroix . * Fixes to configure.in, Makefile.in and main.c (Altivec detection) by Eugenio Jarosiewicz . * Added Colin and Eugenio to the AUTHORS file. --- diff --git a/AUTHORS b/AUTHORS index 48ed828464..d8690e14b7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -30,6 +30,10 @@ N: Renaud Dartus E: reno@via.ecp.fr D: AC3 decoder +N: Colin Delacroix +E: colin@zoy.org +D: MacOS X sound support + N: Jean-Marc Dressler E: polux@via.ecp.fr D: BeOS port @@ -62,6 +66,10 @@ D: playlist and modules system D: Gnome and Gtk+ interfaces, Glide and fb video outputs, Esound audio output D: DVD subtitles decoder +N: Eugenio Jarosiewicz +E: ej0@cise.ufl.edu +D: MacOS X interface and fixes + N: Brieuc Jeunhomme E: bbp@via.ecp.fr D: Bug fixes diff --git a/Makefile.in b/Makefile.in index add4a4947c..7641d023ec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -96,7 +96,7 @@ LIB += -ldl -lsocket -lnsl -lpthread endif ifneq (,$(findstring darwin,$(SYS))) -LIB += -ldl -framework Carbon +LIB += -ldl endif ifeq ($(SYS),beos) @@ -717,7 +717,7 @@ lib/idctmmxext.so: $(PLUGIN_IDCTMMXEXT) $(PLUGIN_IDCTCOMMON) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) lib/idctaltivec.so: $(PLUGIN_IDCTALTIVEC) $(PLUGIN_IDCTCOMMON) - $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework VecLib + $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -framework vecLib lib/kde.so: $(PLUGIN_KDE) $(CC) $(PCFLAGS) -o $@ $^ $(PLCFLAGS) -lkdeui -lkdecore -lqt -ldl diff --git a/configure b/configure index cba5ebfbba..2a6bc061fc 100755 --- a/configure +++ b/configure @@ -20,7 +20,7 @@ ac_help="$ac_help ac_help="$ac_help --disable-mmx Disable MMX optimizations (default enabled for x86)" ac_help="$ac_help - --enable-activec Enable altivec optimizations (default enabled for PPC)" + --enable-altivec Enable altivec optimizations (default enabled for PPC)" ac_help="$ac_help --disable-css Disable DVD CSS decryption (default enabled)" ac_help="$ac_help diff --git a/configure.in b/configure.in index a9154ab0fc..45251e488c 100644 --- a/configure.in +++ b/configure.in @@ -130,7 +130,7 @@ AC_ARG_ENABLE(mmx, [ if test x$enableval = xyes; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ], [ if test x${host_cpu} = xi686 -o x${host_cpu} = xi586 -o x${host_cpu} = xx86; then ARCH=${ARCH}" mmx"; PLUGINS=${PLUGINS}${ACCEL_PLUGINS}; fi ]) AC_ARG_ENABLE(altivec, -[ --enable-activec Enable altivec optimizations (default enabled for PPC)], +[ --enable-altivec Enable altivec optimizations (default enabled for PPC)], [ if test x$enableval = xyes; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ], [ if test -d /System/Library/Frameworks/vecLib.framework; then ARCH=${ARCH}" altivec"; PLUGINS=${PLUGINS}"idctaltivec "; fi ]) AC_ARG_ENABLE(css, diff --git a/include/audio_output.h b/include/audio_output.h index 6b9a39dd33..71309dd2a1 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -2,9 +2,9 @@ * audio_output.h : audio output thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: audio_output.h,v 1.31 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Michel Kaempf + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/beos_specific.h b/include/beos_specific.h index f23b03e960..4336a2b550 100644 --- a/include/beos_specific.h +++ b/include/beos_specific.h @@ -2,9 +2,9 @@ * beos_init.h: Initialization for BeOS specific features ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: beos_specific.h,v 1.4 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Jean-Marc Dressler + * Authors: Jean-Marc Dressler * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/debug.h b/include/debug.h index 0a240ac2df..d3ecd91524 100644 --- a/include/debug.h +++ b/include/debug.h @@ -3,6 +3,7 @@ * Stand alone file ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: debug.h,v 1.8 2001/03/21 13:42:33 sam Exp $ * * Authors: Benoît Steiner * diff --git a/include/int_types.h b/include/int_types.h index 2c24151b98..b4bcc140d7 100644 --- a/include/int_types.h +++ b/include/int_types.h @@ -2,6 +2,7 @@ * int_types.h: internal types ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: int_types.h,v 1.6 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/include/interface.h b/include/interface.h index 32cc4b1cc6..ba86301b39 100644 --- a/include/interface.h +++ b/include/interface.h @@ -4,8 +4,9 @@ * interface, such as message output. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: interface.h,v 1.22 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/intf_msg.h b/include/intf_msg.h index 903fce5ba5..5ab153c6b7 100644 --- a/include/intf_msg.h +++ b/include/intf_msg.h @@ -4,8 +4,9 @@ * interface, such as message output. See config.h for output configuration. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_msg.h,v 1.11 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/intf_playlist.h b/include/intf_playlist.h index 86d4c7dd0e..5f6b1c9ae1 100644 --- a/include/intf_playlist.h +++ b/include/intf_playlist.h @@ -2,6 +2,7 @@ * intf_playlist.h : Playlist functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_playlist.h,v 1.2 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/include/main.h b/include/main.h index 9e52f66b1e..d01d6e0086 100644 --- a/include/main.h +++ b/include/main.h @@ -3,6 +3,7 @@ * Declaration and extern access to global program object. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: main.h,v 1.14 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/include/modules.h b/include/modules.h index 7356ec08f2..34d043e4ec 100644 --- a/include/modules.h +++ b/include/modules.h @@ -2,6 +2,7 @@ * modules.h : Module management functions. ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: modules.h,v 1.19 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/include/modules_core.h b/include/modules_core.h index f48333f7fa..ed15f3a460 100644 --- a/include/modules_core.h +++ b/include/modules_core.h @@ -2,6 +2,7 @@ * modules_core.h : Module management functions used by the core application. ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: modules_core.h,v 1.5 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/include/modules_inner.h b/include/modules_inner.h index cc9c36f867..df635e3aa9 100644 --- a/include/modules_inner.h +++ b/include/modules_inner.h @@ -2,6 +2,7 @@ * modules_inner.h : Macros used from within a module. ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: modules_inner.h,v 1.6 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/include/mpeg_system.h b/include/mpeg_system.h index 0d541f1b6b..4b44666522 100644 --- a/include/mpeg_system.h +++ b/include/mpeg_system.h @@ -3,9 +3,9 @@ * and TS system layers ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: mpeg_system.h,v 1.2 2001/02/21 04:38:59 henri Exp $ + * $Id: mpeg_system.h,v 1.3 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/include/mtime.h b/include/mtime.h index e721c96493..193a2b1b05 100644 --- a/include/mtime.h +++ b/include/mtime.h @@ -9,6 +9,7 @@ * Functions prototyped are implemented in interface/mtime.c. ***************************************************************************** * Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN + * $Id: mtime.h,v 1.7 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/include/netutils.h b/include/netutils.h index c7649c2c27..123134d8ec 100644 --- a/include/netutils.h +++ b/include/netutils.h @@ -4,6 +4,7 @@ * modules. ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: netutils.h,v 1.9 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * Henri Fallon diff --git a/include/rsc_files.h b/include/rsc_files.h index e8a5a667a0..fa8af4cf25 100644 --- a/include/rsc_files.h +++ b/include/rsc_files.h @@ -4,6 +4,7 @@ * can be anything, including pictures, audio streams, and so on. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: rsc_files.h,v 1.7 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/include/tests.h b/include/tests.h index 7443dfb63a..4b1fe8302d 100644 --- a/include/tests.h +++ b/include/tests.h @@ -2,6 +2,7 @@ * tests.h: several test functions needed by the plugins ***************************************************************************** * Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN + * $Id: tests.h,v 1.9 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/include/threads.h b/include/threads.h index a36c95c08d..1bc62cc4c7 100644 --- a/include/threads.h +++ b/include/threads.h @@ -3,6 +3,7 @@ * This header provides a portable threads implementation. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: threads.h,v 1.16 2001/03/21 13:42:33 sam Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar diff --git a/include/video.h b/include/video.h index e54ebee46a..8373d4500b 100644 --- a/include/video.h +++ b/include/video.h @@ -4,6 +4,7 @@ * includes all common video types and constants. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video.h,v 1.29 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/include/video_output.h b/include/video_output.h index 564a9f70ec..c654fdbe74 100644 --- a/include/video_output.h +++ b/include/video_output.h @@ -5,6 +5,7 @@ * thread, and destroy a previously oppenned video output thread. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_output.h,v 1.57 2001/03/21 13:42:33 sam Exp $ * * Authors: Vincent Seguin * diff --git a/plugins/alsa/alsa.c b/plugins/alsa/alsa.c index aa4d58a237..b389359008 100644 --- a/plugins/alsa/alsa.c +++ b/plugins/alsa/alsa.c @@ -2,9 +2,9 @@ * alsa.c : alsa plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: alsa.c,v 1.8 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Henri Fallon + * Authors: Henri Fallon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/alsa/aout_alsa.c b/plugins/alsa/aout_alsa.c index f7a1b93d28..a43f0aa64f 100644 --- a/plugins/alsa/aout_alsa.c +++ b/plugins/alsa/aout_alsa.c @@ -2,9 +2,9 @@ * aout_alsa.c : Alsa functions library ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: aout_alsa.c,v 1.12 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Henri Fallon + * Authors: Henri Fallon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/Bitmaps.h b/plugins/beos/Bitmaps.h index 93bc5e6bff..87e05c8033 100644 --- a/plugins/beos/Bitmaps.h +++ b/plugins/beos/Bitmaps.h @@ -2,9 +2,9 @@ * Bitmaps.h ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: Bitmaps.h,v 1.4 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Tony Castley + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/DrawingTidbits.cpp b/plugins/beos/DrawingTidbits.cpp index cf04ebccec..771c1bd9f5 100644 --- a/plugins/beos/DrawingTidbits.cpp +++ b/plugins/beos/DrawingTidbits.cpp @@ -2,8 +2,9 @@ * DrawingTidbits.cpp ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: DrawingTidbits.cpp,v 1.2 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/DrawingTidbits.h b/plugins/beos/DrawingTidbits.h index b436c01335..ea784f3244 100644 --- a/plugins/beos/DrawingTidbits.h +++ b/plugins/beos/DrawingTidbits.h @@ -2,8 +2,9 @@ * DrawingTidbits.h ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: DrawingTidbits.h,v 1.2 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/InterfaceWindow.h b/plugins/beos/InterfaceWindow.h index e2effc116f..bddb8c3e98 100644 --- a/plugins/beos/InterfaceWindow.h +++ b/plugins/beos/InterfaceWindow.h @@ -2,6 +2,7 @@ * InterfaceWindow.h: BeOS interface window class prototype ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: InterfaceWindow.h,v 1.8 2001/03/21 13:42:33 sam Exp $ * * Authors: Jean-Marc Dressler * Tony Castley diff --git a/plugins/beos/MsgVals.h b/plugins/beos/MsgVals.h index 11c94babf7..4b1e07ff63 100644 --- a/plugins/beos/MsgVals.h +++ b/plugins/beos/MsgVals.h @@ -2,9 +2,9 @@ * MsgVals.h ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: MsgVals.h,v 1.4 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Tony Castley + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/TransportButton.cpp b/plugins/beos/TransportButton.cpp index 3765c31c2f..e595351007 100644 --- a/plugins/beos/TransportButton.cpp +++ b/plugins/beos/TransportButton.cpp @@ -2,9 +2,9 @@ * TransportButton.cpp ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: TransportButton.cpp,v 1.3 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Tony Castley + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/TransportButton.h b/plugins/beos/TransportButton.h index aae79e84a1..4796c0afe5 100644 --- a/plugins/beos/TransportButton.h +++ b/plugins/beos/TransportButton.h @@ -2,9 +2,9 @@ * TransportButton.h ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: TransportButton.h,v 1.3 2001/03/21 13:42:33 sam Exp $ * - * Authors: - * Tony Castley + * Authors: Tony Castley * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/beos/VideoWindow.h b/plugins/beos/VideoWindow.h index 9052e915ce..38695a04ab 100644 --- a/plugins/beos/VideoWindow.h +++ b/plugins/beos/VideoWindow.h @@ -2,6 +2,7 @@ * VideoWindow.h: BeOS video window class prototype ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: VideoWindow.h,v 1.4 2001/03/21 13:42:33 sam Exp $ * * Authors: Jean-Marc Dressler * Tony Castley diff --git a/plugins/beos/beos.cpp b/plugins/beos/beos.cpp index 27ee8f3e90..4bbf5e5874 100644 --- a/plugins/beos/beos.cpp +++ b/plugins/beos/beos.cpp @@ -2,6 +2,7 @@ * beos.cpp : BeOS plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: beos.cpp,v 1.9 2001/03/21 13:42:33 sam Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar diff --git a/plugins/beos/vout_beos.cpp b/plugins/beos/vout_beos.cpp index a29b59d6ce..61023167b5 100644 --- a/plugins/beos/vout_beos.cpp +++ b/plugins/beos/vout_beos.cpp @@ -2,6 +2,7 @@ * vout_beos.cpp: beos video output display method ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: vout_beos.cpp,v 1.22 2001/03/21 13:42:33 sam Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar diff --git a/plugins/darwin/aout_darwin.c b/plugins/darwin/aout_darwin.c index e883fc5d14..7774917e4d 100644 --- a/plugins/darwin/aout_darwin.c +++ b/plugins/darwin/aout_darwin.c @@ -2,8 +2,9 @@ * aout_darwin.c : Darwin audio output plugin ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: aout_darwin.c,v 1.3 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Colin Delacroix * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +21,19 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. *****************************************************************************/ +/* + * 2001/03/21 + * Status of audio under Darwin + * It currently works with 16 bits signed big endian mpeg 1 audio + * (and probably mpeg 2). This is the most common case. + * Note: ac3 decoder is currently broken under Darwin + * + * TODO: + * Find little endian files and adapt output + * Find unsigned files and adapt output + * Find 8 bits files and adapt output + */ + #define MODULE_NAME darwin #include "modules_inner.h" @@ -46,6 +60,10 @@ #include +/* + * Debug: to dump the output of the decoder directly to a file + * May disappear when AC3 decoder will work on Darwin + */ #define WRITE_AUDIO_OUTPUT_TO_FILE 0 /***************************************************************************** @@ -57,16 +75,14 @@ typedef struct aout_sys_s { #if WRITE_AUDIO_OUTPUT_TO_FILE - int fd; // debug + int fd; // debug: fd to dump audio #endif - // unsigned long sizeOfDataInMemory; // size in bytes of the 32 bit float data stored in memory - Ptr p_Data; // Ptr to the 32 bit float data stored in memory - // Ptr currentDataLocationPtr; // location of the next chunk of data to send to the HAL - AudioDeviceID device; // the default device - UInt32 ui_deviceBufferSize; // bufferSize returned by kAudioDevicePropertyBufferSize AudioStreamBasicDescription deviceFormat; // info about the default device - vlc_mutex_t mutex_lock; - vlc_cond_t cond_sync; + AudioDeviceID device; // the default device + Ptr p_Data; // ptr to the 32 bit float data + UInt32 ui_deviceBufferSize; // audio device buffer size + vlc_mutex_t mutex_lock; // pthread locks for sync of + vlc_cond_t cond_sync; // aout_Play and callback } aout_sys_t; /***************************************************************************** @@ -80,13 +96,18 @@ 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, - const void* inInputData, const AudioTimeStamp* inInputTime, - AudioBufferList* outOutputData, const AudioTimeStamp* inOutputTime, - void* appGlobals ); -void Convert16BitIntegerTo32Float( Ptr in16BitDataPtr, Ptr out32BitDataPtr, UInt32 totalBytes ); -void Convert16BitIntegerTo32FloatWithByteSwap( Ptr in16BitDataPtr, Ptr out32BitDataPtr, UInt32 totalBytes ); -void Convert8BitIntegerTo32Float( Ptr in8BitDataPtr, Ptr out32BitDataPtr, UInt32 totalBytes ); +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, + UInt32 ui_totalBytes ); +void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, + Ptr p_out32BitDataPtr, + UInt32 p_totalBytes ); +void Convert8BitIntegerTo32Float( Ptr in8BitDataPtr, Ptr p_out32BitDataPtr, + UInt32 ui_totalBytes ); /***************************************************************************** * Functions exported as capabilities. They are declared as static so that @@ -122,7 +143,7 @@ static int aout_Probe( probedata_t *p_data ) static int aout_Open( aout_thread_t *p_aout ) { OSStatus err = noErr; - UInt32 count, bufferSize; + UInt32 ui_paramSize, ui_bufferSize; AudioDeviceID device = kAudioDeviceUnknown; AudioStreamBasicDescription format; @@ -135,66 +156,76 @@ static int aout_Open( aout_thread_t *p_aout ) } /* Initialize some variables */ - p_aout->i_format = AOUT_FORMAT_DEFAULT; - p_aout->i_channels = 1 + main_GetIntVariable( AOUT_STEREO_VAR, + p_aout->i_format = AOUT_FORMAT_DEFAULT; + p_aout->i_channels = 1 + main_GetIntVariable( AOUT_STEREO_VAR, AOUT_STEREO_DEFAULT ); - p_aout->l_rate = main_GetIntVariable( AOUT_RATE_VAR, + p_aout->l_rate = main_GetIntVariable( AOUT_RATE_VAR, AOUT_RATE_DEFAULT ); - p_aout->p_sys->device = kAudioDeviceUnknown; - p_aout->p_sys->p_Data = nil; - // p_aout->p_sys->currentDataLocationPtr = nil; + + p_aout->p_sys->device = kAudioDeviceUnknown; + p_aout->p_sys->p_Data = nil; + + /* + * get the default output device for the HAL + * it is required to pass the size of the data to be returned + */ + ui_paramSize = sizeof( p_aout->p_sys->device ); + err = AudioHardwareGetProperty( kAudioHardwarePropertyDefaultOutputDevice, + &ui_paramSize, (void *) &device ); - // get the default output device for the HAL - // it is required to pass the size of the data to be returned - count = sizeof( p_aout->p_sys->device ); - err = AudioHardwareGetProperty( kAudioHardwarePropertyDefaultOutputDevice, - &count, (void *) &device); if( err == noErr) { - // get the buffersize that the default device uses for IO - // it is required to pass the size of the data to be returned - count = sizeof(p_aout->p_sys->ui_deviceBufferSize); + /* + * The values we get here are not used. We may find another method for + * insuring us that the audio device is working ! + * + * First get the buffersize that the default device uses for IO + */ + ui_paramSize = sizeof( p_aout->p_sys->ui_deviceBufferSize ); err = AudioDeviceGetProperty( device, 0, false, kAudioDevicePropertyBufferSize, - &count, &bufferSize); + &ui_paramSize, &ui_bufferSize); if( err == noErr ) { - // get a description of the data format used by the default device - // it is required to pass the size of the data to be returned - count = sizeof(p_aout->p_sys->deviceFormat); + /* get a description of the data format used by the default device */ + ui_paramSize = sizeof(p_aout->p_sys->deviceFormat); err = AudioDeviceGetProperty( device, 0, false, kAudioDevicePropertyStreamFormat, - &count, &format); + &ui_paramSize, &format); if( err == noErr ) { if( format.mFormatID != kAudioFormatLinearPCM ) return paramErr; - // everything is ok so fill in p_sys - p_aout->p_sys->device = device; - p_aout->p_sys->ui_deviceBufferSize = bufferSize; - p_aout->p_sys->deviceFormat = format; + /* everything is ok so fill in p_sys */ + p_aout->p_sys->device = device; + p_aout->p_sys->ui_deviceBufferSize = ui_bufferSize; + p_aout->p_sys->deviceFormat = format; } } } if (err != noErr) return err; - p_aout->p_sys->ui_deviceBufferSize = 2 * 2 * sizeof(s16) - * ((s64)p_aout->l_rate * AOUT_BUFFER_DURATION) / 1000000; - // p_aout->p_sys->sizeOfDataInMemory = p_aout->p_sys->ui_deviceBufferSize; - + /* + * Size calcul taken from audio_output.c we may change that file so we would + * not be forced to compute the same value twice + */ + p_aout->p_sys->ui_deviceBufferSize = + 2 * 2 * sizeof(s16) * ((s64)p_aout->l_rate * AOUT_BUFFER_DURATION) / 1000000; + + /* Allocate memory for audio */ p_aout->p_sys->p_Data = NewPtrClear( p_aout->p_sys->ui_deviceBufferSize ); if( p_aout->p_sys->p_Data == nil ) return paramErr; #if WRITE_AUDIO_OUTPUT_TO_FILE p_aout->p_sys->fd = open( "/Users/bofh/audio-darwin.pcm", O_RDWR|O_CREAT ); - intf_ErrMsg( "open(...) -> %d", p_aout->p_sys->fd ); + intf_WarnMsg( "open(...) -> %d", p_aout->p_sys->fd ); #endif vlc_cond_init( &p_aout->p_sys->cond_sync ); vlc_mutex_init( &p_aout->p_sys->mutex_lock ); - + return( 0 ); } @@ -204,84 +235,114 @@ static int aout_Open( aout_thread_t *p_aout ) static int aout_SetFormat( aout_thread_t *p_aout ) { OSStatus err = noErr; - UInt32 count, - bufferSize = p_aout->p_sys->ui_deviceBufferSize; + UInt32 ui_paramSize, + ui_bufferSize = p_aout->p_sys->ui_deviceBufferSize; AudioStreamBasicDescription format; - // get the buffersize that the default device uses for IO - // it is required to pass the size of the data to be returned - count = sizeof( bufferSize ); + /* set the buffersize that the default device uses for IO */ + ui_paramSize = sizeof( ui_bufferSize ); err = AudioDeviceSetProperty( p_aout->p_sys->device, 0, 0, false, kAudioDevicePropertyBufferSize, - count, &bufferSize); - intf_ErrMsg( "AudioDeviceSetProperty( buffersize = %d ) -> %d", bufferSize, err ); - - if( err == noErr ) + ui_paramSize, &ui_bufferSize); + if( err != noErr ) + { + /* We have to tell the decoder to use audio device's buffer size */ + intf_ErrMsg( "AudioDeviceSetProperty failed ( buffersize = %d ) -> %d", + ui_bufferSize, err ); + return( -1 ); + } + else { - p_aout->p_sys->ui_deviceBufferSize = bufferSize; + p_aout->p_sys->ui_deviceBufferSize = ui_bufferSize; - // get a description of the data format used by the default device - // it is required to pass the size of the data to be returned - count = sizeof( format ); - /* + ui_paramSize = sizeof( format ); err = AudioDeviceGetProperty( p_aout->p_sys->device, 0, false, kAudioDevicePropertyStreamFormat, - &count, &format); - */ + &ui_paramSize, &format); + if( err == noErr ) { - // intf_ErrMsg( "audio output format is %i", p_aout->i_format ); - if( format.mFormatID != kAudioFormatLinearPCM ) return paramErr; + intf_DbgMsg( "audio output format is %i", p_aout->i_format ); + + /* + * setting format.mFormatFlags to anything but the default value + * doesn't seem to work. Can anybody explain that ?? + */ switch( p_aout->i_format ) { case AOUT_FMT_U8: - break; + intf_ErrMsg( "Audio format (Unsigned 8) not supported now," + "please report stream" ); + return( -1 ); + case AOUT_FMT_S16_LE: /* Little endian signed 16 */ - // intf_ErrMsg( "This means Little endian signed 16" ); - break; + intf_DbgMsg( "This means Little endian signed 16" ); + // format.mFormatFlags &= ~kLinearPCMFormatFlagIsBigEndian; + intf_ErrMsg( "Audio format (LE Unsigned 16) not supported now," + "please report stream" ); + return( -1 ); + case AOUT_FMT_S16_BE: /* Big endian signed 16 */ - // intf_ErrMsg( "This means Big endian signed 16" ); - // format.mFormatFlags &= ~kLinearPCMFormatFlagIsFloat; - // format.mFormatFlags |= kLinearPCMFormatFlagIsFloat; + intf_DbgMsg( "This means big endian signed 16" ); // format.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; - // format.mFormatFlags &= ~kLinearPCMFormatFlagIsBigEndian; - // format.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; - break; + break; + case AOUT_FMT_S8: - break; + intf_ErrMsg( "Audio format (Signed 8) not supported now," + "please report stream" ); + return( -1 ); + case AOUT_FMT_U16_LE: /* Little endian U16 */ - // intf_ErrMsg( "This means Little endian U16" ); - break; + // format.mFormatFlags &= ~kLinearPCMFormatFlagIsSignedInteger; + intf_DbgMsg( "This means Little endian U16" ); + intf_ErrMsg( "Audio format (LE Unsigned 8) not supported now," + "please report stream" ); + return( -1 ); + case AOUT_FMT_U16_BE: /* Big endian U16 */ - // intf_ErrMsg( "This means Big endian U16" ); + // format.mFormatFlags &= ~kLinearPCMFormatFlagIsSignedInteger; + intf_ErrMsg( "Audio format (BE Unsigned 8) not supported now," + "please report stream" ); + return( -1 ); + break; default: - ; // intf_ErrMsg( "This means Unknown aout format" ); + intf_DbgMsg( "This means Unknown aout format" ); + return( -1 ); } - format.mSampleRate = p_aout->l_rate; + /* + * It would have been nice to have these work (no more buffer + * convertion to float) but I couldn't manage to + */ + // format.mFormatFlags &= ~kLinearPCMFormatFlagIsFloat; + // format.mFormatFlags |= kLinearPCMFormatFlagIsFloat; + // format.mFormatFlags |= kLinearPCMFormatFlagIsSignedInteger; + + format.mSampleRate = p_aout->l_rate; format.mChannelsPerFrame = p_aout->i_channels; + err = AudioDeviceSetProperty( p_aout->p_sys->device, 0, 0, false, kAudioDevicePropertyStreamFormat, - count, &format); - /* - intf_ErrMsg( "AudioDeviceSetProperty( mFormatFlags = %x, " - "mSampleRate = %f, " - "mChannelsPerFrame = %d ) " - "-> %d", - format.mFormatFlags, - format.mSampleRate, - format.mChannelsPerFrame, - err ); - */ + ui_paramSize, &format); + if( err != noErr ) + { + intf_ErrMsg( "AudioDeviceSetProperty( mFormatFlags = %x, " + "mSampleRate = %f, mChannelsPerFrame = %d ) -> %d", + format.mFormatFlags, format.mSampleRate, + format.mChannelsPerFrame, err ); + return( -1 ); + } } } + /* add callback */ err = AudioDeviceAddIOProc( p_aout->p_sys->device, (AudioDeviceIOProc)appIOProc, (void *)p_aout->p_sys ); + /* open the output */ if( err == noErr ) err = AudioDeviceStart( p_aout->p_sys->device, (AudioDeviceIOProc)appIOProc ); @@ -295,14 +356,14 @@ static long aout_GetBufInfo( aout_thread_t *p_aout, long l_buffer_limit ) { return( 0 ); // Send data as soon as possible -/* - * Tune me ? - * - return ( p_aout->p_sys->p_Data + /* + * Tune me ? + * + return ( p_aout->p_sys->p_Data + p_aout->p_sys->sizeOfDataInMemory - p_aout->p_sys->currentDataLocationPtr - p_aout->p_sys->ui_deviceBufferSize ); -*/ + */ } /***************************************************************************** @@ -311,14 +372,15 @@ static long aout_GetBufInfo( aout_thread_t *p_aout, long l_buffer_limit ) OSStatus appIOProc( AudioDeviceID inDevice, const AudioTimeStamp* inNow, const void* inInputData, const AudioTimeStamp* inInputTime, AudioBufferList* outOutputData, const AudioTimeStamp* inOutputTime, - void* appGlobals ) + void* threadGlobals ) { - aout_sys_t* p_sys = appGlobals; + aout_sys_t* p_sys = threadGlobals; + /* see aout_Play below */ vlc_mutex_lock( &p_sys->mutex_lock ); vlc_cond_signal( &p_sys->cond_sync ); - // move data into output data buffer + /* move data into output data buffer */ BlockMoveData( p_sys->p_Data, outOutputData->mBuffers[ 0 ].mData, p_sys->ui_deviceBufferSize ); @@ -335,9 +397,14 @@ static void aout_Play( aout_thread_t *p_aout, byte_t *buffer, int i_size ) { #if WRITE_AUDIO_OUTPUT_TO_FILE write( p_aout->p_sys->fd, buffer, i_size ); - // intf_ErrMsg( "write() -> %d", write( p_aout->p_sys->fd, buffer, i_size ) ); + intf_DbgMsg( "write() -> %d", write( p_aout->p_sys->fd, buffer, i_size ) ); #else Convert16BitIntegerTo32Float( buffer, p_aout->p_sys->p_Data, i_size ); + + /* + * wait for a callback to occur (to flush the buffer), so aout_Play + * can't be called twice, losing the data we just wrote. + */ vlc_cond_wait( &p_aout->p_sys->cond_sync, &p_aout->p_sys->mutex_lock ); #endif } @@ -349,15 +416,16 @@ static void aout_Close( aout_thread_t *p_aout ) { OSStatus err = noErr; - // stop playing sound through the device - err = AudioDeviceStop( p_aout->p_sys->device, (AudioDeviceIOProc)appIOProc ); - if (err != noErr) return; - - // remove the IO proc from the device - err = AudioDeviceRemoveIOProc( p_aout->p_sys->device, (AudioDeviceIOProc)appIOProc ); - if (err != noErr) return; + /* stop playing sound through the device */ + err = AudioDeviceStop( p_aout->p_sys->device, + (AudioDeviceIOProc)appIOProc ); + if( err == noErr ) + { + /* remove the callback */ + err = AudioDeviceRemoveIOProc( p_aout->p_sys->device, + (AudioDeviceIOProc)appIOProc ); + } - // vlc_cond_signal( &p_aout->p_sys->cond_sync ); DisposePtr( p_aout->p_sys->p_Data ); return; @@ -366,68 +434,68 @@ static void aout_Close( aout_thread_t *p_aout ) /***************************************************************************** * Convert16BitIntegerTo32Float *****************************************************************************/ -void Convert16BitIntegerTo32Float( Ptr in16BitDataPtr, Ptr out32BitDataPtr, - UInt32 totalBytes ) +void Convert16BitIntegerTo32Float( Ptr p_in16BitDataPtr, Ptr p_out32BitDataPtr, + UInt32 ui_totalBytes ) { - UInt32 i, samples = totalBytes / 2 /* each 16 bit sample is 2 bytes */; - SInt16 *inDataPtr = (SInt16 *) in16BitDataPtr; - Float32 *outDataPtr = (Float32 *) out32BitDataPtr; + UInt32 i, ui_samples = ui_totalBytes / 2 /* each 16 bit sample is 2 bytes */; + SInt16 *p_s_inDataPtr = (SInt16 *) p_in16BitDataPtr; + Float32 *p_f_outDataPtr = (Float32 *) p_out32BitDataPtr; - for( i = 0 ; i < samples ; i++ ) + for( i = 0 ; i < ui_samples ; i++ ) { - *outDataPtr = (Float32)(*inDataPtr); - if( *outDataPtr > 0 ) - *outDataPtr /= 32767.0; + *p_f_outDataPtr = (Float32)(*p_s_inDataPtr); + if( *p_f_outDataPtr > 0 ) + *p_f_outDataPtr /= 32767.0; else - *outDataPtr /= 32768.0; - outDataPtr++; - inDataPtr++; + *p_f_outDataPtr /= 32768.0; + p_f_outDataPtr++; + p_s_inDataPtr++; } } /***************************************************************************** * Convert16BitIntegerTo32FloatWithByteSwap *****************************************************************************/ -void Convert16BitIntegerTo32FloatWithByteSwap( Ptr in16BitDataPtr, - Ptr out32BitDataPtr, - UInt32 totalBytes ) +void Convert16BitIntegerTo32FloatWithByteSwap( Ptr p_in16BitDataPtr, + Ptr p_out32BitDataPtr, + UInt32 ui_totalBytes ) { - UInt32 i, samples = totalBytes / 2 /* each 16 bit sample is 2 bytes */; - SInt16 *inDataPtr = (SInt16 *) in16BitDataPtr; - Float32 *outDataPtr = (Float32 *) out32BitDataPtr; + UInt32 i, ui_samples = ui_totalBytes / 2 /* each 16 bit sample is 2 bytes */; + SInt16 *p_s_inDataPtr = (SInt16 *) p_in16BitDataPtr; + Float32 *p_f_outDataPtr = (Float32 *) p_out32BitDataPtr; - for( i = 0 ; i < samples ; i++ ) + for( i = 0 ; i < ui_samples ; i++ ) { - *outDataPtr = (Float32)CFSwapInt16LittleToHost(*inDataPtr); - if( *outDataPtr > 0 ) - *outDataPtr /= 32767.0; + *p_f_outDataPtr = (Float32)CFSwapInt16LittleToHost(*p_s_inDataPtr); + if( *p_f_outDataPtr > 0 ) + *p_f_outDataPtr /= 32767.0; else - *outDataPtr /= 32768.0; + *p_f_outDataPtr /= 32768.0; - outDataPtr++; - inDataPtr++; + p_f_outDataPtr++; + p_s_inDataPtr++; } } /***************************************************************************** * Convert8BitIntegerTo32Float *****************************************************************************/ -void Convert8BitIntegerTo32Float( Ptr in8BitDataPtr, Ptr out32BitDataPtr, - UInt32 totalBytes ) +void Convert8BitIntegerTo32Float( Ptr p_in8BitDataPtr, Ptr p_out32BitDataPtr, + UInt32 ui_totalBytes ) { - UInt32 i, samples = totalBytes; - SInt8 *inDataPtr = (SInt8 *) in8BitDataPtr; - Float32 *outDataPtr = (Float32 *) out32BitDataPtr; + UInt32 i, ui_samples = ui_totalBytes; + SInt8 *p_c_inDataPtr = (SInt8 *)p_in8BitDataPtr; + Float32 *p_f_outDataPtr = (Float32 *)p_out32BitDataPtr; - for( i = 0 ; i < samples ; i++ ) + for( i = 0 ; i < ui_samples ; i++ ) { - *outDataPtr = (Float32)(*inDataPtr); - if( *outDataPtr > 0 ) - *outDataPtr /= 32767.0; + *p_f_outDataPtr = (Float32)(*p_c_inDataPtr); + if( *p_f_outDataPtr > 0 ) + *p_f_outDataPtr /= 32767.0; else - *outDataPtr /= 32768.0; + *p_f_outDataPtr /= 32768.0; - outDataPtr++; - inDataPtr++; + p_f_outDataPtr++; + p_c_inDataPtr++; } } diff --git a/plugins/darwin/darwin.c b/plugins/darwin/darwin.c index 3cc81f61cb..86fbf0ecd3 100644 --- a/plugins/darwin/darwin.c +++ b/plugins/darwin/darwin.c @@ -2,8 +2,10 @@ * darwin.c : Darwin plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: darwin.c,v 1.3 2001/03/21 13:42:33 sam Exp $ * - * Authors: + * Authors: Colin Delacroix + * Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/dsp/aout_dsp.c b/plugins/dsp/aout_dsp.c index 68468e26e1..94a5572b77 100644 --- a/plugins/dsp/aout_dsp.c +++ b/plugins/dsp/aout_dsp.c @@ -2,6 +2,7 @@ * aout_dsp.c : dsp functions library ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: aout_dsp.c,v 1.12 2001/03/21 13:42:33 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar diff --git a/plugins/dsp/dsp.c b/plugins/dsp/dsp.c index 75222b8461..5115cd945b 100644 --- a/plugins/dsp/dsp.c +++ b/plugins/dsp/dsp.c @@ -2,6 +2,7 @@ * dsp.c : OSS /dev/dsp module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: dsp.c,v 1.8 2001/03/21 13:42:33 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar diff --git a/plugins/dummy/aout_dummy.c b/plugins/dummy/aout_dummy.c index 52a231bb97..1413d645e6 100644 --- a/plugins/dummy/aout_dummy.c +++ b/plugins/dummy/aout_dummy.c @@ -2,6 +2,7 @@ * aout_dummy.c : dummy audio output plugin ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: aout_dummy.c,v 1.10 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/dummy/dummy.c b/plugins/dummy/dummy.c index 8bdc53d17c..5392cc532a 100644 --- a/plugins/dummy/dummy.c +++ b/plugins/dummy/dummy.c @@ -2,6 +2,7 @@ * dummy.c : dummy plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: dummy.c,v 1.8 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/dummy/intf_dummy.c b/plugins/dummy/intf_dummy.c index f22c5533c2..68b6a380ae 100644 --- a/plugins/dummy/intf_dummy.c +++ b/plugins/dummy/intf_dummy.c @@ -2,6 +2,7 @@ * intf_dummy.c: dummy interface plugin ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: intf_dummy.c,v 1.7 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/dummy/vout_dummy.c b/plugins/dummy/vout_dummy.c index 12ae8b3164..834980902f 100644 --- a/plugins/dummy/vout_dummy.c +++ b/plugins/dummy/vout_dummy.c @@ -2,6 +2,7 @@ * vout_dummy.c: Dummy video output display method for testing purposes ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: vout_dummy.c,v 1.7 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/dvd/dvd.c b/plugins/dvd/dvd.c index 5a84bbefc1..0862d6fe1d 100644 --- a/plugins/dvd/dvd.c +++ b/plugins/dvd/dvd.c @@ -2,6 +2,7 @@ * dvd.c : DVD input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: dvd.c,v 1.6 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/dvd/input_dvd.h b/plugins/dvd/input_dvd.h index ff43217be4..4b58c8069c 100644 --- a/plugins/dvd/input_dvd.h +++ b/plugins/dvd/input_dvd.h @@ -2,6 +2,7 @@ * input_dvd.h: thread structure of the DVD plugin ***************************************************************************** * Copyright (C) 1999-2001 VideoLAN + * $Id: input_dvd.h,v 1.13 2001/03/21 13:42:33 sam Exp $ * * Author: Stéphane Borel * diff --git a/plugins/esd/aout_esd.c b/plugins/esd/aout_esd.c index 92b2d2f811..2fe1301f8a 100644 --- a/plugins/esd/aout_esd.c +++ b/plugins/esd/aout_esd.c @@ -2,6 +2,7 @@ * aout_esd.c : Esound functions library ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: aout_esd.c,v 1.11 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/esd/esd.c b/plugins/esd/esd.c index 4595ec8350..c5edb89c30 100644 --- a/plugins/esd/esd.c +++ b/plugins/esd/esd.c @@ -2,6 +2,7 @@ * esd.c : EsounD module ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: esd.c,v 1.7 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/fb/fb.c b/plugins/fb/fb.c index d5fb7a302a..97521df4c6 100644 --- a/plugins/fb/fb.c +++ b/plugins/fb/fb.c @@ -2,6 +2,7 @@ * fb.c : framebuffer plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: fb.c,v 1.5 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/fb/vout_fb.c b/plugins/fb/vout_fb.c index 43a236aa03..ff782c62e9 100644 --- a/plugins/fb/vout_fb.c +++ b/plugins/fb/vout_fb.c @@ -2,6 +2,7 @@ * vout_fb.c: framebuffer video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN + * $Id: vout_fb.c,v 1.10 2001/03/21 13:42:33 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/ggi/ggi.c b/plugins/ggi/ggi.c index a06364bc8b..2af618b654 100644 --- a/plugins/ggi/ggi.c +++ b/plugins/ggi/ggi.c @@ -2,6 +2,7 @@ * ggi.c : GGI plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: ggi.c,v 1.5 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/ggi/vout_ggi.c b/plugins/ggi/vout_ggi.c index b8419c52bd..1e94ab8f8b 100644 --- a/plugins/ggi/vout_ggi.c +++ b/plugins/ggi/vout_ggi.c @@ -2,6 +2,7 @@ * vout_ggi.c: GGI video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN + * $Id: vout_ggi.c,v 1.8 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar diff --git a/plugins/glide/glide.c b/plugins/glide/glide.c index d2a90c2d42..bde18a23dd 100644 --- a/plugins/glide/glide.c +++ b/plugins/glide/glide.c @@ -2,6 +2,7 @@ * glide.c : 3dfx Glide plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: glide.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/glide/vout_glide.c b/plugins/glide/vout_glide.c index 0ec45b70e4..afe5314d50 100644 --- a/plugins/glide/vout_glide.c +++ b/plugins/glide/vout_glide.c @@ -2,6 +2,7 @@ * vout_glide.c: 3dfx video output display method for 3dfx cards ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: vout_glide.c,v 1.6 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/gnome/gnome.c b/plugins/gnome/gnome.c index 1b3c181ebe..67c42de36b 100644 --- a/plugins/gnome/gnome.c +++ b/plugins/gnome/gnome.c @@ -2,6 +2,7 @@ * gnome.c : Gnome plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: gnome.c,v 1.6 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/gnome/gnome_callbacks.c b/plugins/gnome/gnome_callbacks.c index 6e38331af1..e727f93fa5 100644 --- a/plugins/gnome/gnome_callbacks.c +++ b/plugins/gnome/gnome_callbacks.c @@ -2,6 +2,7 @@ * gnome_callbacks.c : Callbacks for the Gnome plugin. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: gnome_callbacks.c,v 1.18 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/gnome/gnome_callbacks.h b/plugins/gnome/gnome_callbacks.h index 7329a93910..2adf77b31b 100644 --- a/plugins/gnome/gnome_callbacks.h +++ b/plugins/gnome/gnome_callbacks.h @@ -2,6 +2,7 @@ * gnome_callbacks.h : Callbacks for the Gnome plugin. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: gnome_callbacks.h,v 1.12 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/gtk/gtk.c b/plugins/gtk/gtk.c index 4459cc2dc8..48298ba74c 100644 --- a/plugins/gtk/gtk.c +++ b/plugins/gtk/gtk.c @@ -2,6 +2,7 @@ * gtk.c : Gtk+ plugin for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: gtk.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/gtk/gtk_callbacks.c b/plugins/gtk/gtk_callbacks.c index 81db397a2a..e0bc5b8cb8 100644 --- a/plugins/gtk/gtk_callbacks.c +++ b/plugins/gtk/gtk_callbacks.c @@ -2,6 +2,7 @@ * gtk_callbacks.c : Callbacks for the Gtk+ plugin. ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: gtk_callbacks.c,v 1.12 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * Stéphane Borel diff --git a/plugins/gtk/gtk_playlist.c b/plugins/gtk/gtk_playlist.c index 381e2505ed..f37821ab5d 100644 --- a/plugins/gtk/gtk_playlist.c +++ b/plugins/gtk/gtk_playlist.c @@ -2,6 +2,7 @@ * gtk_playlist.c : Interface for the playlist dialog ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: gtk_playlist.c,v 1.8 2001/03/21 13:42:34 sam Exp $ * * Authors: Pierre Baillet * diff --git a/plugins/macosx/intf_macosx.c b/plugins/macosx/intf_macosx.c index 0ff815c95e..345a60f1be 100644 --- a/plugins/macosx/intf_macosx.c +++ b/plugins/macosx/intf_macosx.c @@ -2,6 +2,7 @@ * intf_macosx.c: MacOS X interface plugin ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: intf_macosx.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: * diff --git a/plugins/macosx/macosx.c b/plugins/macosx/macosx.c index 7968c15ff6..4145934fd5 100644 --- a/plugins/macosx/macosx.c +++ b/plugins/macosx/macosx.c @@ -2,6 +2,7 @@ * macosx.c : MacOS X plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: macosx.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * * Authors: * diff --git a/plugins/macosx/vout_macosx.c b/plugins/macosx/vout_macosx.c index 50a71e18c4..805ca6977a 100644 --- a/plugins/macosx/vout_macosx.c +++ b/plugins/macosx/vout_macosx.c @@ -2,6 +2,7 @@ * vout_macosx.c: MacOS X video output plugin ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: vout_macosx.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: * diff --git a/plugins/mga/mga.c b/plugins/mga/mga.c index e7c43b1373..fc0c7d6df5 100644 --- a/plugins/mga/mga.c +++ b/plugins/mga/mga.c @@ -2,6 +2,7 @@ * mga.c : Matrox Graphic Array plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: mga.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/mga/vout_mga.c b/plugins/mga/vout_mga.c index 3756f09e99..c40a65ea18 100644 --- a/plugins/mga/vout_mga.c +++ b/plugins/mga/vout_mga.c @@ -2,6 +2,7 @@ * vout_mga.c: MGA video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN + * $Id: vout_mga.c,v 1.7 2001/03/21 13:42:34 sam Exp $ * * Authors: Aaron Holtzman * Samuel Hocevar diff --git a/plugins/mga/vout_mga.h b/plugins/mga/vout_mga.h index fb94e04f05..64b4302eee 100644 --- a/plugins/mga/vout_mga.h +++ b/plugins/mga/vout_mga.h @@ -1,9 +1,11 @@ /***************************************************************************** * vout_mga.h: MGA video output display method headers ***************************************************************************** - * Copyright (C) 1999 Aaron Holtzman * Copyright (C) 2000, 2001 VideoLAN + * $Id: vout_mga.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * + * Authors: Aaron Holtzman + * Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/motion/motion.c b/plugins/motion/motion.c index 1edf768fe0..48038535f2 100644 --- a/plugins/motion/motion.c +++ b/plugins/motion/motion.c @@ -2,8 +2,9 @@ * motion.c : C motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: motion.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/motion/motionmmx.c b/plugins/motion/motionmmx.c index b6f8a9bd40..c036d65102 100644 --- a/plugins/motion/motionmmx.c +++ b/plugins/motion/motionmmx.c @@ -2,8 +2,9 @@ * motionmmx.c : MMX motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: motionmmx.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/motion/motionmmxext.c b/plugins/motion/motionmmxext.c index 93333a75b6..a79f5e5ebf 100644 --- a/plugins/motion/motionmmxext.c +++ b/plugins/motion/motionmmxext.c @@ -2,8 +2,9 @@ * motionmmxext.c : MMX EXT motion compensation module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: motionmmxext.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/mpeg/input_ps.h b/plugins/mpeg/input_ps.h index c4f1fcb7be..86ce47825b 100644 --- a/plugins/mpeg/input_ps.h +++ b/plugins/mpeg/input_ps.h @@ -2,9 +2,9 @@ * input_ps.h: thread structure of the PS plugin ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_ps.h,v 1.1 2001/02/08 04:43:27 sam Exp $ + * $Id: input_ps.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/mpeg/input_ts.h b/plugins/mpeg/input_ts.h index b90f43ccb0..e1a23706e7 100644 --- a/plugins/mpeg/input_ts.h +++ b/plugins/mpeg/input_ts.h @@ -1,10 +1,10 @@ /***************************************************************************** - * input.h: structures of the input not exported to other modules + * input_ts.h: structures of the input not exported to other modules ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_ts.h,v 1.3 2001/03/18 18:48:27 henri Exp $ + * $Id: input_ts.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Henri Fallon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/mpeg/ps.c b/plugins/mpeg/ps.c index 77270f493a..040a60cfdd 100644 --- a/plugins/mpeg/ps.c +++ b/plugins/mpeg/ps.c @@ -2,8 +2,9 @@ * ps.c : Program Stream input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: ps.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Christophe Massiot * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/mpeg/ts.c b/plugins/mpeg/ts.c index 351dcee6e7..5180c4f297 100644 --- a/plugins/mpeg/ts.c +++ b/plugins/mpeg/ts.c @@ -2,8 +2,9 @@ * ts.c : Transport Stream input module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: ts.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Henri Fallon * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/null/null.c b/plugins/null/null.c index 05190efc9a..bfdc2929eb 100644 --- a/plugins/null/null.c +++ b/plugins/null/null.c @@ -2,6 +2,7 @@ * null.c : NULL module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: null.c,v 1.6 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/qt/qt.cpp b/plugins/qt/qt.cpp index 154205908c..cf10997873 100644 --- a/plugins/qt/qt.cpp +++ b/plugins/qt/qt.cpp @@ -2,6 +2,7 @@ * qt.cpp : Qt plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: qt.cpp,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/sdl/aout_sdl.c b/plugins/sdl/aout_sdl.c index 6295f45b2f..a6d2977421 100644 --- a/plugins/sdl/aout_sdl.c +++ b/plugins/sdl/aout_sdl.c @@ -2,6 +2,7 @@ * aout_sdl.c : audio sdl functions library ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: aout_sdl.c,v 1.10 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Samuel Hocevar diff --git a/plugins/sdl/sdl.c b/plugins/sdl/sdl.c index d96f5b56ec..69f6109c2b 100644 --- a/plugins/sdl/sdl.c +++ b/plugins/sdl/sdl.c @@ -2,6 +2,7 @@ * sdl.c : SDL plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: sdl.c,v 1.14 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * Pierre Baillet diff --git a/plugins/sdl/vout_sdl.c b/plugins/sdl/vout_sdl.c index cc3ad30847..3f9325cc6d 100644 --- a/plugins/sdl/vout_sdl.c +++ b/plugins/sdl/vout_sdl.c @@ -2,6 +2,7 @@ * vout_sdl.c: SDL video output display method ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: vout_sdl.c,v 1.45 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * Pierre Baillet diff --git a/plugins/text/intf_ncurses.c b/plugins/text/intf_ncurses.c index 281e6b23f2..d7cfaf04cd 100644 --- a/plugins/text/intf_ncurses.c +++ b/plugins/text/intf_ncurses.c @@ -2,6 +2,7 @@ * intf_ncurses.c: ncurses interface ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: intf_ncurses.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/text/ncurses.c b/plugins/text/ncurses.c index 20ad92672d..13884015bc 100644 --- a/plugins/text/ncurses.c +++ b/plugins/text/ncurses.c @@ -2,6 +2,7 @@ * ncurses.c : NCurses plugin for vlc ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: ncurses.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/x11/x11.c b/plugins/x11/x11.c index 49197bd904..57f6dbbb29 100644 --- a/plugins/x11/x11.c +++ b/plugins/x11/x11.c @@ -2,6 +2,7 @@ * x11.c : X11 plugin for vlc ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: x11.c,v 1.5 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/plugins/yuv/transforms_common.h b/plugins/yuv/transforms_common.h index 87c5a9e3af..938947ebd2 100644 --- a/plugins/yuv/transforms_common.h +++ b/plugins/yuv/transforms_common.h @@ -2,8 +2,9 @@ * transforms_common.h: YUV transformation macros for truecolor ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: transforms_common.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/transforms_yuv.c b/plugins/yuv/transforms_yuv.c index e9c0bf9cbb..ff6e35e149 100644 --- a/plugins/yuv/transforms_yuv.c +++ b/plugins/yuv/transforms_yuv.c @@ -5,6 +5,7 @@ * certain cases by optimized functions. ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: transforms_yuv.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar diff --git a/plugins/yuv/transforms_yuv.h b/plugins/yuv/transforms_yuv.h index da658b47c1..93b8c34d21 100644 --- a/plugins/yuv/transforms_yuv.h +++ b/plugins/yuv/transforms_yuv.h @@ -2,8 +2,9 @@ * transforms_yuv.h: C specific YUV transformation macros ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: transforms_yuv.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/transforms_yuvmmx.c b/plugins/yuv/transforms_yuvmmx.c index b4fa8bfe58..78eba8dbc6 100644 --- a/plugins/yuv/transforms_yuvmmx.c +++ b/plugins/yuv/transforms_yuvmmx.c @@ -3,8 +3,9 @@ * Provides functions to perform the YUV conversion. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: transforms_yuvmmx.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/transforms_yuvmmx.h b/plugins/yuv/transforms_yuvmmx.h index e455480474..b4aedb4932 100644 --- a/plugins/yuv/transforms_yuvmmx.h +++ b/plugins/yuv/transforms_yuvmmx.h @@ -2,13 +2,11 @@ * transforms_yuvmmx.h: MMX YUV transformation assembly ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: transforms_yuvmmx.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: - * Olie Lho - * - * Adapted to VideoLAN by: - * Gaël Hendryckx - * Samuel Hocevar + * Authors: Olie Lho + * Gaël Hendryckx + * Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/video_common.h b/plugins/yuv/video_common.h index f472aa8c26..eee7c38803 100644 --- a/plugins/yuv/video_common.h +++ b/plugins/yuv/video_common.h @@ -5,8 +5,9 @@ * case by optimized functions. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_common.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/video_yuv.c b/plugins/yuv/video_yuv.c index 6991c1fc20..aeb86620da 100644 --- a/plugins/yuv/video_yuv.c +++ b/plugins/yuv/video_yuv.c @@ -5,8 +5,9 @@ * case by optimized functions. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_yuv.c,v 1.12 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/video_yuvmmx.c b/plugins/yuv/video_yuvmmx.c index 4070be87f1..c7cf67f79c 100644 --- a/plugins/yuv/video_yuvmmx.c +++ b/plugins/yuv/video_yuvmmx.c @@ -3,8 +3,9 @@ * Provides functions to perform the YUV conversion. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_yuvmmx.c,v 1.7 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/yuv.c b/plugins/yuv/yuv.c index c714afe8b2..4c85a22473 100644 --- a/plugins/yuv/yuv.c +++ b/plugins/yuv/yuv.c @@ -2,8 +2,9 @@ * yuv.c : C YUV module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: yuv.c,v 1.6 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/plugins/yuv/yuvmmx.c b/plugins/yuv/yuvmmx.c index c7e328a12b..8d21fe7006 100644 --- a/plugins/yuv/yuvmmx.c +++ b/plugins/yuv/yuvmmx.c @@ -2,8 +2,9 @@ * yuvmmx.c : Accelerated MMX YUV module for vlc ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: yuvmmx.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ac3_decoder/ac3_bit_allocate.c b/src/ac3_decoder/ac3_bit_allocate.c index c87a9428fb..e1c6a33ca7 100644 --- a/src/ac3_decoder/ac3_bit_allocate.c +++ b/src/ac3_decoder/ac3_bit_allocate.c @@ -2,6 +2,7 @@ * ac3_bit_allocate.c: ac3 allocation tables ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: ac3_bit_allocate.c,v 1.16 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_bit_stream.h b/src/ac3_decoder/ac3_bit_stream.h index 7c96f32e8c..9a7b04c756 100644 --- a/src/ac3_decoder/ac3_bit_stream.h +++ b/src/ac3_decoder/ac3_bit_stream.h @@ -2,6 +2,7 @@ * ac3_bit_stream.h: getbits functions for the ac3 decoder ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: ac3_bit_stream.h,v 1.9 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Lespinasse * Renaud Dartus diff --git a/src/ac3_decoder/ac3_decoder.c b/src/ac3_decoder/ac3_decoder.c index 1740771fea..a098676c5e 100644 --- a/src/ac3_decoder/ac3_decoder.c +++ b/src/ac3_decoder/ac3_decoder.c @@ -2,6 +2,7 @@ * ac3_decoder.c: core ac3 decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_decoder.c,v 1.28 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse diff --git a/src/ac3_decoder/ac3_decoder.h b/src/ac3_decoder/ac3_decoder.h index 4afb5751d4..6f7f808f24 100644 --- a/src/ac3_decoder/ac3_decoder.h +++ b/src/ac3_decoder/ac3_decoder.h @@ -2,6 +2,7 @@ * ac3_decoder.h : ac3 decoder interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_decoder.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Renaud Dartus diff --git a/src/ac3_decoder/ac3_decoder_thread.h b/src/ac3_decoder/ac3_decoder_thread.h index 9bbeedaa97..a14cf93a38 100644 --- a/src/ac3_decoder/ac3_decoder_thread.h +++ b/src/ac3_decoder/ac3_decoder_thread.h @@ -2,10 +2,9 @@ * ac3_decoder_thread.h : ac3 decoder thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: ac3_decoder_thread.h,v 1.3 2001/01/05 14:45:47 sam Exp $ + * $Id: ac3_decoder_thread.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: - * Michel Kaempf + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ac3_decoder/ac3_downmix.c b/src/ac3_decoder/ac3_downmix.c index d564ada810..e4fc0fad9c 100644 --- a/src/ac3_decoder/ac3_downmix.c +++ b/src/ac3_decoder/ac3_downmix.c @@ -2,6 +2,7 @@ * ac3_downmix.c: ac3 downmix functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_downmix.c,v 1.18 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_downmix.h b/src/ac3_decoder/ac3_downmix.h index e9ab8aa0d6..6e6f4b44a2 100644 --- a/src/ac3_decoder/ac3_downmix.h +++ b/src/ac3_decoder/ac3_downmix.h @@ -2,6 +2,7 @@ * ac3_downmix.h: ac3 downmix functions ***************************************************************************** * Copyright (C) 2000, 2001 VideoLAN + * $Id: ac3_downmix.h,v 1.5 2001/03/21 13:42:34 sam Exp $ * * Authors: Renaud Dartus * diff --git a/src/ac3_decoder/ac3_downmix_c.c b/src/ac3_decoder/ac3_downmix_c.c index 6afbf848a8..474f9ab76e 100644 --- a/src/ac3_decoder/ac3_downmix_c.c +++ b/src/ac3_decoder/ac3_downmix_c.c @@ -2,6 +2,7 @@ * ac3_downmix_c.c: ac3 downmix functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: ac3_downmix_c.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * * Authors: Renaud Dartus * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_exponent.c b/src/ac3_decoder/ac3_exponent.c index f71d7ea97e..af6fd2aa10 100644 --- a/src/ac3_decoder/ac3_exponent.c +++ b/src/ac3_decoder/ac3_exponent.c @@ -2,6 +2,7 @@ * ac3_exponent.c: ac3 exponent calculations ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_exponent.c,v 1.21 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Michel Lespinasse diff --git a/src/ac3_decoder/ac3_imdct.c b/src/ac3_decoder/ac3_imdct.c index e25734cc1b..148d6e23ef 100644 --- a/src/ac3_decoder/ac3_imdct.c +++ b/src/ac3_decoder/ac3_imdct.c @@ -2,6 +2,7 @@ * ac3_imdct.c: ac3 DCT ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_imdct.c,v 1.14 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_internal.h b/src/ac3_decoder/ac3_internal.h index 5ad53385e3..a51fa1ccb9 100644 --- a/src/ac3_decoder/ac3_internal.h +++ b/src/ac3_decoder/ac3_internal.h @@ -2,6 +2,7 @@ * ac3_internals.h: needed by the ac3 decoder ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: ac3_internal.h,v 1.8 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Lespinasse * diff --git a/src/ac3_decoder/ac3_mantissa.c b/src/ac3_decoder/ac3_mantissa.c index 0db5604262..09a1fb7a7c 100644 --- a/src/ac3_decoder/ac3_mantissa.c +++ b/src/ac3_decoder/ac3_mantissa.c @@ -2,6 +2,7 @@ * ac3_mantissa.c: ac3 mantissa computation ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: ac3_mantissa.c,v 1.21 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_parse.c b/src/ac3_decoder/ac3_parse.c index 4c0bbaee10..14176e1dc7 100644 --- a/src/ac3_decoder/ac3_parse.c +++ b/src/ac3_decoder/ac3_parse.c @@ -2,6 +2,7 @@ * ac3_parse.c: ac3 parsing procedures ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: ac3_parse.c,v 1.16 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/ac3_decoder/ac3_rematrix.c b/src/ac3_decoder/ac3_rematrix.c index 1f9f7b6fad..30e834db18 100644 --- a/src/ac3_decoder/ac3_rematrix.c +++ b/src/ac3_decoder/ac3_rematrix.c @@ -2,6 +2,7 @@ * ac3_rematrix.c: ac3 audio rematrixing ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: ac3_rematrix.c,v 1.12 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * Aaron Holtzman diff --git a/src/audio_decoder/adec_generic.c b/src/audio_decoder/adec_generic.c index 9429a02b68..54535e34b5 100644 --- a/src/audio_decoder/adec_generic.c +++ b/src/audio_decoder/adec_generic.c @@ -2,8 +2,10 @@ * adec_generic.c: MPEG audio decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_generic.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf + * Michel Lespinasse * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_generic.h b/src/audio_decoder/adec_generic.h index 49e999d0c2..ec3636f782 100644 --- a/src/audio_decoder/adec_generic.h +++ b/src/audio_decoder/adec_generic.h @@ -2,9 +2,9 @@ * audio_decoder.h : audio decoder interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_generic.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: - * Michel Kaempf + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_layer1.c b/src/audio_decoder/adec_layer1.c index dd45c6b665..6ef55bb101 100644 --- a/src/audio_decoder/adec_layer1.c +++ b/src/audio_decoder/adec_layer1.c @@ -2,8 +2,10 @@ * adec_layer1.c: MPEG Layer I audio decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_layer1.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf + * Michel Lespinasse * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_layer1.h b/src/audio_decoder/adec_layer1.h index c558b94328..9bace6e7a0 100644 --- a/src/audio_decoder/adec_layer1.h +++ b/src/audio_decoder/adec_layer1.h @@ -2,8 +2,9 @@ * adec_layer1.h: MPEG Layer I audio decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_layer1.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_layer2.c b/src/audio_decoder/adec_layer2.c index f8da423cbb..c9a9878e1a 100644 --- a/src/audio_decoder/adec_layer2.c +++ b/src/audio_decoder/adec_layer2.c @@ -2,8 +2,10 @@ * adec_layer2.c: MPEG Layer II audio decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_layer2.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf + * Michel Lespinasse * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_layer2.h b/src/audio_decoder/adec_layer2.h index 272c902aa5..1e53da0cf9 100644 --- a/src/audio_decoder/adec_layer2.h +++ b/src/audio_decoder/adec_layer2.h @@ -2,8 +2,9 @@ * adec_layer2.h: MPEG Layer II audio decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_layer2.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_math.c b/src/audio_decoder/adec_math.c index dc66df9dd7..13f542b745 100644 --- a/src/audio_decoder/adec_math.c +++ b/src/audio_decoder/adec_math.c @@ -2,8 +2,10 @@ * adec_math.c: Inverse Discrete Cosine Transform and Pulse Code Modulation ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_math.c,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf + * Michel Lespinasse * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_math.h b/src/audio_decoder/adec_math.h index 8418238940..b3ab5bd7ba 100644 --- a/src/audio_decoder/adec_math.h +++ b/src/audio_decoder/adec_math.h @@ -2,8 +2,9 @@ * adec_math.h : PCM and DCT ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_math.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/adec_test.c b/src/audio_decoder/adec_test.c index 4bd1a2e9d3..4e9b7f1521 100644 --- a/src/audio_decoder/adec_test.c +++ b/src/audio_decoder/adec_test.c @@ -2,8 +2,10 @@ * adec_test.c: MPEG Layer I-II audio decoder test program ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: adec_test.c,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Michel Kaempf + * Michel Lespinasse * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_decoder/audio_decoder.h b/src/audio_decoder/audio_decoder.h index e3ba63b49d..1bb7530fa7 100644 --- a/src/audio_decoder/audio_decoder.h +++ b/src/audio_decoder/audio_decoder.h @@ -2,10 +2,9 @@ * audio_decoder.h : audio decoder thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: audio_decoder.h,v 1.5 2001/01/11 17:44:48 sam Exp $ + * $Id: audio_decoder.h,v 1.6 2001/03/21 13:42:34 sam Exp $ * - * Authors: - * Michel Kaempf + * Authors: Michel Kaempf * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/audio_output/aout_common.h b/src/audio_output/aout_common.h index 558d078c9e..fc8ed13e08 100644 --- a/src/audio_output/aout_common.h +++ b/src/audio_output/aout_common.h @@ -2,6 +2,7 @@ * aout_common.h: audio output inner functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_common.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/aout_fifo.c b/src/audio_output/aout_fifo.c index 3d02a3d930..712a8461fc 100644 --- a/src/audio_output/aout_fifo.c +++ b/src/audio_output/aout_fifo.c @@ -2,6 +2,7 @@ * aout_fifo.c : exported fifo management functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_fifo.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/aout_s16.c b/src/audio_output/aout_s16.c index 2e31280acb..f833756bbc 100644 --- a/src/audio_output/aout_s16.c +++ b/src/audio_output/aout_s16.c @@ -2,6 +2,7 @@ * aout_s16.c: 16 bit signed audio output functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_s16.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/aout_s8.c b/src/audio_output/aout_s8.c index 360b261c86..5410c0c64c 100644 --- a/src/audio_output/aout_s8.c +++ b/src/audio_output/aout_s8.c @@ -2,6 +2,7 @@ * aout_s8.c: 8 bit signed audio output functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_s8.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/aout_u16.c b/src/audio_output/aout_u16.c index 654f836ede..3d3262600b 100644 --- a/src/audio_output/aout_u16.c +++ b/src/audio_output/aout_u16.c @@ -2,6 +2,7 @@ * aout_u16.c: 16 bit unsigned audio output functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_u16.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/aout_u8.c b/src/audio_output/aout_u8.c index 8713faa65b..e25cf17681 100644 --- a/src/audio_output/aout_u8.c +++ b/src/audio_output/aout_u8.c @@ -2,6 +2,7 @@ * aout_u8.c: 8 bit unsigned audio output functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: aout_u8.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c index e4fa2bb5d4..fd22828aa4 100644 --- a/src/audio_output/audio_output.c +++ b/src/audio_output/audio_output.c @@ -2,6 +2,7 @@ * audio_output.c : audio output thread ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: audio_output.c,v 1.56 2001/03/21 13:42:34 sam Exp $ * * Authors: Michel Kaempf * diff --git a/src/generic_decoder/generic_decoder.c b/src/generic_decoder/generic_decoder.c index 6571a6446d..4d64b2cba2 100644 --- a/src/generic_decoder/generic_decoder.c +++ b/src/generic_decoder/generic_decoder.c @@ -10,6 +10,7 @@ * used as a 'default' decoder by the input thread. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: generic_decoder.c,v 1.18 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/generic_decoder/generic_decoder.h b/src/generic_decoder/generic_decoder.h index 777af9a547..20b0050707 100644 --- a/src/generic_decoder/generic_decoder.h +++ b/src/generic_decoder/generic_decoder.h @@ -2,6 +2,7 @@ * generic_decoder.h : generic decoder thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: generic_decoder.h,v 1.6 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/input/input_ext-dec.c b/src/input/input_ext-dec.c index e89e5218d5..963a2f0baa 100644 --- a/src/input/input_ext-dec.c +++ b/src/input/input_ext-dec.c @@ -2,6 +2,7 @@ * input_ext-dec.c: services to the decoders ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: input_ext-dec.c,v 1.11 2001/03/21 13:42:34 sam Exp $ * * Authors: Christophe Massiot * diff --git a/src/input/input_ext-intf.c b/src/input/input_ext-intf.c index 061fe27317..19ae83ddc7 100644 --- a/src/input/input_ext-intf.c +++ b/src/input/input_ext-intf.c @@ -2,6 +2,7 @@ * input_ext-intf.c: services to the interface ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: input_ext-intf.c,v 1.17 2001/03/21 13:42:34 sam Exp $ * * Authors: Christophe Massiot * diff --git a/src/interface/interface.c b/src/interface/interface.c index 31ef1d5a16..709f7253bb 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -4,8 +4,9 @@ * interface, such as command line. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: interface.c,v 1.71 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_channels.c b/src/interface/intf_channels.c index f6ad68111a..9295914470 100644 --- a/src/interface/intf_channels.c +++ b/src/interface/intf_channels.c @@ -2,8 +2,9 @@ * intf_channels.c: channel handling functions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_channels.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_channels.h b/src/interface/intf_channels.h index 133101b01f..a2b4a20c38 100644 --- a/src/interface/intf_channels.h +++ b/src/interface/intf_channels.h @@ -2,8 +2,9 @@ * intf_channels.h: Channel handling functions ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_channels.h,v 1.2 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_cmd.c b/src/interface/intf_cmd.c index 7d1302d6e7..df7429013c 100644 --- a/src/interface/intf_cmd.c +++ b/src/interface/intf_cmd.c @@ -5,8 +5,9 @@ * implemented in intf_ctrl. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_cmd.c,v 1.18 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_cmd.h b/src/interface/intf_cmd.h index 2b3bff14ca..97c65e5197 100644 --- a/src/interface/intf_cmd.h +++ b/src/interface/intf_cmd.h @@ -5,8 +5,9 @@ * implemented in intf_ctrl. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_cmd.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_console.c b/src/interface/intf_console.c index cf1d020f53..655896b90f 100644 --- a/src/interface/intf_console.c +++ b/src/interface/intf_console.c @@ -2,8 +2,9 @@ * intf_console.c: generic console for interface ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_console.c,v 1.7 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_console.h b/src/interface/intf_console.h index 27c4f9f1d7..3cf8bdcaaa 100644 --- a/src/interface/intf_console.h +++ b/src/interface/intf_console.h @@ -2,8 +2,9 @@ * intf_console.h: generic console methods for interface ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_console.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c index d6e21e9111..f6dd0042a3 100644 --- a/src/interface/intf_ctrl.c +++ b/src/interface/intf_ctrl.c @@ -19,8 +19,9 @@ * More informations about parameters stand in `list of commands' section. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_ctrl.c,v 1.34 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_ctrl.h b/src/interface/intf_ctrl.h index 3081e4cd04..539af747bb 100644 --- a/src/interface/intf_ctrl.h +++ b/src/interface/intf_ctrl.h @@ -5,8 +5,9 @@ * to read or write informations from other threads. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_ctrl.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/interface/intf_msg.c b/src/interface/intf_msg.c index c2eaec639e..e5e65d4bd0 100644 --- a/src/interface/intf_msg.c +++ b/src/interface/intf_msg.c @@ -4,6 +4,7 @@ * interface, such as message output. See config.h for output configuration. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: intf_msg.c,v 1.28 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/interface/intf_playlist.c b/src/interface/intf_playlist.c index baf999b414..c2b1d06519 100644 --- a/src/interface/intf_playlist.c +++ b/src/interface/intf_playlist.c @@ -2,6 +2,7 @@ * intf_playlist.c : Playlist management functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: intf_playlist.c,v 1.2 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/src/interface/main.c b/src/interface/main.c index 84a67160bb..0874d76370 100644 --- a/src/interface/main.c +++ b/src/interface/main.c @@ -4,8 +4,10 @@ * and spawn threads. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: main.c,v 1.80 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin + * Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -35,7 +37,10 @@ #endif #ifdef SYS_DARWIN1_3 -#include /* Altivec detection */ +#include /* Altivec detection */ +#include /* some day the header files||compiler * + will define it for us */ +#include #endif #include @@ -899,13 +904,30 @@ static int CPUCapabilities( void ) | CPU_CAPABILITY_MMX; #elif defined( SYS_DARWIN1_3 ) - OSErr err; - long l_attributes = 0; - err = Gestalt( gestaltPowerPCProcessorFeatures, &l_attributes ); + struct host_basic_info hi; + kern_return_t ret; + host_name_port_t host; - if( err == noErr && - ( (1 << gestaltPowerPCHasVectorInstructions) & l_attributes ) ) + int i_size; + char *psz_name, *psz_subname; + + /* Should 'never' fail? */ + host = mach_host_self(); + + i_size = sizeof( hi ) / sizeof( int ); + ret = host_info( host, HOST_BASIC_INFO, ( host_info_t )&hi, &i_size ); + + if( ret != KERN_SUCCESS ) + { + intf_ErrMsg( "error: couldn't get CPU information" ); + return( i_capabilities ); + } + + slot_name( hi.cpu_type, hi.cpu_subtype, &psz_name, &psz_subname ); + /* FIXME: need better way to detect newer proccessors. + * could do strncmp(a,b,5), but that's real ugly */ + if( strcmp(psz_name, "ppc7400") || strcmp(psz_name, "ppc7450") ) { i_capabilities |= CPU_CAPABILITY_ALTIVEC; } diff --git a/src/lpcm_decoder/lpcm_decoder.c b/src/lpcm_decoder/lpcm_decoder.c index 754d21a9a9..f2ab7ce3d5 100644 --- a/src/lpcm_decoder/lpcm_decoder.c +++ b/src/lpcm_decoder/lpcm_decoder.c @@ -2,8 +2,9 @@ * lpcm_decoder.c: core lpcm decoder ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: lpcm_decoder.c,v 1.6 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lpcm_decoder/lpcm_decoder.h b/src/lpcm_decoder/lpcm_decoder.h index 63e289ed6a..8fbfc0b6bd 100644 --- a/src/lpcm_decoder/lpcm_decoder.h +++ b/src/lpcm_decoder/lpcm_decoder.h @@ -2,8 +2,9 @@ * lpcm_decoder.h : lpcm decoder interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: lpcm_decoder.h,v 1.3 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lpcm_decoder/lpcm_decoder_thread.c b/src/lpcm_decoder/lpcm_decoder_thread.c index 75af82c6e7..f3643e37fc 100644 --- a/src/lpcm_decoder/lpcm_decoder_thread.c +++ b/src/lpcm_decoder/lpcm_decoder_thread.c @@ -2,9 +2,9 @@ * lpcm_decoder_thread.c: lpcm decoder thread ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: lpcm_decoder_thread.c,v 1.10 2001/02/11 01:15:11 sam Exp $ + * $Id: lpcm_decoder_thread.c,v 1.11 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/lpcm_decoder/lpcm_decoder_thread.h b/src/lpcm_decoder/lpcm_decoder_thread.h index 042040e187..22871319b3 100644 --- a/src/lpcm_decoder/lpcm_decoder_thread.h +++ b/src/lpcm_decoder/lpcm_decoder_thread.h @@ -2,9 +2,9 @@ * lpcm_decoder_thread.h : lpcm decoder thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN - * $Id: lpcm_decoder_thread.h,v 1.3 2001/01/05 14:46:37 sam Exp $ + * $Id: lpcm_decoder_thread.h,v 1.4 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Samuel Hocevar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/misc/beos_specific.cpp b/src/misc/beos_specific.cpp index 9fcebb6d08..e81d0cec44 100644 --- a/src/misc/beos_specific.cpp +++ b/src/misc/beos_specific.cpp @@ -2,6 +2,7 @@ * beos_init.cpp: Initialization for BeOS specific features ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: beos_specific.cpp,v 1.5 2001/03/21 13:42:34 sam Exp $ * * Authors: Jean-Marc Dressler * diff --git a/src/misc/modules.c b/src/misc/modules.c index 307ea54434..965663200e 100644 --- a/src/misc/modules.c +++ b/src/misc/modules.c @@ -2,6 +2,7 @@ * modules.c : Built-in and dynamic modules management functions ***************************************************************************** * Copyright (C) 2001 VideoLAN + * $Id: modules.c,v 1.19 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * Ethan C. Baldridge diff --git a/src/misc/mtime.c b/src/misc/mtime.c index 5a0cf0c1e4..79a0331c4f 100644 --- a/src/misc/mtime.c +++ b/src/misc/mtime.c @@ -3,6 +3,7 @@ * Functions are prototyped in mtime.h. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: mtime.c,v 1.16 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/misc/netutils.c b/src/misc/netutils.c index afcb83255b..7f1cd8e154 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -2,6 +2,7 @@ * netutils.c: various network functions ***************************************************************************** * Copyright (C) 1999, 2000, 2001 VideoLAN + * $Id: netutils.c,v 1.22 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * Benoit Steiner diff --git a/src/misc/rsc_files.c b/src/misc/rsc_files.c index 3029cb902c..64452e9640 100644 --- a/src/misc/rsc_files.c +++ b/src/misc/rsc_files.c @@ -4,6 +4,7 @@ * can be anything, including pictures, audio streams, and so on. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: rsc_files.c,v 1.9 2001/03/21 13:42:34 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/misc/tests.c b/src/misc/tests.c index b16f54cb60..1c2265a88c 100644 --- a/src/misc/tests.c +++ b/src/misc/tests.c @@ -3,6 +3,7 @@ * Functions are prototyped in tests.h. ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: tests.c,v 1.5 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/src/spu_decoder/spu_decoder.c b/src/spu_decoder/spu_decoder.c index e76186b228..f8ebae6b62 100644 --- a/src/spu_decoder/spu_decoder.c +++ b/src/spu_decoder/spu_decoder.c @@ -2,6 +2,7 @@ * spu_decoder.c : spu decoder thread ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: spu_decoder.c,v 1.34 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/src/spu_decoder/spu_decoder.h b/src/spu_decoder/spu_decoder.h index 966f09754f..4aa67ba67d 100644 --- a/src/spu_decoder/spu_decoder.h +++ b/src/spu_decoder/spu_decoder.h @@ -2,6 +2,7 @@ * spu_decoder.h : sub picture unit decoder thread interface ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: spu_decoder.h,v 1.7 2001/03/21 13:42:34 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 57e49766b1..dab27c8155 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -5,8 +5,9 @@ * thread, and destroy a previously oppened video output thread. ***************************************************************************** * Copyright (C) 2000 VideoLAN + * $Id: video_output.c,v 1.117 2001/03/21 13:42:34 sam Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/video_output/video_spu.c b/src/video_output/video_spu.c index 6188347108..29a53af83b 100644 --- a/src/video_output/video_spu.c +++ b/src/video_output/video_spu.c @@ -2,6 +2,7 @@ * video_spu.c : DVD subpicture units functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_spu.c,v 1.19 2001/03/21 13:42:35 sam Exp $ * * Authors: Samuel Hocevar * diff --git a/src/video_output/video_spu.h b/src/video_output/video_spu.h index fa80e83e9a..19e81c5d2f 100644 --- a/src/video_output/video_spu.h +++ b/src/video_output/video_spu.h @@ -2,6 +2,7 @@ * video_spu.h : DVD subpicture units functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_spu.h,v 1.8 2001/03/21 13:42:35 sam Exp $ * * Authors: Samuel Hocevar * Henri Fallon diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 1dd05f3b8b..8dc5ed13fe 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -2,6 +2,7 @@ * video_text.c : text manipulation functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_text.c,v 1.20 2001/03/21 13:42:35 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar diff --git a/src/video_output/video_text.h b/src/video_output/video_text.h index 6a0ac2f5b0..405fffce0f 100644 --- a/src/video_output/video_text.h +++ b/src/video_output/video_text.h @@ -2,6 +2,7 @@ * video_text.h : text manipulation functions ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_text.h,v 1.7 2001/03/21 13:42:35 sam Exp $ * * Authors: Vincent Seguin * Samuel Hocevar diff --git a/src/video_output/video_yuv.c b/src/video_output/video_yuv.c index 3b125eb28f..fb650862d9 100644 --- a/src/video_output/video_yuv.c +++ b/src/video_output/video_yuv.c @@ -3,6 +3,7 @@ * These functions set up YUV tables for colorspace conversion ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_yuv.c,v 1.47 2001/03/21 13:42:35 sam Exp $ * * Authors: Vincent Seguin * diff --git a/src/video_output/video_yuv.h b/src/video_output/video_yuv.h index e9d4eb7b02..061c505d9f 100644 --- a/src/video_output/video_yuv.h +++ b/src/video_output/video_yuv.h @@ -3,6 +3,7 @@ * These functions set up YUV tables for colorspace conversion ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video_yuv.h,v 1.7 2001/03/21 13:42:35 sam Exp $ * * Authors: Vincent Seguin *