From 44bcfed01477db0b57e6f08048bbee72f032aa7e Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 3 Mar 2000 07:03:34 +0000 Subject: [PATCH] =?utf8?q?=20Encore=20un=20commit=20venu=20tout=20droit=20?= =?utf8?q?des=20abysses=20de=20l'enfer,=20d=EF=BF=BDsol=EF=BF=BD=20pour=20?= =?utf8?q?le=20flood,=20c'est=20la=20derni=EF=BF=BDre=20fois.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit . apr�s le demoronifier, le GPLifier: il y a les ent�tes de la GPL dans chaque fichier ; votre mission, si vous l'acceptez, est de mettre votre nom dans chaque fichier qui est votre oeuvre ou auquel vous avez particip�, pour qu'on sache qui a fait quoi. Pas de fausse modestie, c'est plus pour des raisons pratiques que pour la gloire. . rajout de -lthreads pour que �a linke sous Hurd . rajout de quelques #include pour que �a compile sous FreeBSD (d'ailleurs �a compile mais �a ne linke pas, je ne sais pas comment linker avec la libpthread sur la machine de Dae) . quelques #ifdef SYS_BSD �� et l�. --- Makefile | 17 +++++-- include/ac3_decoder.h | 20 +++++++- include/ac3_decoder_thread.h | 20 +++++++- include/audio_decoder.h | 24 ++++++++- include/audio_output.h | 24 ++++++++- include/common.h | 25 ++++++++-- include/config.h | 21 +++++++- include/debug.h | 23 ++++++++- include/decoder_fifo.h | 24 ++++++++- include/input.h | 20 +++++++- include/input_netlist.h | 21 +++++++- include/input_vlan.h | 26 ++++++++-- include/int_types.h | 23 +++++++++ include/interface.h | 25 ++++++++-- include/intf_msg.h | 21 +++++++- include/main.h | 21 +++++++- include/mtime.h | 25 ++++++++-- include/netutils.h | 25 ++++++++-- include/rsc_files.h | 25 ++++++++-- include/spu_decoder.h | 20 +++++++- include/{vlc_thread.h => threads.h} | 24 +++++++-- include/vdec_idct.h | 25 ++++++++-- include/vdec_motion.h | 27 ++++++++-- include/video.h | 23 ++++++++- include/video_decoder.h | 25 ++++++++-- include/video_fifo.h | 25 ++++++++-- include/video_graphics.h | 23 ++++++++- include/video_output.h | 21 +++++++- include/video_parser.h | 25 ++++++++-- include/vpar_blocks.h | 27 ++++++++-- include/vpar_headers.h | 25 ++++++++-- include/vpar_synchro.h | 25 ++++++++-- src/ac3_decoder/ac3_bit_allocate.c | 23 +++++++++ src/ac3_decoder/ac3_bit_stream.h | 23 +++++++++ src/ac3_decoder/ac3_decoder.c | 23 +++++++++ src/ac3_decoder/ac3_decoder_thread.c | 27 +++++++--- src/ac3_decoder/ac3_downmix.c | 23 +++++++++ src/ac3_decoder/ac3_exponent.c | 23 +++++++++ src/ac3_decoder/ac3_imdct.c | 23 +++++++++ src/ac3_decoder/ac3_internal.h | 23 +++++++++ src/ac3_decoder/ac3_mantissa.c | 23 +++++++++ src/ac3_decoder/ac3_parse.c | 23 +++++++++ src/ac3_decoder/ac3_rematrix.c | 23 +++++++++ src/audio_decoder/audio_constants.h | 20 +++++++- src/audio_decoder/audio_decoder.c | 32 +++++++++--- src/audio_decoder/audio_math.c | 44 +++++++++++------ src/audio_decoder/audio_math.h | 20 +++++++- src/audio_output/audio_output.c | 24 +++++++-- src/audio_output/audio_sys.h | 22 ++++++++- src/generic_decoder/generic_decoder.c | 38 +++++++++----- src/generic_decoder/generic_decoder.h | 24 ++++++++- src/input/input.c | 33 ++++++++++--- src/input/input_ctrl.c | 71 ++++++++++++++++----------- src/input/input_ctrl.h | 22 ++++++++- src/input/input_file.c | 26 ++++++++-- src/input/input_file.h | 20 +++++++- src/input/input_netlist.c | 35 +++++++++---- src/input/input_network.c | 43 +++++++++++----- src/input/input_network.h | 20 +++++++- src/input/input_pcr.c | 31 +++++++++--- src/input/input_pcr.h | 20 +++++++- src/input/input_psi.c | 28 +++++++++-- src/input/input_psi.h | 20 +++++++- src/input/input_vlan.c | 29 +++++++++-- src/interface/interface.c | 38 ++++++++++---- src/interface/intf_cmd.c | 31 +++++++++--- src/interface/intf_cmd.h | 23 ++++++++- src/interface/intf_console.c | 22 ++++++++- src/interface/intf_console.h | 20 +++++++- src/interface/intf_ctrl.c | 37 ++++++++++---- src/interface/intf_ctrl.h | 23 ++++++++- src/interface/intf_msg.c | 49 +++++++++++++----- src/interface/intf_sys.h | 20 +++++++- src/interface/main.c | 39 +++++++++++---- src/misc/decoder_fifo.c | 25 ++++++++-- src/misc/mtime.c | 30 ++++++++--- src/misc/netutils.c | 28 +++++++++-- src/misc/rsc_files.c | 32 +++++++++--- src/spu_decoder/spu_decoder.c | 36 +++++++++----- src/video_decoder/vdec_idct.c | 33 ++++++++----- src/video_decoder/vdec_idctmmx.S | 23 +++++++++ src/video_decoder/vdec_motion.c | 36 +++++++++----- src/video_decoder/vdec_motion_inner.c | 32 ++++++++---- src/video_decoder/video_decoder.c | 38 +++++++++----- src/video_output/video_output.c | 34 ++++++++++--- src/video_output/video_sys.h | 20 +++++++- src/video_output/video_text.c | 32 +++++++++--- src/video_output/video_text.h | 20 +++++++- src/video_output/video_yuv.c | 32 +++++++++--- src/video_output/video_yuv.h | 21 +++++++- src/video_output/video_yuv_mmx.S | 22 ++++++++- src/video_parser/video_fifo.c | 30 ++++++++--- src/video_parser/video_parser.c | 32 +++++++++--- src/video_parser/vpar_blocks.c | 45 +++++++++-------- src/video_parser/vpar_headers.c | 37 +++++++++----- src/video_parser/vpar_synchro.c | 38 +++++++++----- 96 files changed, 2170 insertions(+), 432 deletions(-) rename include/{vlc_thread.h => threads.h} (90%) diff --git a/Makefile b/Makefile index 7b6b985c04..303a0540e9 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ # Environment CC=egcc +#CC=gcc295 SHELL=/bin/sh # Audio output settings @@ -82,7 +83,9 @@ PROGRAM_OPTIONS += DEBUG endif # PROGRAM_BUILD is a complete identification of the build -PROGRAM_BUILD = `date -R` $(USER)@`hostname` +# ( we can't use fancy options with date since OSes like Solaris +# or FreeBSD have strange date implementations ) +PROGRAM_BUILD = `date` $(USER)@`hostname` # DEFINE will contain some of the constants definitions decided in Makefile, # including ARCH_xx and SYS_xx. It will be passed to C compiler. @@ -105,12 +108,18 @@ endif # # C headers directories # -INCLUDE += -Iinclude +INCLUDE += -Iinclude -I/usr/local/include -I/usr/X11R6/include # # Libraries # +LIB += -L/usr/local/lib + +ifeq ($(SYS),GNU) +LIB += -lthreads +else LIB += -lpthread +endif LIB += -lm LIB += -ldl @@ -132,8 +141,10 @@ ifeq ($(ARCH),X86) CCFLAGS += -malign-double #CCFLAGS += -march=pentium ifeq ($(PPRO), YES) +ifneq ($(SYS), BSD) CCFLAGS += -march=pentiumpro endif +endif # Eventual MMX optimizations for x86 ifeq ($(MMX), YES) CFLAGS += -DHAVE_MMX @@ -327,7 +338,7 @@ FORCE: # Real targets # vlc: $(C_OBJ) $(ASM_OBJ) $(PLUGIN_OBJ) - $(CC) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ) + $(CC) $(CCFLAGS) $(LCFLAGS) $(CFLAGS) --export-dynamic -rdynamic -o $@ $(C_OBJ) $(ASM_OBJ) # # Generic rules (see below) diff --git a/include/ac3_decoder.h b/include/ac3_decoder.h index 9e14925a7e..b08bdd9140 100644 --- a/include/ac3_decoder.h +++ b/include/ac3_decoder.h @@ -1,6 +1,24 @@ /***************************************************************************** * ac3_decoder.h : ac3 decoder interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /**** ac3 decoder API - public ac3 decoder structures */ diff --git a/include/ac3_decoder_thread.h b/include/ac3_decoder_thread.h index ee61d8da43..f2e3c34442 100644 --- a/include/ac3_decoder_thread.h +++ b/include/ac3_decoder_thread.h @@ -1,6 +1,24 @@ /***************************************************************************** * ac3_decoder_thread.h : ac3 decoder thread interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/audio_decoder.h b/include/audio_decoder.h index 45ea6aa58a..5012363287 100644 --- a/include/audio_decoder.h +++ b/include/audio_decoder.h @@ -1,12 +1,32 @@ /***************************************************************************** * audio_decoder.h : audio decoder thread interface - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * = Prototyped functions are implemented in audio_decoder/audio_decoder.c * * = Required headers : * - "common.h" ( u32, byte_t, boolean_t ) - * - "vlc_thread.h" ( vlc_thread_t ) + * - "threads.h" ( vlc_thread_t ) * - "input.h" ( ts_packet_t, input_thread_t ) * - "decoder_fifo.h" ( decoder_fifo_t ) * - "audio_output.h" ( aout_fifo_t, aout_thread_t ) diff --git a/include/audio_output.h b/include/audio_output.h index e9edc58f8b..a1465ced3f 100644 --- a/include/audio_output.h +++ b/include/audio_output.h @@ -1,12 +1,32 @@ /***************************************************************************** * audio_output.h : audio output thread interface - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * - ( audio_buf_info ) * - "common.h" ( boolean_t ) * - "mtime.h" ( mtime_t ) - * - "vlc_thread.h" ( vlc_thread_t ) + * - "threads.h" ( vlc_thread_t ) *****************************************************************************/ /* TODO : diff --git a/include/common.h b/include/common.h index af734ad62f..cc49cd5352 100644 --- a/include/common.h +++ b/include/common.h @@ -1,9 +1,28 @@ /***************************************************************************** * common.h: common definitions - * (c)1998 VideoLAN - ***************************************************************************** - * Collection of usefull common types and macros definitions + * Collection of useful common types and macros definitions ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * required headers: * config.h *****************************************************************************/ diff --git a/include/config.h b/include/config.h index 1616f6cee6..09cc1e334f 100644 --- a/include/config.h +++ b/include/config.h @@ -1,8 +1,25 @@ /***************************************************************************** * config.h: limits and configuration - * (c)1999 VideoLAN - ***************************************************************************** * Defines all compilation-time configuration constants and size limits + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* Conventions regarding names of symbols and variables diff --git a/include/debug.h b/include/debug.h index f3a3cf8135..c7184c26c4 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,9 +1,28 @@ /***************************************************************************** * debug.h: vlc debug macros - * (c)1999 VideoLAN - ***************************************************************************** * Stand alone file ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * - * - intf_msg.h diff --git a/include/decoder_fifo.h b/include/decoder_fifo.h index 5fe121567a..98572d2688 100644 --- a/include/decoder_fifo.h +++ b/include/decoder_fifo.h @@ -1,11 +1,31 @@ /***************************************************************************** * decoder_fifo.h: interface for decoders PES fifo - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * - "config.h" * - "common.h" - * - "vlc_thread.h" + * - "threads.h" * - "input.h" *****************************************************************************/ diff --git a/include/input.h b/include/input.h index 6c0842e541..7a2dadccf3 100644 --- a/include/input.h +++ b/include/input.h @@ -1,6 +1,24 @@ /***************************************************************************** * input.h: input thread interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/input_netlist.h b/include/input_netlist.h index 4e1c8b5ccf..07929e32f5 100644 --- a/include/input_netlist.h +++ b/include/input_netlist.h @@ -1,10 +1,27 @@ /***************************************************************************** * input_netlist.h: netlist interface - * (c)1998 VideoLAN - ***************************************************************************** * The netlists are an essential part of the input structure. We maintain a * list of free TS packets and free PES packets to avoid continuous malloc * and free. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ #include "intf_msg.h" diff --git a/include/input_vlan.h b/include/input_vlan.h index 3a24bd07b5..783b86e606 100644 --- a/include/input_vlan.h +++ b/include/input_vlan.h @@ -1,12 +1,30 @@ /***************************************************************************** * input_vlan.h: vlan input method - * (c)1999 VideoLAN - ***************************************************************************** - * XXX?? ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * - * "vlc_thread.h" + * "threads.h" *****************************************************************************/ /***************************************************************************** diff --git a/include/int_types.h b/include/int_types.h index e42cb2d24e..7148026f1a 100644 --- a/include/int_types.h +++ b/include/int_types.h @@ -1,3 +1,26 @@ +/***************************************************************************** + * int_types.h: internal types + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + /* Basic types definitions */ typedef unsigned char u8; typedef signed char s8; diff --git a/include/interface.h b/include/interface.h index eda7ce5991..2a8f55c3c7 100644 --- a/include/interface.h +++ b/include/interface.h @@ -1,10 +1,29 @@ /***************************************************************************** * interface.h: interface access for other threads - * (c)1999 VideoLAN - ***************************************************************************** * This library provides basic functions for threads to interact with user * interface, such as message output. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * * @@ -12,7 +31,7 @@ * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" diff --git a/include/intf_msg.h b/include/intf_msg.h index 5b44f17c71..9f5ede2d62 100644 --- a/include/intf_msg.h +++ b/include/intf_msg.h @@ -1,9 +1,26 @@ /***************************************************************************** * intf_msg.h: messages interface - * (c)1999 VideoLAN - ***************************************************************************** * This library provides basic functions for threads to interact with user * interface, such as message output. See config.h for output configuration. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/main.h b/include/main.h index b1ae241637..4eb7b660e6 100644 --- a/include/main.h +++ b/include/main.h @@ -1,8 +1,25 @@ /***************************************************************************** * main.h: access to all program variables - * (c)1999 VideoLAN - ***************************************************************************** * Declaration and extern access to global program object. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/mtime.h b/include/mtime.h index a3bc2a0d83..b4cd66574a 100644 --- a/include/mtime.h +++ b/include/mtime.h @@ -1,7 +1,5 @@ /***************************************************************************** - * mtime.h: high rezolution time management functions - * (c)1999 VideoLAN - ***************************************************************************** + * mtime.h: high resolution time management functions * This header provides portable high precision time management functions, * which should be the only ones used in other segments of the program, since * functions like gettimeofday() and ftime() are not always supported. @@ -10,6 +8,27 @@ * 'm' stands for 'micro', since maximum resolution is the microsecond. * Functions prototyped are implemented in interface/mtime.c. ***************************************************************************** + * Copyright (C) 1996, 1997, 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * none * this header includes inline functions diff --git a/include/netutils.h b/include/netutils.h index 902f657ead..3b788b86bf 100644 --- a/include/netutils.h +++ b/include/netutils.h @@ -1,10 +1,29 @@ /***************************************************************************** * netutils.h: various network functions - * (c)1999 VideoLAN - ***************************************************************************** - * This header describe miscellanous utility functions shared between several + * This header describes miscellanous utility functions shared between several * modules. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * *****************************************************************************/ diff --git a/include/rsc_files.h b/include/rsc_files.h index 7d3861dc98..9747060578 100644 --- a/include/rsc_files.h +++ b/include/rsc_files.h @@ -1,10 +1,29 @@ /***************************************************************************** * rsc_files.h: resources files manipulation functions - * (c)1999 VideoLAN - ***************************************************************************** - * This library describe a general format used to store 'resources'. Resources + * This library describes a general format used to store 'resources'. Resources * can be anything, including pictures, audio streams, and so on. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * config.h * common.h diff --git a/include/spu_decoder.h b/include/spu_decoder.h index 0a373320cc..dfc7309e01 100644 --- a/include/spu_decoder.h +++ b/include/spu_decoder.h @@ -1,6 +1,24 @@ /***************************************************************************** * spu_decoder.h : sub picture unit decoder thread interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/vlc_thread.h b/include/threads.h similarity index 90% rename from include/vlc_thread.h rename to include/threads.h index 8b6abaa513..73fb41d67a 100644 --- a/include/vlc_thread.h +++ b/include/threads.h @@ -1,11 +1,29 @@ /***************************************************************************** - * vlc_thread.h : thread implementation for vieolan client - * (c)1999 VideoLAN - ***************************************************************************** + * threads.h : thread implementation for VideoLAN client * This header is supposed to provide a portable threads implementation. * Currently, it is a wrapper to either the POSIX pthreads library, or * the Mach cthreads (for the GNU/Hurd). + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ + #ifdef SYS_GNU #include #else diff --git a/include/vdec_idct.h b/include/vdec_idct.h index 997b96a7e1..4c8c9c8939 100644 --- a/include/vdec_idct.h +++ b/include/vdec_idct.h @@ -1,12 +1,31 @@ /***************************************************************************** * vdec_idct.h : types for the inverse discrete cosine transform - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" - * "vlc_thread.h" + * "threads.h" * "video_parser.h" *****************************************************************************/ diff --git a/include/vdec_motion.h b/include/vdec_motion.h index e9e145b823..ec817c54fc 100644 --- a/include/vdec_motion.h +++ b/include/vdec_motion.h @@ -1,12 +1,31 @@ /***************************************************************************** * vdec_motion.h : types for the motion compensation algorithm - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" - * "vlc_thread.h" + * "threads.h" * "video_parser.h" * "undec_picture.h" *****************************************************************************/ @@ -40,4 +59,4 @@ void vdec_MotionField16x8444( struct macroblock_s * p_mb ); void vdec_MotionFieldDMV444( struct macroblock_s * p_mb ); void vdec_MotionFrameFrame444( struct macroblock_s * p_mb ); void vdec_MotionFrameField444( struct macroblock_s * p_mb ); -void vdec_MotionFrameDMV444( struct macroblock_s * p_mb ); \ No newline at end of file +void vdec_MotionFrameDMV444( struct macroblock_s * p_mb ); diff --git a/include/video.h b/include/video.h index 038420fcaf..da9ef0e26f 100644 --- a/include/video.h +++ b/include/video.h @@ -1,10 +1,29 @@ /***************************************************************************** * video.h: common video definitions - * (c)1999 VideoLAN - ***************************************************************************** * This header is required by all modules which have to handle pictures. It * includes all common video types and constants. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" diff --git a/include/video_decoder.h b/include/video_decoder.h index 326699243d..1365c03dd2 100644 --- a/include/video_decoder.h +++ b/include/video_decoder.h @@ -1,13 +1,32 @@ /***************************************************************************** * video_decoder.h : video decoder thread - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" diff --git a/include/video_fifo.h b/include/video_fifo.h index ef997d91e9..67dba426a0 100644 --- a/include/video_fifo.h +++ b/include/video_fifo.h @@ -1,12 +1,31 @@ /***************************************************************************** * video_fifo.h : FIFO for the pool of video_decoders - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" - * "vlc_thread.h" + * "threads.h" * "video_parser.h" * "undec_picture.h" *****************************************************************************/ diff --git a/include/video_graphics.h b/include/video_graphics.h index b2b6392702..db901398ba 100644 --- a/include/video_graphics.h +++ b/include/video_graphics.h @@ -1,10 +1,29 @@ /***************************************************************************** * video_graphics.h: pictures manipulation primitives - * (c)1999 VideoLAN - ***************************************************************************** * Includes function to compose, convert and display pictures, and also basic * functions to copy pictures data or descriptors. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" diff --git a/include/video_output.h b/include/video_output.h index e7f06f1a6f..e61ae7c6ef 100644 --- a/include/video_output.h +++ b/include/video_output.h @@ -1,10 +1,27 @@ /***************************************************************************** * video_output.h : video output thread - * (c)1999 VideoLAN - ***************************************************************************** * This module describes the programming interface for video output threads. * It includes functions allowing to open a new thread, send pictures to a * thread, and destroy a previously oppenned video output thread. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/include/video_parser.h b/include/video_parser.h index 89916b83ab..a4c188880c 100644 --- a/include/video_parser.h +++ b/include/video_parser.h @@ -1,13 +1,32 @@ /***************************************************************************** * video_parser.h : video parser thread - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" diff --git a/include/vpar_blocks.h b/include/vpar_blocks.h index 5750985a86..86d10702f8 100644 --- a/include/vpar_blocks.h +++ b/include/vpar_blocks.h @@ -1,13 +1,32 @@ /***************************************************************************** * vpar_blocks.h : video parser blocks management - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" @@ -161,4 +180,4 @@ void vpar_PictureData2B420TZ( struct vpar_thread_s * p_vpar, int i_mb_base ); void vpar_PictureData2I420BZ( struct vpar_thread_s * p_vpar, int i_mb_base ); void vpar_PictureData2P420BZ( struct vpar_thread_s * p_vpar, int i_mb_base ); void vpar_PictureData2B420BZ( struct vpar_thread_s * p_vpar, int i_mb_base ); -#endif \ No newline at end of file +#endif diff --git a/include/vpar_headers.h b/include/vpar_headers.h index 382b023759..21523df675 100644 --- a/include/vpar_headers.h +++ b/include/vpar_headers.h @@ -1,13 +1,32 @@ /***************************************************************************** * vpar_headers.h : video parser : headers parsing - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" diff --git a/include/vpar_synchro.h b/include/vpar_synchro.h index 4ebf089351..c37b95cfe1 100644 --- a/include/vpar_synchro.h +++ b/include/vpar_synchro.h @@ -1,13 +1,32 @@ /***************************************************************************** * vpar_synchro.h : video parser blocks management - * (c)1999 VideoLAN - ***************************************************************************** ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "video.h" * "video_output.h" diff --git a/src/ac3_decoder/ac3_bit_allocate.c b/src/ac3_decoder/ac3_bit_allocate.c index c32e7d4cd7..3d812e0d38 100644 --- a/src/ac3_decoder/ac3_bit_allocate.c +++ b/src/ac3_decoder/ac3_bit_allocate.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_bit_allocate.c: ac3 allocation tables + ***************************************************************************** + * Copyright (C) 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include "int_types.h" #include "ac3_decoder.h" #include "ac3_internal.h" diff --git a/src/ac3_decoder/ac3_bit_stream.h b/src/ac3_decoder/ac3_bit_stream.h index 3c4040c0ab..44bb456d0f 100644 --- a/src/ac3_decoder/ac3_bit_stream.h +++ b/src/ac3_decoder/ac3_bit_stream.h @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_bit_stream.h: getbits functions for the ac3 decoder + ***************************************************************************** + * Copyright (C) 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + static __inline__ u8 GetByte (ac3_byte_stream_t * p_byte_stream) { /* Are there some bytes left in the current buffer ? */ diff --git a/src/ac3_decoder/ac3_decoder.c b/src/ac3_decoder/ac3_decoder.c index 43d7d7cdb2..fb6e802621 100644 --- a/src/ac3_decoder/ac3_decoder.c +++ b/src/ac3_decoder/ac3_decoder.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_decoder.c: core ac3 decoder + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include "int_types.h" #include "ac3_decoder.h" #include "ac3_internal.h" diff --git a/src/ac3_decoder/ac3_decoder_thread.c b/src/ac3_decoder/ac3_decoder_thread.c index a119ac4959..3038448f35 100644 --- a/src/ac3_decoder/ac3_decoder_thread.c +++ b/src/ac3_decoder/ac3_decoder_thread.c @@ -1,6 +1,24 @@ /***************************************************************************** * ac3_decoder_thread.c: ac3 decoder thread - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* @@ -15,20 +33,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include - #include /* getpid() */ #include /* "intf_msg.h" */ #include /* malloc(), free() */ +#include /* on BSD, uio.h needs types.h */ #include /* "input.h" */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "debug.h" /* "input_netlist.h" */ #include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */ diff --git a/src/ac3_decoder/ac3_downmix.c b/src/ac3_decoder/ac3_downmix.c index ce138c6eb0..7c160a1e61 100644 --- a/src/ac3_decoder/ac3_downmix.c +++ b/src/ac3_decoder/ac3_downmix.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_downmix.c: ac3 downmix functions + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include "int_types.h" #include "ac3_decoder.h" #include "ac3_internal.h" diff --git a/src/ac3_decoder/ac3_exponent.c b/src/ac3_decoder/ac3_exponent.c index a8af25a80b..80902b25c9 100644 --- a/src/ac3_decoder/ac3_exponent.c +++ b/src/ac3_decoder/ac3_exponent.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_exponent.c: ac3 exponent calculations + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include /* "intf_msg.h" */ #include "int_types.h" diff --git a/src/ac3_decoder/ac3_imdct.c b/src/ac3_decoder/ac3_imdct.c index 95b7aa2969..3466ad532d 100644 --- a/src/ac3_decoder/ac3_imdct.c +++ b/src/ac3_decoder/ac3_imdct.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_imdct.c: ac3 DCT + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include #include "int_types.h" diff --git a/src/ac3_decoder/ac3_internal.h b/src/ac3_decoder/ac3_internal.h index d27be5a503..fc1a335741 100644 --- a/src/ac3_decoder/ac3_internal.h +++ b/src/ac3_decoder/ac3_internal.h @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_internals.h: needed by the ac3 decoder + ***************************************************************************** + * Copyright (C) 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + /* Exponent strategy constants */ #define EXP_REUSE (0) #define EXP_D15 (1) diff --git a/src/ac3_decoder/ac3_mantissa.c b/src/ac3_decoder/ac3_mantissa.c index 58e844ca83..51d876b984 100644 --- a/src/ac3_decoder/ac3_mantissa.c +++ b/src/ac3_decoder/ac3_mantissa.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_mantissa.c: ac3 mantissa computation + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include /* "intf_msg.h" */ #include "int_types.h" diff --git a/src/ac3_decoder/ac3_parse.c b/src/ac3_decoder/ac3_parse.c index 4a37d6c8e8..e55c3b3e6d 100644 --- a/src/ac3_decoder/ac3_parse.c +++ b/src/ac3_decoder/ac3_parse.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_parse.c: ac3 parsing procedures + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include "int_types.h" #include "ac3_decoder.h" #include "ac3_internal.h" diff --git a/src/ac3_decoder/ac3_rematrix.c b/src/ac3_decoder/ac3_rematrix.c index 1c5d476333..8dbfc90f16 100644 --- a/src/ac3_decoder/ac3_rematrix.c +++ b/src/ac3_decoder/ac3_rematrix.c @@ -1,3 +1,26 @@ +/***************************************************************************** + * ac3_rematrix.c: ac3 audio rematrixing + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + #include "int_types.h" #include "ac3_decoder.h" #include "ac3_internal.h" diff --git a/src/audio_decoder/audio_constants.h b/src/audio_decoder/audio_constants.h index 382e60ab02..7d3866abd5 100644 --- a/src/audio_decoder/audio_constants.h +++ b/src/audio_decoder/audio_constants.h @@ -1,6 +1,24 @@ /***************************************************************************** * audio_constants.h : defines the MPEG1 Layer I-II audio constants and tables - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ diff --git a/src/audio_decoder/audio_decoder.c b/src/audio_decoder/audio_decoder.c index acaf230e96..a3620bafe2 100644 --- a/src/audio_decoder/audio_decoder.c +++ b/src/audio_decoder/audio_decoder.c @@ -1,6 +1,24 @@ /***************************************************************************** * audio_decoder.c: MPEG1 Layer I-II audio decoder thread - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* @@ -14,19 +32,17 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#include /* getpid() */ #include /* "intf_msg.h" */ #include /* malloc(), free() */ -#include -#include -#include /* ntohl() */ +#include /* on BSD, uio.h needs types.h */ #include /* "input.h" */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "debug.h" /* "input_netlist.h" */ #include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */ @@ -35,11 +51,11 @@ #include "input_netlist.h" /* input_NetlistFreePES() */ #include "decoder_fifo.h" /* DECODER_FIFO_(ISEMPTY|START|INCSTART)() */ -#include "audio_output.h" +#include "audio_output.h" /* aout_fifo_t (for audio_decoder.h) */ #include "audio_constants.h" #include "audio_decoder.h" -#include "audio_math.h" +#include "audio_math.h" /* DCT32(), PCM() */ /***************************************************************************** * Local prototypes diff --git a/src/audio_decoder/audio_math.c b/src/audio_decoder/audio_math.c index 02185a7ff3..17832d7b1b 100644 --- a/src/audio_decoder/audio_math.c +++ b/src/audio_decoder/audio_math.c @@ -1,35 +1,47 @@ /***************************************************************************** * audio_math.c: Inverse Discrete Cosine Transform and Pulse Code Modulation - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ + /***************************************************************************** * Preamble *****************************************************************************/ -#include #include /* "intf_msg.h" */ #include /* malloc(), free() */ -#include -#include -#include /* ntohl() */ -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "config.h" #include "common.h" -#include "mtime.h" -#include "vlc_thread.h" -#include "debug.h" +#include "mtime.h" /* mtime_t */ +#include "threads.h" #include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */ -#include "input.h" -#include "input_netlist.h" -#include "decoder_fifo.h" +#include "input.h" /* pes_packet_t (for decoder_fifo.h) */ +#include "decoder_fifo.h" /* decoder_fifo_t (for audio_decoder.h) */ -#include "audio_output.h" +#include "audio_output.h" /* aout_fifo_t (for audio_decoder.h) */ -#include "audio_constants.h" -#include "audio_decoder.h" -#include "audio_math.h" +#include "audio_decoder.h" /* adec_bank_t */ /***************************************************************************** * DCT32: Fast 32 points Discrete Cosine Transform diff --git a/src/audio_decoder/audio_math.h b/src/audio_decoder/audio_math.h index f68c9dbf72..f7d604c416 100644 --- a/src/audio_decoder/audio_math.h +++ b/src/audio_decoder/audio_math.h @@ -1,6 +1,24 @@ /***************************************************************************** * audio_math.h : PCM and DCT - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/audio_output/audio_output.c b/src/audio_output/audio_output.c index 267fb75682..e7df979597 100644 --- a/src/audio_output/audio_output.c +++ b/src/audio_output/audio_output.c @@ -1,6 +1,24 @@ /***************************************************************************** * audio_output.c : audio output thread - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* TODO: @@ -18,7 +36,7 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#include /* getpid() */ #include /* "intf_msg.h" */ #include /* calloc(), malloc(), free() */ @@ -28,7 +46,7 @@ #include "common.h" #include "config.h" #include "mtime.h" /* mtime_t, mdate(), msleep() */ -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */ diff --git a/src/audio_output/audio_sys.h b/src/audio_output/audio_sys.h index f99051a066..12ba1aab6b 100644 --- a/src/audio_output/audio_sys.h +++ b/src/audio_output/audio_sys.h @@ -1,7 +1,27 @@ /***************************************************************************** * audio_sys.h : header of the method-dependant functions library - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * - "common.h" ( byte_t ) * - "audio_output.h" ( aout_dsp_t ) diff --git a/src/generic_decoder/generic_decoder.c b/src/generic_decoder/generic_decoder.c index ee8d050a5d..3efd9b804b 100644 --- a/src/generic_decoder/generic_decoder.c +++ b/src/generic_decoder/generic_decoder.c @@ -1,7 +1,5 @@ /***************************************************************************** * generic_decoder.c : generic decoder thread - * (c)1999 VideoLAN - ***************************************************************************** * This decoder provides a way to parse packets which do not belong to any * known stream type, or to redirect packets to files. It can extract PES files * from a multiplexed stream, identify automatically ES in a stream missing @@ -10,41 +8,55 @@ * mode. * A single generic decoder is able to handle several ES, therefore it can be * used as a 'default' decoder by the input thread. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include "vlc.h" - -/*#include +#include #include #include #include #include #include #include +#include /* on BSD, uio.h needs types.h */ #include #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" -#include "thread.h" +#include "threads.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" */ -/* +#include "debug.h" + #include "input.h" #include "input_netlist.h" #include "decoder_fifo.h" #include "generic_decoder.h" -#include "video.h" -#include "video_output.h" -#include "video_decoder.h"*/ - /* * Local prototypes */ diff --git a/src/generic_decoder/generic_decoder.h b/src/generic_decoder/generic_decoder.h index 07a127bcfd..c77df815b7 100644 --- a/src/generic_decoder/generic_decoder.h +++ b/src/generic_decoder/generic_decoder.h @@ -1,12 +1,32 @@ /***************************************************************************** * generic_decoder.h : generic decoder thread - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + ***************************************************************************** + +/***************************************************************************** * Requires: * "config.h" * "common.h" * "mtime.h" - * "vlc_thread.h" + * "threads.h" * "input.h" * "decoder_fifo.h" * XXX?? diff --git a/src/input/input.c b/src/input/input.c index 8a67dea45e..a7d9f74285 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -1,16 +1,34 @@ /***************************************************************************** * input.c: input thread - * (c)1998 VideoLAN - ***************************************************************************** * Read an MPEG2 stream, demultiplex and parse it before sending it to * decoders. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ #include /* errno */ -#include /* required */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include /* strerror() */ #include /* free() */ @@ -19,7 +37,7 @@ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" @@ -32,8 +50,12 @@ #include "input_network.h" #include "audio_output.h" /* aout_thread_t */ + #include "audio_decoder.h" /* adec_thread_t */ +#include "ac3_decoder.h" /* ac3dec_t (for ac3_decoder_thread.h) */ +#include "ac3_decoder_thread.h" /* ac3dec_thread_t */ + #include "video.h" /* picture_t (for video_output.h) */ #include "video_output.h" /* vout_thread_t */ @@ -44,9 +66,6 @@ #include "vpar_synchro.h" /* video_synchro_t (for video_parser.h) */ #include "video_parser.h" /* vpar_thread_t */ -#include "ac3_decoder.h" /* ac3dec_t (for ac3_decoder_thread.h) */ -#include "ac3_decoder_thread.h" /* ac3dec_thread_t */ - #include "spu_decoder.h" /* spudec_thread_t */ #include "main.h" diff --git a/src/input/input_ctrl.c b/src/input/input_ctrl.c index bad138b11c..41c7b015a6 100644 --- a/src/input/input_ctrl.c +++ b/src/input/input_ctrl.c @@ -1,52 +1,65 @@ /***************************************************************************** - * input_ctrl.c: Decodeur control - * (c)1999 VideoLAN + * input_ctrl.c: Decoder control + * Controls the extraction and the decoding of the programs elements carried + * within a stream. ***************************************************************************** - * Control the extraction and the decoding of the programs elements carried in - * a stream. + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ - -#include -#include /* iovec */ -#include /* atoi(), malloc(), free() */ -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include /* ntohs */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" #include "input.h" #include "input_netlist.h" - #include "decoder_fifo.h" -#include "audio_output.h" -#include "audio_decoder.h" -#include "ac3_decoder.h" -#include "ac3_decoder_thread.h" - -#include "video.h" -#include "video_output.h" -#include "vdec_idct.h" -//#include "video_decoder.h" -#include "vdec_motion.h" -#include "vpar_blocks.h" -#include "vpar_headers.h" -#include "vpar_synchro.h" -#include "video_parser.h" - -#include "spu_decoder.h" +#include "audio_output.h" /* aout_thread_t */ + +#include "audio_decoder.h" /* adec_thread_t */ + +#include "ac3_decoder.h" /* ac3dec_t (for ac3_decoder_thread.h) */ +#include "ac3_decoder_thread.h" /* ac3dec_thread_t */ + +#include "video.h" /* picture_t (for video_output.h) */ +#include "video_output.h" /* vout_thread_t */ + +#include "vdec_idct.h" /* dctelem_t (for video_parser.h) */ +#include "vdec_motion.h" /* f_motion_t (for video_parser.h) */ +#include "vpar_blocks.h" /* macroblock_t (for video_parser.h) */ +#include "vpar_headers.h" /* sequence_t (for video_parser.h) */ +#include "vpar_synchro.h" /* video_synchro_t (for video_parser.h) */ +#include "video_parser.h" /* vpar_thread_t */ + +#include "spu_decoder.h" /* spudec_thread_t */ /***************************************************************************** * input_AddPgrmElem: Start the extraction and the decoding of a program element diff --git a/src/input/input_ctrl.h b/src/input/input_ctrl.h index 9ec254e413..b35e47f360 100644 --- a/src/input/input_ctrl.h +++ b/src/input/input_ctrl.h @@ -1,7 +1,27 @@ /***************************************************************************** * input_ctrl.h: Decodeur control - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Requires: * "config.h" * "common.h" diff --git a/src/input/input_file.c b/src/input/input_file.c index 4e71857b0c..32949453ba 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -1,18 +1,36 @@ /***************************************************************************** * input_file.c: functions to read from a file - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "input.h" #include "input_file.h" diff --git a/src/input/input_file.h b/src/input/input_file.h index 3a1d3111ff..8149787507 100644 --- a/src/input/input_file.h +++ b/src/input/input_file.h @@ -1,6 +1,24 @@ /***************************************************************************** * input_file.h: file streams functions interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/input/input_netlist.c b/src/input/input_netlist.c index ca961781a1..c64f5462b6 100644 --- a/src/input/input_netlist.c +++ b/src/input/input_netlist.c @@ -1,24 +1,41 @@ /***************************************************************************** * netlist.c: input thread - * (c)1998 VideoLAN - ***************************************************************************** * Manages the TS and PES netlists (see netlist.h). + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ + +#include /* free() */ +#include /* strerror() */ +#include /* errno */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" #include "input.h" diff --git a/src/input/input_network.c b/src/input/input_network.c index be3dbc5fca..9e932ff43e 100644 --- a/src/input/input_network.c +++ b/src/input/input_network.c @@ -1,29 +1,48 @@ /***************************************************************************** * network.c: functions to read from the network - * (c)1999 VideoLAN - ***************************************************************************** * Manages a socket. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include /* servent, getservbyname(), hostent, gethostbyname() */ -#include /* socket(), setsockopt(), bind(), connect() */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ +#include /* strerror() */ #include /* close() */ +#include /* errno */ +#include /* "input_network.h" */ + +#ifdef SYS_BSD +#include /* struct sockaddr */ +#endif + +#include /* servent, getservbyname(), hostent, gethostbyname() */ #include /* sockaddr_in, htons(), htonl() */ -#include -#include -#include #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "netutils.h" #include "input.h" diff --git a/src/input/input_network.h b/src/input/input_network.h index 1e0d153ffc..1ceeb453ac 100644 --- a/src/input/input_network.h +++ b/src/input/input_network.h @@ -1,6 +1,24 @@ /***************************************************************************** * input_network.h: network functions interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/input/input_pcr.c b/src/input/input_pcr.c index 9132db7da6..11a5e51ae9 100644 --- a/src/input/input_pcr.c +++ b/src/input/input_pcr.c @@ -1,24 +1,39 @@ /***************************************************************************** * pcr.c: PCR management - * (c)1999 VideoLAN - ***************************************************************************** * Manages structures containing PCR information. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include /* iovec */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include /* atoi(), malloc(), free() */ -#include -#include +#include /* ntohl() */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "debug.h" #include "input.h" #include "intf_msg.h" diff --git a/src/input/input_pcr.h b/src/input/input_pcr.h index b25dff0cde..38b03eda09 100644 --- a/src/input/input_pcr.h +++ b/src/input/input_pcr.h @@ -1,6 +1,24 @@ /***************************************************************************** * input_pcr.h: PCR management interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* Maximum number of samples used to compute the dynamic average value, diff --git a/src/input/input_psi.c b/src/input/input_psi.c index b597a640fd..b03745dab1 100644 --- a/src/input/input_psi.c +++ b/src/input/input_psi.c @@ -1,15 +1,33 @@ /***************************************************************************** * psi.c: PSI management - * (c)1999 VideoLAN - ***************************************************************************** * Manages structures containing PSI information, and affiliated decoders. - * TO DO: Fonctions d'init des structures + * TODO: Fonctions d'init des structures + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include /* free(), realloc() */ #include /* bzero() */ #include /* ntohs() */ @@ -17,7 +35,7 @@ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" diff --git a/src/input/input_psi.h b/src/input/input_psi.h index 9a358d1593..ee33971f23 100644 --- a/src/input/input_psi.h +++ b/src/input/input_psi.h @@ -1,6 +1,24 @@ /***************************************************************************** * psi.h: PSI management interface - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/input/input_vlan.c b/src/input/input_vlan.c index b59ddf729f..c901077d73 100644 --- a/src/input/input_vlan.c +++ b/src/input/input_vlan.c @@ -1,6 +1,24 @@ /***************************************************************************** * input_vlan.c: vlan management library - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** @@ -12,17 +30,22 @@ #include /* strerror(), bzero() */ #include /* free() */ +#ifdef SYS_BSD +#include /* struct in_addr */ +#include /* struct sockaddr */ +#endif + #include /* inet_ntoa(), inet_aton() */ -#include /* ioctl() */ #ifdef SYS_LINUX +#include /* ioctl() */ #include /* interface (arch-dependent) */ #endif #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "netutils.h" #include "input_vlan.h" #include "intf_msg.h" diff --git a/src/interface/interface.c b/src/interface/interface.c index c9573fa71c..3636431bd6 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -1,19 +1,36 @@ /***************************************************************************** * interface.c: interface access for other threads - * (c)1998 VideoLAN - ***************************************************************************** * This library provides basic functions for threads to interact with user * interface, such as command line. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include +#include /* ENOMEM */ +#include /* sprintf() */ +#include /* free(), strtol() */ +#include /* strerror() */ +#include /* on BSD, uio.h needs types.h */ #include /* for input.h */ #include /* plugins */ @@ -21,16 +38,19 @@ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "input.h" + #include "intf_msg.h" #include "interface.h" #include "intf_cmd.h" #include "intf_console.h" -#include "main.h" + #include "video.h" #include "video_output.h" +#include "main.h" + /***************************************************************************** * intf_channel_t: channel description ***************************************************************************** diff --git a/src/interface/intf_cmd.c b/src/interface/intf_cmd.c index d2e0723f12..6ccb75bcc2 100644 --- a/src/interface/intf_cmd.c +++ b/src/interface/intf_cmd.c @@ -1,24 +1,41 @@ /***************************************************************************** * intf_cmd.c: interface commands parsing and executions functions - * (c)1998 VideoLAN - ***************************************************************************** * This file implements the interface commands execution functions. It is used * by command-line oriented interfaces and scripts. The commands themselves are * implemented in intf_ctrl. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#include /* errno */ +#include /* FILE */ +#include /* strtod(), strtol() */ +#include /* strerror() */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "interface.h" #include "intf_msg.h" diff --git a/src/interface/intf_cmd.h b/src/interface/intf_cmd.h index c83ebe02f4..ab6aebcffa 100644 --- a/src/interface/intf_cmd.h +++ b/src/interface/intf_cmd.h @@ -1,11 +1,30 @@ /***************************************************************************** * intf_cmd.h: interface commands parsing and executions functions - * (c)1999 VideoLAN - ***************************************************************************** * This file implements the interface commands execution functions. It is used * by command-line oriented interfaces and scripts. The commands themselves are * implemented in intf_ctrl. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * none *****************************************************************************/ diff --git a/src/interface/intf_console.c b/src/interface/intf_console.c index e65337d2c7..bb158dd83e 100644 --- a/src/interface/intf_console.c +++ b/src/interface/intf_console.c @@ -1,12 +1,30 @@ /***************************************************************************** * intf_console.c: generic console for interface - * (c)1998 VideoLAN + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#include /* malloc() */ #include "config.h" diff --git a/src/interface/intf_console.h b/src/interface/intf_console.h index 97358cd4a5..5c82d55362 100644 --- a/src/interface/intf_console.h +++ b/src/interface/intf_console.h @@ -1,6 +1,24 @@ /***************************************************************************** * intf_console.h: generic console methods for interface - * (c)1998 VideoLAN + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/interface/intf_ctrl.c b/src/interface/intf_ctrl.c index d76425e7cb..5ccff0acbe 100644 --- a/src/interface/intf_ctrl.c +++ b/src/interface/intf_ctrl.c @@ -1,7 +1,5 @@ /***************************************************************************** * intf_ctrl.c: interface commands access to control functions - * (c)1999 VideoLAN - ***************************************************************************** * Library of functions common to all interfaces, allowing access to various * structures and settings. Interfaces should only use those functions * to read or write informations from other threads. @@ -19,24 +17,43 @@ * error codes defined in command.h. Custom error codes are allowed, but should * be positive. * More informations about parameters stand in `list of commands' section. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* on BSD, fstat() needs stat.h */ +#include /* "input.h" */ +#include /* fprintf() */ +#include /* malloc(), free() */ +#include /* close(), read() */ +#include /* open() */ /* Common headers */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "debug.h" #include "intf_msg.h" diff --git a/src/interface/intf_ctrl.h b/src/interface/intf_ctrl.h index 88f7bce7e0..2a8d6c766f 100644 --- a/src/interface/intf_ctrl.h +++ b/src/interface/intf_ctrl.h @@ -1,11 +1,30 @@ /***************************************************************************** * intf_ctrl.h: interface commands access to control functions - * (c)1999 VideoLAN - ***************************************************************************** * Library of functions common to all interfaces, allowing access to various * structures and settings. Interfaces should only use those functions * to read or write informations from other threads. ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Required headers: * none *****************************************************************************/ diff --git a/src/interface/intf_msg.c b/src/interface/intf_msg.c index 166889aff3..7fb09521b1 100644 --- a/src/interface/intf_msg.c +++ b/src/interface/intf_msg.c @@ -1,29 +1,47 @@ /***************************************************************************** * intf_msg.c: messages interface - * (c)1998 VideoLAN - ***************************************************************************** * This library provides basic functions for threads to interact with user * interface, such as message output. See config.h for output configuration. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include -#include +#include /* errno */ +#include /* O_CREAT, O_TRUNC, O_WRONLY, O_SYNC */ +#include /* required */ +#include /* va_list for BSD */ +#include /* malloc() */ +#include /* strerror() */ +#include /* close(), write() */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "interface.h" #include "intf_console.h" + #include "main.h" /***************************************************************************** @@ -127,9 +145,14 @@ p_intf_msg_t intf_MsgCreate( void ) /* Log file initialization - on failure, file pointer will be null, * and no log will be issued, but this is not considered as an * error */ - p_msg->i_log_file = open( DEBUG_LOG, - O_CREAT | O_TRUNC | O_SYNC | O_WRONLY, - 0666 ); + p_msg->i_log_file = open( DEBUG_LOG, O_CREAT | O_TRUNC | +#ifndef SYS_BSD + O_SYNC | +#else + O_ASYNC | +#endif /* SYS_BSD */ + O_WRONLY, 0666 ); + #endif } return( p_msg ); diff --git a/src/interface/intf_sys.h b/src/interface/intf_sys.h index 206fb1bd80..13426ce266 100644 --- a/src/interface/intf_sys.h +++ b/src/interface/intf_sys.h @@ -1,6 +1,24 @@ /***************************************************************************** * intf_sys.h: system dependant interface API - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/interface/main.c b/src/interface/main.c index b11baa2aca..5b6967e930 100644 --- a/src/interface/main.c +++ b/src/interface/main.c @@ -1,29 +1,50 @@ /***************************************************************************** * main.c: main vlc source - * (c)1998 VideoLAN - ***************************************************************************** * Includes the main() function for vlc. Parses command line, start interface * and spawn threads. + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* getopt() */ +#include /* SIGHUP, SIGINT, SIGKILL */ +#include /* sprintf() */ + +#include /* ENOMEM */ +#include /* getenv(), strtol(), */ +#include /* strerror() */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "input_vlan.h" + #include "intf_msg.h" #include "interface.h" + #include "audio_output.h" + #include "main.h" /***************************************************************************** diff --git a/src/misc/decoder_fifo.c b/src/misc/decoder_fifo.c index f8a94f2f02..f0a4c9031f 100644 --- a/src/misc/decoder_fifo.c +++ b/src/misc/decoder_fifo.c @@ -1,14 +1,33 @@ /***************************************************************************** * decoder_fifo.c: auxiliaries functions used in decoder_fifo.h - * (c)1998 VideoLAN + ***************************************************************************** + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ -#include +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "debug.h" /* XXX?? temporaire, requis par netlist.h */ diff --git a/src/misc/mtime.c b/src/misc/mtime.c index 6d2393c051..af4809e1b4 100644 --- a/src/misc/mtime.c +++ b/src/misc/mtime.c @@ -1,18 +1,36 @@ /***************************************************************************** * mtime.c: high rezolution time management functions - * (c)1998 VideoLAN - ***************************************************************************** * Functions are prototyped in mtime.h. ***************************************************************************** - * to-do list: - * see if using Linux real-time extensions is possible and profitable + * Copyright (C) 1998, 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ +/* + * TODO: + * see if using Linux real-time extensions is possible and profitable + */ + /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include +#include /* sprintf() */ #include #include "common.h" diff --git a/src/misc/netutils.c b/src/misc/netutils.c index 56f830fdff..2aeed67c73 100644 --- a/src/misc/netutils.c +++ b/src/misc/netutils.c @@ -1,8 +1,24 @@ /***************************************************************************** * netutils.c: various network functions - * (c)1999 VideoLAN ***************************************************************************** - * XXX?? + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** @@ -12,10 +28,16 @@ #include /* free(), realloc(), atoi() */ #include /* errno() */ #include /* bzero(), bcopy() */ -#include /* ioctl() */ + +#ifdef SYS_BSD +#include /* struct in_addr */ +#include /* struct sockaddr */ +#endif + #include /* htons(), htonl() */ #ifdef SYS_LINUX +#include /* ioctl() */ #include /* interface (arch-dependent) */ #endif diff --git a/src/misc/rsc_files.c b/src/misc/rsc_files.c index 9137f710be..e2816354f2 100644 --- a/src/misc/rsc_files.c +++ b/src/misc/rsc_files.c @@ -1,9 +1,26 @@ /***************************************************************************** * rsc_files.c: resources files manipulation functions - * (c)1999 VideoLAN - ***************************************************************************** * This library describe a general format used to store 'resources'. Resources * can be anything, including pictures, audio streams, and so on. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** @@ -25,12 +42,11 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* errno */ +#include /* open() */ +#include /* free() */ +#include /* strerror(), strncopy() */ +#include /* read(), close(), lseek(), write() */ #include "config.h" #include "common.h" diff --git a/src/spu_decoder/spu_decoder.c b/src/spu_decoder/spu_decoder.c index 5f276966d2..3fa4708141 100644 --- a/src/spu_decoder/spu_decoder.c +++ b/src/spu_decoder/spu_decoder.c @@ -1,6 +1,24 @@ /***************************************************************************** * spu_decoder.c : spu decoder thread - * (c)2000 VideoLAN + ***************************************************************************** + * Copyright (C) 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* repompé sur video_decoder.c @@ -9,22 +27,18 @@ /***************************************************************************** * Preamble *****************************************************************************/ -//#include "vlc.h" - -#include -#include -#include -#include -#include -#include +#include /* malloc(), free() */ +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ +#include /* getpid() */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ +#include "debug.h" /* ASSERT */ #include "input.h" #include "input_netlist.h" diff --git a/src/video_decoder/vdec_idct.c b/src/video_decoder/vdec_idct.c index d9a9c33082..b0b1aaee00 100644 --- a/src/video_decoder/vdec_idct.c +++ b/src/video_decoder/vdec_idct.c @@ -1,29 +1,40 @@ /***************************************************************************** * vdec_idct.c : IDCT functions - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ - -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" diff --git a/src/video_decoder/vdec_idctmmx.S b/src/video_decoder/vdec_idctmmx.S index 78e81c0d2e..b002d90659 100644 --- a/src/video_decoder/vdec_idctmmx.S +++ b/src/video_decoder/vdec_idctmmx.S @@ -1,3 +1,26 @@ +/***************************************************************************** + * vdec_idctmmx.S : MMX IDCT implementation + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + /* * the input data is tranposed and each 16 bit element in the 8x8 matrix * is left aligned: diff --git a/src/video_decoder/vdec_motion.c b/src/video_decoder/vdec_motion.c index 14c7a2b1ea..bde293bda1 100644 --- a/src/video_decoder/vdec_motion.c +++ b/src/video_decoder/vdec_motion.c @@ -1,28 +1,40 @@ /***************************************************************************** * vdec_motion.c : motion compensation routines - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" @@ -165,7 +177,7 @@ static __inline__ void Motion420( * p_mb->p_picture->i_width; if( i_source_offset >= p_source->i_width * p_source->i_height ) { - fprintf( stderr, "vdec error: bad motion vector\n" ); + intf_ErrMsg( "vdec error: bad motion vector\n" ); return; } @@ -192,7 +204,7 @@ static __inline__ void Motion420( * p_mb->p_picture->i_chroma_width; if( i_source_offset >= (p_source->i_width * p_source->i_height) / 4 ) { - fprintf( stderr, "vdec error: bad motion vector\n" ); + intf_ErrMsg( "vdec error: bad motion vector\n" ); return; } diff --git a/src/video_decoder/vdec_motion_inner.c b/src/video_decoder/vdec_motion_inner.c index 51f0f0b02b..56689d8de1 100644 --- a/src/video_decoder/vdec_motion_inner.c +++ b/src/video_decoder/vdec_motion_inner.c @@ -1,28 +1,40 @@ /***************************************************************************** * vdec_motion.c : motion compensation routines - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c index 4f59d0b999..03d49892aa 100644 --- a/src/video_decoder/video_decoder.c +++ b/src/video_decoder/video_decoder.c @@ -1,6 +1,24 @@ /***************************************************************************** * video_decoder.c : video decoder thread - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* FIXME: passer en terminate/destroy avec les signaux supplémentaires ?? */ @@ -8,25 +26,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -//#include "vlc.h" - -#include -#include -#include -#include -#include -#include +#include /* free() */ +#include /* getpid() */ +#include /* on BSD, uio.h needs types.h */ +#include /* for input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" @@ -445,7 +457,7 @@ void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, macroblock_t * p_mb ) */ if( p_mb->pf_motion == 0 ) { - fprintf( stderr, "vdec error: pf_motion set to NULL\n" ); + intf_ErrMsg( "vdec error: pf_motion set to NULL\n" ); } else { diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 797cb59678..dd54b6b122 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -1,30 +1,48 @@ /***************************************************************************** * video_output.c : video output thread - * (c)2000 VideoLAN - ***************************************************************************** * This module describes the programming interface for video output threads. * It includes functions allowing to open a new thread, send pictures to a - * thread, and destroy a previously oppenned video output thread. + * thread, and destroy a previously oppened video output thread. + ***************************************************************************** + * Copyright (C) 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#include /* ENOMEM */ +#include /* free() */ +#include /* sprintf() */ +#include /* strerror() */ #include /* plugins */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "video.h" #include "video_output.h" #include "video_text.h" #include "video_yuv.h" + #include "intf_msg.h" #include "main.h" diff --git a/src/video_output/video_sys.h b/src/video_output/video_sys.h index 94f218463d..4f68e348f7 100644 --- a/src/video_output/video_sys.h +++ b/src/video_output/video_sys.h @@ -1,6 +1,24 @@ /***************************************************************************** * video_sys.h: system dependant video output display method API - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/video_output/video_text.c b/src/video_output/video_text.c index 874aeca725..d21a5f430b 100644 --- a/src/video_output/video_text.c +++ b/src/video_output/video_text.c @@ -1,21 +1,39 @@ /***************************************************************************** * video_text.c : text manipulation functions - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* errno */ +#include /* free() */ +#include /* strerror() */ +#include /* open() */ +#include /* read(), close() */ #include "common.h" #include "config.h" #include "video_text.h" + #include "intf_msg.h" /***************************************************************************** diff --git a/src/video_output/video_text.h b/src/video_output/video_text.h index cc60e93573..37d6b4c0c8 100644 --- a/src/video_output/video_text.h +++ b/src/video_output/video_text.h @@ -1,6 +1,24 @@ /***************************************************************************** * video_text.h : text manipulation functions - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* Text styles - these are primary text styles, used by the vout_Print function. diff --git a/src/video_output/video_yuv.c b/src/video_output/video_yuv.c index 23a9b0e54e..3b8ed95f7a 100644 --- a/src/video_output/video_yuv.c +++ b/src/video_output/video_yuv.c @@ -1,27 +1,45 @@ /***************************************************************************** * video_yuv.c: YUV transformation functions - * (c)1999 VideoLAN - ***************************************************************************** * Provides functions to perform the YUV conversion. The functions provided here * are a complete and portable C implementation, and may be replaced in certain * case by optimized functions. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include +#include /* exp(), pow() */ +#include /* ENOMEM */ +#include /* free() */ +#include /* strerror() */ #include "common.h" #include "config.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "video.h" #include "video_output.h" #include "video_yuv.h" + #include "intf_msg.h" /***************************************************************************** diff --git a/src/video_output/video_yuv.h b/src/video_output/video_yuv.h index 748a0a1eba..10939cfa21 100644 --- a/src/video_output/video_yuv.h +++ b/src/video_output/video_yuv.h @@ -1,9 +1,26 @@ /***************************************************************************** * video_yuv.h: YUV transformation functions - * (c)1999 VideoLAN - ***************************************************************************** * Provides functions prototypes to perform the YUV conversion. The functions * may be implemented in one of the video_yuv_* files. + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** diff --git a/src/video_output/video_yuv_mmx.S b/src/video_output/video_yuv_mmx.S index 1b03d86138..e0fd3ced30 100644 --- a/src/video_output/video_yuv_mmx.S +++ b/src/video_output/video_yuv_mmx.S @@ -1,7 +1,27 @@ /***************************************************************************** * video_yuv_mmx.S: YUV transformation, optimized for MMX processors - * (c)1999 VideoLAN ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + *****************************************************************************/ + +/***************************************************************************** * Following functions are defined: * vout_YUV420_16_MMX * This function performs YUV12-to-RGB16 color conversion for H26x. diff --git a/src/video_parser/video_fifo.c b/src/video_parser/video_fifo.c index 0c625def24..3c48da63b0 100644 --- a/src/video_parser/video_fifo.c +++ b/src/video_parser/video_fifo.c @@ -1,22 +1,36 @@ /***************************************************************************** * video_fifo.c : video FIFO management - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" /* XXX?? temporaire, requis par netlist.h */ diff --git a/src/video_parser/video_parser.c b/src/video_parser/video_parser.c index 292c32d80e..29b3dabbb3 100644 --- a/src/video_parser/video_parser.c +++ b/src/video_parser/video_parser.c @@ -1,6 +1,24 @@ /***************************************************************************** * video_parser.c : video parser thread - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /* FIXME: passer en terminate/destroy avec les signaux supplémentaires ?? */ @@ -8,17 +26,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* malloc(), free() */ +#include /* getpid() */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" /* XXX?? temporaire, requis par netlist.h */ diff --git a/src/video_parser/vpar_blocks.c b/src/video_parser/vpar_blocks.c index ed643606ac..ec14db40c1 100644 --- a/src/video_parser/vpar_blocks.c +++ b/src/video_parser/vpar_blocks.c @@ -1,22 +1,36 @@ /***************************************************************************** * vpar_blocks.c : blocks parsing - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" #include "debug.h" /* XXX?? temporaire, requis par netlist.h */ @@ -37,19 +51,8 @@ #include "video_parser.h" #include "video_fifo.h" - - - - - - static int i_count = 0; - - - - - /* * Welcome to vpar_blocks.c ! Here's where the heavy processor-critical parsing * task is done. This file is divided in several parts : @@ -1642,7 +1645,7 @@ i_count++; if( i_inc < 0 ) { - fprintf( stderr, "vpar error: bad address increment (%d)\n", i_inc ); + intf_ErrMsg( "vpar error: bad address increment (%d)\n", i_inc ); p_vpar->picture.b_error = 1; return; } @@ -1863,7 +1866,7 @@ static __inline__ void SliceHeader( vpar_thread_t * p_vpar, if( *pi_mb_address < i_mb_address_save ) { - fprintf( stderr, "vpar error: slices do not follow, maybe a PES has been trashed\n" ); + intf_ErrMsg( "vpar error: slices do not follow, maybe a PES has been trashed\n" ); p_vpar->picture.b_error = 1; return; } diff --git a/src/video_parser/vpar_headers.c b/src/video_parser/vpar_headers.c index db10c7ca0c..41499974ed 100644 --- a/src/video_parser/vpar_headers.c +++ b/src/video_parser/vpar_headers.c @@ -1,28 +1,41 @@ /***************************************************************************** * vpar_headers.c : headers parsing - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* free() */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" @@ -218,7 +231,7 @@ static __inline__ void LoadMatrix( vpar_thread_t * p_vpar, quant_matrix_t * p_ma /* Allocate a piece of memory to load the matrix. */ if( (p_matrix->pi_matrix = (int *)malloc( 64*sizeof(int) )) == NULL ) { - intf_ErrMsg("vpar error: allocation error in LoadMatrix()\n"); + intf_ErrMsg( "vpar error: allocation error in LoadMatrix()\n" ); p_vpar->b_error = 1; return; } @@ -762,7 +775,7 @@ static void PictureHeader( vpar_thread_t * p_vpar ) /* Try to find an optimized function. */ if( ppf_picture_data[p_vpar->picture.i_structure][p_vpar->picture.i_coding_type] == NULL ) { - fprintf( stderr, "vpar error: bad ppf_picture_data function pointer (struct:%d, coding type:%d)\n", + intf_ErrMsg( "vpar error: bad ppf_picture_data function pointer (struct:%d, coding type:%d)\n", p_vpar->picture.i_structure, p_vpar->picture.i_coding_type ); } else diff --git a/src/video_parser/vpar_synchro.c b/src/video_parser/vpar_synchro.c index e5d65fbf5a..7c7c18a8ea 100644 --- a/src/video_parser/vpar_synchro.c +++ b/src/video_parser/vpar_synchro.c @@ -1,28 +1,41 @@ /***************************************************************************** * vpar_motion.c : motion vectors parsing - * (c)1999 VideoLAN + ***************************************************************************** + * Copyright (C) 1999, 2000 VideoLAN + * + * Authors: + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#include /* free() */ +#include /* on BSD, uio.h needs types.h */ +#include /* "input.h" */ #include "config.h" #include "common.h" #include "mtime.h" -#include "vlc_thread.h" +#include "threads.h" #include "intf_msg.h" -#include "debug.h" /* XXX?? temporaire, requis par netlist.h */ #include "input.h" -#include "input_netlist.h" #include "decoder_fifo.h" #include "video.h" #include "video_output.h" @@ -35,7 +48,6 @@ #include "vpar_headers.h" #include "vpar_synchro.h" #include "video_parser.h" -#include "video_fifo.h" #define MAX_COUNT 3 @@ -535,7 +547,7 @@ void vpar_SynchroSetCurrentDate( vpar_thread_t * p_vpar, int i_coding_type ) { if( p_pes->i_pts < p_vpar->synchro.i_current_frame_date ) { - fprintf( stderr, "vpar warning: pts_date < current_date\n" ); + intf_ErrMsg( "vpar warning: pts_date < current_date\n" ); } p_vpar->synchro.i_current_frame_date = p_pes->i_pts; p_pes->b_has_pts = 0; @@ -556,7 +568,7 @@ void vpar_SynchroSetCurrentDate( vpar_thread_t * p_vpar, int i_coding_type ) { if( p_vpar->synchro.i_backward_frame_date < p_vpar->synchro.i_current_frame_date ) { - fprintf( stderr, "vpar warning: backward_date < current_date (%Ld)\n", + intf_ErrMsg( "vpar warning: backward_date < current_date (%Ld)\n", p_vpar->synchro.i_backward_frame_date - p_vpar->synchro.i_current_frame_date ); } p_vpar->synchro.i_current_frame_date = p_vpar->synchro.i_backward_frame_date; -- 2.39.2