From: Darren S. <li...@yo...> - 2009-11-30 21:59:35
|
# [node 71245c945c1ab1d9a525d209a340a6e9688b42a6 part 1] diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h --- a/include/xine/xine_internal.h +++ b/include/xine/xine_internal.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2005 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -74,11 +74,11 @@ */ struct xine_s { - + config_values_t *config; plugin_catalog_t *plugin_catalog; - + int verbosity; int demux_strategy; @@ -89,7 +89,7 @@ xine_list_t *streams; pthread_mutex_t streams_lock; - + metronom_clock_t *clock; /** Handle for libxdg-basedir functions. It's actually an xdgHandle. */ @@ -115,34 +115,34 @@ * the ticket before any operation that might block * * you must never write to this member directly - */ + */ int ticket_revoked; - + /* apply for a ticket; between acquire and relese of an irrevocable * ticket (be sure to pair them properly!), it is guaranteed that you * will never be blocked by ticket revocation */ void (*acquire)(xine_ticket_t *self, int irrevocable); - + /* give a ticket back */ void (*release)(xine_ticket_t *self, int irrevocable); - + /* renew a ticket, when it has been revoked, see ticket_revoked above; * irrevocable must be set to one, if your thread might have acquired * irrevocable tickets you don't know of; set it to zero only when * you know that this is impossible */ void (*renew)(xine_ticket_t *self, int irrevocable); - + #ifdef XINE_ENGINE_INTERNAL /* allow handing out new tickets */ void (*issue)(xine_ticket_t *self, int atomic); - + /* revoke all tickets and deny new ones; * a pair of atomic revoke and issue cannot be interrupted by another * revocation or by other threads acquiring tickets */ void (*revoke)(xine_ticket_t *self, int atomic); - + /* behaves like acquire() but doesn't block the calling thread; when - * the thread would have been blocked, 0 is returned otherwise 1 + * the thread would have been blocked, 0 is returned otherwise 1 * this function acquires a ticket even if ticket revocation is active */ int (*acquire_nonblocking)(xine_ticket_t *self, int irrevocable); @@ -154,7 +154,7 @@ void (*unlock_port_rewiring)(xine_ticket_t *self); void (*dispose)(xine_ticket_t *self); - + pthread_mutex_t lock; pthread_mutex_t revoke_lock; pthread_cond_t issued; @@ -194,25 +194,25 @@ */ struct xine_stream_s { - + /* reference to xine context */ xine_t *xine; - /* metronom instance used by current stream */ + /* metronom instance used by current stream */ metronom_t *metronom; - + /* demuxers use input_plugin to read data */ input_plugin_t *input_plugin; - + /* used by video decoders */ xine_video_port_t *video_out; - + /* demuxers send data to video decoders using this fifo */ fifo_buffer_t *video_fifo; - + /* used by audio decoders */ xine_audio_port_t *audio_out; - + /* demuxers send data to audio decoders using this fifo */ fifo_buffer_t *audio_fifo; @@ -225,10 +225,10 @@ /* input_dvd uses this one. is it possible to add helper functions instead? */ spu_decoder_t *spu_decoder_plugin; - + /* dxr3 use this one, should be possible to fix to use the port instead */ vo_driver_t *video_driver; - + /* these definitely should be made private! */ int audio_channel_auto; int spu_decoder_streamtype; @@ -236,13 +236,13 @@ int spu_channel_auto; int spu_channel_letterbox; int spu_channel; - + /* current content detection method, see METHOD_BY_xxx */ int content_detection_method; #ifdef XINE_ENGINE_INTERNAL /* these are private variables, plugins must not access them */ - + int status; /* lock controlling speed change access */ @@ -271,7 +271,7 @@ extra_info_t *video_decoder_extra_info; int video_decoder_streamtype; int video_channel; - + uint32_t audio_track_map[50]; int audio_track_map_entries; @@ -317,15 +317,15 @@ /* wait for headers sent / stream decoding finished */ pthread_mutex_t counter_lock; pthread_cond_t counter_changed; - int header_count_audio; - int header_count_video; - int finished_count_audio; - int finished_count_video; + int header_count_audio; + int header_count_video; + int finished_count_audio; + int finished_count_video; /* event mechanism */ xine_list_t *event_queues; pthread_mutex_t event_queues_lock; - + /* demux thread stuff */ pthread_t demux_thread; pthread_mutex_t demux_lock; @@ -339,14 +339,14 @@ int delay_finish_event; /* delay event in 1/10 sec units. 0=>no delay, -1=>forever */ int slave_affection; /* what operations need to be propagated down to the slave? */ - + int err; - + xine_post_out_t video_source; xine_post_out_t audio_source; - + broadcaster_t *broadcaster; - + refcounter_t *refcounter; #endif }; @@ -387,11 +387,11 @@ void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ) XINE_PROTECTED; void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) XINE_PROTECTED; - - + + /* demuxer helper functions from demux.c */ -/* +/* * Flush audio and video buffers. It is called from demuxers on * seek/stop, and may be useful when user input changes a stream and * xine-lib has cached buffers that have yet to be played. @@ -421,9 +421,9 @@ int input_normpos, int input_time, int total_time, uint32_t frame_number) XINE_PROTECTED; -int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, - int size, int64_t pts, uint32_t type, - uint32_t decoder_flags, off_t input_normpos, +int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, + int size, int64_t pts, uint32_t type, + uint32_t decoder_flags, off_t input_normpos, int input_time, int total_time, uint32_t frame_number) XINE_PROTECTED; @@ -436,7 +436,7 @@ */ void _x_mrl_unescape(char *mrl) XINE_PROTECTED; -/* +/* * plugin_loader functions * */ diff --git a/include/xine/xine_plugin.h b/include/xine/xine_plugin.h --- a/include/xine/xine_plugin.h +++ b/include/xine/xine_plugin.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -33,7 +33,7 @@ #define PLUGIN_VIDEO_OUT 7 #define PLUGIN_POST 8 -#define PLUGIN_TYPE_MAX PLUGIN_POST +#define PLUGIN_TYPE_MAX PLUGIN_POST /* this flag may be or'ed with type in order to force preloading the plugin. * very useful to register config items on xine initialization. diff --git a/include/xine/xineintl.h b/include/xine/xineintl.h --- a/include/xine/xineintl.h +++ b/include/xine/xineintl.h @@ -1,18 +1,18 @@ /* * Copyright (C) 2000-2005 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h --- a/include/xine/xineutils.h +++ b/include/xine/xineutils.h @@ -47,7 +47,7 @@ #include <stdio.h> #include <string.h> -/* +/* * Mark exported data symbols for link engine library clients with older * Win32 compilers */ diff --git a/include/xine/xmlparser.h b/include/xine/xmlparser.h --- a/include/xine/xmlparser.h +++ b/include/xine/xmlparser.h @@ -88,9 +88,9 @@ void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED; const char *xml_parser_get_property (const xml_node_t *node, const char *name) XINE_PROTECTED; -int xml_parser_get_property_int (const xml_node_t *node, const char *name, +int xml_parser_get_property_int (const xml_node_t *node, const char *name, int def_value) XINE_PROTECTED; -int xml_parser_get_property_bool (const xml_node_t *node, const char *name, +int xml_parser_get_property_bool (const xml_node_t *node, const char *name, int def_value) XINE_PROTECTED; /* for output: diff --git a/lib/Makefile.am b/lib/Makefile.am --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,5 +7,5 @@ noinst_LTLIBRARIES = libxineposix.la noinst_HEADERS = os_internal.h -libxineposix_la_SOURCES = +libxineposix_la_SOURCES = libxineposix_la_LIBADD = @LTLIBOBJS@ diff --git a/lib/asprintf.c b/lib/asprintf.c --- a/lib/asprintf.c +++ b/lib/asprintf.c @@ -29,7 +29,7 @@ { char *buf = NULL; int size = 128; - + for (;;) { int ret; @@ -41,11 +41,11 @@ return -1; } buf = newbuf; - + va_copy (cp, ap); ret = vsnprintf (buf, size, format, cp); va_end (cp); - + if (ret >= 0 && ret < size) { *buffer = realloc (buf, ret + 1); diff --git a/lib/dirent_msvc.c b/lib/dirent_msvc.c --- a/lib/dirent_msvc.c +++ b/lib/dirent_msvc.c @@ -11,7 +11,7 @@ that this copyright and permissions notice appear in all copies and derivatives, and that no charge may be made for the software and its documentation except to cover cost of distribution. - + This software is supplied "as is" without express or implied warranty. But that said, if there are any problems please get in touch. diff --git a/lib/strsep.c b/lib/strsep.c --- a/lib/strsep.c +++ b/lib/strsep.c @@ -35,7 +35,7 @@ /* * Get next token from string *stringp, where tokens are possibly-empty - * strings separated by characters from delim. + * strings separated by characters from delim. * * Writes NULs into the string at *stringp to end tokens. * delim need not remain constant from call to call. diff --git a/m4/attributes.m4 b/m4/attributes.m4 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -25,7 +25,7 @@ dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by this project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend @@ -114,7 +114,7 @@ dnl First of all check for the --no-undefined variant of GNU ld. This allows dnl for a much more readable commandline, so that people can understand what dnl it does without going to look for what the heck -z defs does. - for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do + for possible_flags in "-Wl,--no-undefined" "-Wl,-z,defs"; do CC_CHECK_LDFLAGS([$possible_flags], [LDFLAGS_NOUNDEFINED="$possible_flags"]) break done @@ -257,7 +257,7 @@ cc_cv_flag_visibility='yes', cc_cv_flag_visibility='no') CFLAGS="$cc_flag_visibility_save_CFLAGS"]) - + AS_IF([test "x$cc_cv_flag_visibility" = "xyes"], [AC_DEFINE([SUPPORT_FLAG_VISIBILITY], 1, [Define this if the compiler supports the -fvisibility flag]) diff --git a/m4/decoders.m4 b/m4/decoders.m4 --- a/m4/decoders.m4 +++ b/m4/decoders.m4 @@ -240,7 +240,7 @@ x86_64-*) AC_DEFINE([FPM_64BIT], 1, [Define to select libmad fixed point arithmetic implementation]) ;; - ppc-* | powerpc-*) + ppc-* | powerpc-*) AC_DEFINE([FPM_PPC], 1, [Define to select libmad fixed point arithmetic implementation]) ;; sparc*-*) diff --git a/m4/directx.m4 b/m4/directx.m4 --- a/m4/directx.m4 +++ b/m4/directx.m4 @@ -6,7 +6,7 @@ dnl dnl AM_PATH_DIRECTX([ACTION IF FOUND [, ACTION IF NOT FOUND]])) dnl -dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and +dnl It looks for DirectX, defines DIRECTX_CPPFLAGS, DIRECTX_AUDIO_LIBS and dnl DIRECTX_VIDEO_LIBS. dnl AC_DEFUN([AM_PATH_DIRECTX], [ diff --git a/m4/getopt_long.m4 b/m4/getopt_long.m4 --- a/m4/getopt_long.m4 +++ b/m4/getopt_long.m4 @@ -19,13 +19,13 @@ int option_index = 0; int c; opterr = 0; - while ((c = getopt_long (argc, argv, "?hv", + while ((c = getopt_long (argc, argv, "?hv", long_options, &option_index)) != EOF) ; return 0; } ]])], - [AC_MSG_RESULT(yes); + [AC_MSG_RESULT(yes); ac_getopt_long=yes; AC_DEFINE(HAVE_GETOPT_LONG,,[Define this if you have GNU getopt_long() implemented])], [AC_MSG_RESULT(no); ac_getopt_long=no], diff --git a/m4/libFLAC.m4 b/m4/libFLAC.m4 --- a/m4/libFLAC.m4 +++ b/m4/libFLAC.m4 @@ -5,7 +5,7 @@ dnl Test for libFLAC, and define LIBFLAC_CFLAGS and LIBFLAC_LIBS dnl AC_DEFUN([AM_PATH_LIBFLAC], -[dnl +[dnl dnl Get the cflags and libraries dnl AC_ARG_WITH(libFLAC-prefix, AS_HELP_STRING([--with-libFLAC-prefix=DIR], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="") @@ -98,7 +98,7 @@ if test "x$no_libFLAC" = "x" ; then AC_MSG_RESULT(yes) - ifelse([$1], , :, [$1]) + ifelse([$1], , :, [$1]) else AC_MSG_RESULT(no) if test -f conf.libFLACtest ; then diff --git a/m4/misc.m4 b/m4/misc.m4 --- a/m4/misc.m4 +++ b/m4/misc.m4 @@ -25,7 +25,7 @@ dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by this project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend diff --git a/m4/pkg.m4 b/m4/pkg.m4 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -1,5 +1,5 @@ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# +# # Copyright © 2004 Scott James Remnant <sc...@ne...>. # # This program is free software; you can redistribute it and/or modify @@ -39,7 +39,7 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - + fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -120,7 +120,7 @@ _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else + else $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` fi # Put the nasty error message in config.log where it belongs diff --git a/m4/programs.m4 b/m4/programs.m4 --- a/m4/programs.m4 +++ b/m4/programs.m4 @@ -4,7 +4,7 @@ dnl of GNU msgfmt that do not support the "msgid_plural" extension. AC_DEFUN([AC_PROG_GMSGFMT_PLURAL], [dnl AC_REQUIRE(AM_GNU_GETTEXT) - + if test "$GMSGFMT" != ":"; then AC_MSG_CHECKING([for plural forms in GNU msgfmt]) @@ -112,7 +112,7 @@ AC_MSG_RESULT(no) fi fi - fi + fi else AC_MSG_RESULT(no) fi diff --git a/m4/summary.m4 b/m4/summary.m4 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -239,18 +239,18 @@ fi if test x"$have_vidix" = x"yes"; then echo $ECHO_N " - vidix (" - + if test x"$no_x" != x"yes"; then echo $ECHO_N "X11" if test x"$have_fb" = x"yes"; then echo $ECHO_N " and " fi fi - + if test x"$have_fb" = x"yes"; then echo $ECHO_N "framebuffer" fi - + echo $ECHO_N " support" if test x"$enable_dha_kmod" != x"no"; then diff --git a/m4/symbol.m4 b/m4/symbol.m4 --- a/m4/symbol.m4 +++ b/m4/symbol.m4 @@ -24,7 +24,7 @@ dnl of the text of the Macro appear in them. The GNU General Public dnl License (GPL) does govern all other use of the material that dnl constitutes the Autoconf Macro. -dnl +dnl dnl This special exception to the GPL applies to versions of the dnl Autoconf Macro released by the xine project. When you make and dnl distribute a modified version of the Autoconf Macro, you may extend diff --git a/m4/types.m4 b/m4/types.m4 --- a/m4/types.m4 +++ b/m4/types.m4 @@ -21,7 +21,7 @@ if test x"$LIRC_PREFIX" != "x"; then lirc_libprefix="$LIRC_PREFIX/lib" - LIRC_INCLUDE="-I$LIRC_PREFIX/include" + LIRC_INCLUDE="-I$LIRC_PREFIX/include" fi for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do AC_CHECK_FILE("$llirc/liblirc_client.a", diff --git a/m4/video_out.m4 b/m4/video_out.m4 --- a/m4/video_out.m4 +++ b/m4/video_out.m4 @@ -371,7 +371,7 @@ case "$host_or_hostalias" in hppa*) xv_libexts="$acl_cv_shlibext" ;; *) - if test x"$xv_prefer_static" = x"yes"; then + if test x"$xv_prefer_static" = x"yes"; then xv_libexts="$acl_cv_libext $acl_cv_shlibext" else xv_libexts="$acl_cv_shlibext $acl_cv_libext" diff --git a/m4/xine.m4 b/m4/xine.m4 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -1,27 +1,27 @@ dnl Configure paths for XINE dnl dnl Copyright (C) 2001 Daniel Caujolle-Bert <seg...@cl...> -dnl +dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by dnl the Free Software Foundation; either version 2 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl -dnl +dnl +dnl dnl As a special exception to the GNU General Public License, if you dnl distribute this file as part of a program that contains a configuration dnl script generated by Autoconf, you may include it under the same dnl distribution terms that you use for the rest of that program. -dnl +dnl dnl _XINE_VERSION_PARSE(version) AC_DEFUN([_XINE_VERSION_PARSE], [`echo $1 | perl -e 'my $v = <>; chomp $v; diff --git a/misc/Makefile.am b/misc/Makefile.am --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -58,7 +58,7 @@ fonts/serif-24.xinefont.gz \ fonts/serif-32.xinefont.gz \ fonts/serif-48.xinefont.gz \ - fonts/serif-64.xinefont.gz + fonts/serif-64.xinefont.gz dist_doc_DATA = fonts/README.cetus diff --git a/misc/cdda_server.c b/misc/cdda_server.c --- a/misc/cdda_server.c +++ b/misc/cdda_server.c @@ -2,19 +2,19 @@ * CDDA / DVD server * * Copyright (C) 2003-2007 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -185,21 +185,21 @@ fd_set readfds, writefds, exceptfds; int retval; struct timeval timeout; - + for(;;) { - FD_ZERO(&readfds); - FD_ZERO(&writefds); + FD_ZERO(&readfds); + FD_ZERO(&writefds); FD_ZERO(&exceptfds); FD_SET(socket, &exceptfds); - - timeout.tv_sec = 0; + + timeout.tv_sec = 0; timeout.tv_usec = 0; - + retval = select(socket + 1, &readfds, &writefds, &exceptfds, &timeout); - + if(retval == -1 && (errno != EAGAIN && errno != EINTR)) return 0; - + if (retval != -1) return 1; } @@ -209,7 +209,7 @@ #if 0 /* - * read binary data from socket + * read binary data from socket */ static int sock_data_read (int socket, char *buf, int nlen) { int n, num_bytes; @@ -219,7 +219,7 @@ if(!sock_check_opened(socket)) return -1; - + num_bytes = 0; while (num_bytes < nlen) { @@ -259,40 +259,40 @@ #endif /* - * read a line (\n-terminated) from socket + * read a line (\n-terminated) from socket */ static int sock_string_read(int socket, char *buf, int len) { char *pbuf; int r, rr; void *nl; - + if((socket < 0) || (buf == NULL)) return -1; if(!sock_check_opened(socket)) return -1; - + if (--len < 1) return(-1); - + pbuf = buf; - + do { - + if((r = recv(socket, pbuf, len, MSG_PEEK)) <= 0) return -1; if((nl = memchr(pbuf, '\n', r)) != NULL) r = ((char *) nl) - pbuf + 1; - + if((rr = read(socket, pbuf, r)) < 0) return -1; - + pbuf += rr; len -= rr; } while((nl == NULL) && len); - + if (pbuf > buf && *(pbuf-1) == '\n'){ *(pbuf-1) = '\0'; } @@ -306,21 +306,21 @@ static int sock_data_write(int socket, char *buf, int len) { ssize_t size; int wlen = 0; - + if((socket < 0) || (buf == NULL)) return -1; - + if(!sock_check_opened(socket)) return -1; - + while(len) { size = write(socket, buf, len); - + if(size <= 0) { printf("error writing to socket %d\n",socket); return -1; } - + len -= size; wlen += size; buf += size; @@ -332,15 +332,15 @@ int sock_string_write(int socket, char *msg, ...) { char buf[_BUFSIZ]; va_list args; - + va_start(args, msg); vsnprintf(buf, _BUFSIZ - 1, msg, args); va_end(args); - + /* Each line sent is '\n' terminated */ if((buf[strlen(buf)] == '\0') && (buf[strlen(buf) - 1] != '\n')) strcat(buf, "\n"); - + return sock_data_write(socket, buf, strlen(buf)); } diff --git a/misc/xine-fontconv.c b/misc/xine-fontconv.c --- a/misc/xine-fontconv.c +++ b/misc/xine-fontconv.c @@ -1,25 +1,25 @@ /* * Copyright (C) 2001-2003 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * OSD stuff (text and graphic primitives) * - * xine-fontconv.c + * xine-fontconv.c * * converts ttf fonts to xine osd fonts * @@ -92,7 +92,7 @@ uint16_t num_fontchars; osd_fontchar_t *fontchar; osd_font_t *next; -}; +}; /* list */ @@ -110,7 +110,7 @@ static int gzwrite_i16(gzFile *fp, uint16_t number) { - return gzputc(fp, number & 0xFF) != -1 && + return gzputc(fp, number & 0xFF) != -1 && gzputc(fp, (number >> 8) & 0xFF) != -1; } @@ -169,7 +169,7 @@ } } -/* +/* * generate sorted list with unicodes in all given pages, * returns number of unicodes in the list */ @@ -189,7 +189,7 @@ continue; } printf("Used encoding \"%s\"\n", pages[page]); - + /* add new unicodes into list */ for (z = 32; z < 0xFFFF; z++) { uint16_t unicode; @@ -198,7 +198,7 @@ size_t inbytesleft = z <= 0xFF ? 1 : 2; size_t outbytesleft = 2; size_t count; - + /* get unicode value from index 'z' in this codepage 'pages[i]' */ count = iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); if (count == (size_t)-1 || inbytesleft != 0) { @@ -218,7 +218,7 @@ void print_bitmap (FT_Bitmap *bitmap) { int x,y; - + for( y = 0; y < bitmap->rows; y++ ) { for( x = 0; x < bitmap->width; x++ ) { if( bitmap->buffer[y*bitmap->width+x] > 1 ) @@ -242,7 +242,7 @@ bitmap->width = width; bitmap->buffer = malloc(width*height); memset( bitmap->buffer, 0, width*height ); - + return bitmap; } @@ -250,9 +250,9 @@ free(bitmap->buffer); free(bitmap); } - -/* + +/* This function is called to blend a slightly deslocated version of the bitmap. This will produce the border effect. Note that the displacement may be smaller than 1 pixel @@ -264,15 +264,15 @@ int x,y; int x1, y1; int dstpos, srcpos; - + for( y = 0; y < src->rows; y++ ) { for( x = 0; x < src->width; x++ ) { srcpos = y * src->width + x; - + x1 = x + left; if( x1 < 0 || x1 >= dst->width ) continue; - + y1 = y + top; if( y1 < 0 || y1 >= dst->rows ) continue; [... 127 lines omitted ...] @@ -447,19 +447,19 @@ glyph_index = FT_Get_Char_Index( face, item->code); - + if (glyph_index) { - + error = FT_Load_Glyph( face, /* handle to face object */ glyph_index, /* glyph index */ FT_LOAD_DEFAULT ); /* load flags */ - + if (!error) { error = FT_Get_Glyph( face->glyph, &glyph ); - + if( i == 0 ) { out_bitmap = create_bitmap( f266CeilToInt(thickness + MAX(face->glyph->metrics.horiAdvance, face->glyph->metrics.width + face->glyph->metrics.horiBearingX)), - f266CeilToInt((max_bearing_y<<6) - face->glyph->metrics.horiBearingY + + f266CeilToInt((max_bearing_y<<6) - face->glyph->metrics.horiBearingY + face->glyph->metrics.height + thickness) ); } @@ -467,7 +467,7 @@ origin.y = thickness + border_pos[i][1]*thickness; error = FT_Glyph_Transform(glyph, NULL, &origin) || - FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, NULL, 1); + FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, NULL, 1); if (error) { printf("error generating bitmap [U+%04X]\n", item->code); @@ -483,24 +483,24 @@ else add_final_bitmap( out_bitmap, &glyph_bitmap->bitmap, glyph_bitmap->left, max_bearing_y - glyph_bitmap->top ); - converted = 1; - + converted = 1; + FT_Done_Glyph( glyph ); } } } - + if( converted ) { #ifdef LOG printf("[U+%04X] bitmap width: %d height: %d\n", item->code, out_bitmap->width, out_bitmap->rows ); - /* + /* print_bitmap(out_bitmap); */ #endif fontchar.code = item->code; fontchar.width = out_bitmap->width; fontchar.height = out_bitmap->rows; - + gzwrite_i16 (fp, fontchar.code); gzwrite_i16 (fp, fontchar.width); gzwrite_i16 (fp, fontchar.height); @@ -523,7 +523,7 @@ list_free(error_unicodes); } printf ("generated %s (%d characters)\n", filename, font.num_fontchars); -} +} int main(int argc, char *argv[]) { @@ -548,7 +548,7 @@ printf ("usage: %s font.ttf fontname [encoding1 [encoding2 [...]]]\n", argv[0]); exit (1); } - + len = strlen (argv[1]); if (strncasecmp (&argv[1][len-4],".ttf",3)) { @@ -561,8 +561,8 @@ printf("error initializing freetype\n"); return 1; } - - error = FT_New_Face( library, + + error = FT_New_Face( library, argv[1], 0, &face ); @@ -596,21 +596,21 @@ render_font (face, argv[2], 32, thickness, unicodes); render_font (face, argv[2], 48, thickness, unicodes); render_font (face, argv[2], 64, thickness, unicodes); - } else + } else printf("No font generated\n"); list_free(unicodes); FT_Done_Face(face); - - FT_Done_FreeType(library); + + FT_Done_FreeType(library); /* * some rgb -> yuv conversion, * can be used to calc new palettes */ /* - { + { float f; for (f=1.0; f<6.0; f+=1.0) { @@ -622,7 +622,7 @@ Y = 0.29900 * R + 0.58700 * G + 0.11400 * B ; Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B + 128.0; Cr = 0.50000 * R - 0.41869 * G - 0.08131 * B + 128.0; - + printf ("CLUT_Y_CR_CB_INIT(0x%x, 0x%x, 0x%x),\n", (int) Y, (int) Cr, (int) Cb); } } diff --git a/src/audio_dec/ff_dvaudio_decoder.c b/src/audio_dec/ff_dvaudio_decoder.c --- a/src/audio_dec/ff_dvaudio_decoder.c +++ b/src/audio_dec/ff_dvaudio_decoder.c @@ -1,25 +1,25 @@ /* * Copyright (C) 2005 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * dv audio decoder based on patch by Dan Dennedy <da...@de...> */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -219,29 +219,29 @@ int out; audio_buffer_t *audio_buffer; int bytes_to_send; - + if (buf->decoder_flags & BUF_FLAG_PREVIEW) return; - + if (buf->decoder_flags & BUF_FLAG_STDHEADER) { this->buf = calloc(1, AUDIOBUFSIZE); this->bufsize = AUDIOBUFSIZE; this->size = 0; this->decode_buffer = calloc(1, MAXFRAMESIZE); - + this->audio_sample_rate = buf->decoder_info[1]; this->audio_bits = buf->decoder_info[2]; this->audio_channels = buf->decoder_info[3]; - + _x_meta_info_set_utf8(this->stream, XINE_META_INFO_AUDIOCODEC, "DV Audio"); - + this->decoder_ok = 1; - + return; } - + if (this->decoder_ok && !(buf->decoder_flags & (BUF_FLAG_HEADER|BUF_FLAG_SPECIAL))) { - + if (!this->output_open) { this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, this->audio_bits, this->audio_sample_rate, @@ -251,11 +251,11 @@ /* if the audio still isn't open, bail */ if (!this->output_open) return; - + if( this->size + buf->size > this->bufsize ) { this->bufsize = this->size + 2 * buf->size; xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - _("dvaudio: increasing buffer to %d to avoid overflow.\n"), + _("dvaudio: increasing buffer to %d to avoid overflow.\n"), this->bufsize); this->buf = realloc( this->buf, this->bufsize ); } @@ -273,14 +273,14 @@ bytes_consumed = dv_frame_profile(&this->buf[offset])->frame_size; else bytes_consumed = decode_buffer_size; - + /* dispatch the decoded audio */ out = 0; while (out < decode_buffer_size) { - audio_buffer = + audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out); if (audio_buffer->mem_size == 0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "dvaudio: Help! Allocated audio buffer with nothing in it!\n"); return; } @@ -316,7 +316,7 @@ static void dvaudio_reset (audio_decoder_t *this_gen) { dvaudio_decoder_t *this = (dvaudio_decoder_t *) this_gen; - + this->size = 0; } @@ -326,7 +326,7 @@ static void dvaudio_dispose (audio_decoder_t *this_gen) { dvaudio_decoder_t *this = (dvaudio_decoder_t *) this_gen; - + if (this->output_open) this->stream->audio_out->close (this->stream->audio_out, this->stream); this->output_open = 0; @@ -354,7 +354,7 @@ this->buf = NULL; this->size = 0; this->decoder_ok = 0; - + return &this->audio_decoder; } @@ -372,7 +372,7 @@ return this; } -static uint32_t supported_audio_types[] = { +static uint32_t supported_audio_types[] = { BUF_AUDIO_DV, 0 }; @@ -381,13 +381,13 @@ supported_audio_types, /* supported types */ 5 /* priority */ }; - + /* * exported plugin catalog entry */ const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ + /* type, API, "name", version, special_info, init_function */ { PLUGIN_AUDIO_DECODER, 16, "dvaudio", XINE_VERSION_CODE, &dec_info_dvaudio, init_dvaudio_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/audio_dec/fooaudio.c b/src/audio_dec/fooaudio.c --- a/src/audio_dec/fooaudio.c +++ b/src/audio_dec/fooaudio.c @@ -130,7 +130,7 @@ * the accumulator buffer size as necessary */ if( this->size + buf->size > this->bufsize ) { this->bufsize = this->size + 2 * buf->size; - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "fooaudio: increasing source buffer to %d to avoid overflow.\n", this->bufsize); this->buf = realloc( this->buf, this->bufsize ); } @@ -151,8 +151,8 @@ * This decoder generates a continuous sine pattern based on the pts * values sent by the xine engine. Two pts values are needed to know * how long to make the audio. Thus, If this is the first frame or - * a seek has occurred (indicated by this->last_pts = -1), - * log the pts but do not create any audio. + * a seek has occurred (indicated by this->last_pts = -1), + * log the pts but do not create any audio. * * When a valid pts delta is generated, create n audio samples, where * n is given as: @@ -181,7 +181,7 @@ /* get an audio buffer */ audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out); if (audio_buffer->mem_size == 0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "fooaudio: Help! Allocated audio buffer with nothing in it!\n"); return; } @@ -196,7 +196,7 @@ #define WAVE_HZ 300 /* fill up the samples in the buffer */ for (i = 0; i < samples_to_send; i++) - audio_buffer->mem[i] = + audio_buffer->mem[i] = (short)(sin(2 * M_PI * this->iteration++ / WAVE_HZ) * 32767); /* final prep for audio buffer dispatch */ @@ -296,7 +296,7 @@ free (this); } -/* This function allocates a private audio decoder class and initializes +/* This function allocates a private audio decoder class and initializes * the class's member functions. */ static void *init_plugin (xine_t *xine, void *data) { @@ -312,18 +312,18 @@ return this; } -/* This is a list of all of the internal xine audio buffer types that +/* This is a list of all of the internal xine audio buffer types that * this decoder is able to handle. Check src/xine-engine/buffer.h for a * list of valid buffer types (and add a new one if the one you need does * not exist). Terminate the list with a 0. */ -static const uint32_t audio_types[] = { +static const uint32_t audio_types[] = { /* BUF_AUDIO_FOO, */ 0 }; /* This data structure combines the list of supported xine buffer types and * the priority that the plugin should be given with respect to other - * plugins that handle the same buffer type. A plugin with priority (n+1) + * plugins that handle the same buffer type. A plugin with priority (n+1) * will be used instead of a plugin with priority (n). */ static const decoder_info_t dec_info_audio = { audio_types, /* supported types */ diff --git a/src/audio_dec/gsm610.c b/src/audio_dec/gsm610.c --- a/src/audio_dec/gsm610.c +++ b/src/audio_dec/gsm610.c @@ -34,7 +34,7 @@ * are deemed to have made any representations as to the suitability of this * software for any purpose nor are held responsible for any defects of * this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. - * + * * As a matter of courtesy, the authors request to be informed about uses * this software has found, about bugs in this software, and about any * improvements that may be of general interest. @@ -125,7 +125,7 @@ if( this->size + buf->size > this->bufsize ) { this->bufsize = this->size + 2 * buf->size; - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "gsm610: increasing source buffer to %d to avoid overflow.\n", this->bufsize); this->buf = realloc( this->buf, this->bufsize ); } @@ -143,7 +143,7 @@ /* the data should line up on a 65-byte boundary */ if ((buf->size % 65) != 0) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "gsm610: received MS GSM block that does not line up\n"); this->size = 0; return; @@ -263,7 +263,7 @@ return this; } -static const uint32_t audio_types[] = { +static const uint32_t audio_types[] = { BUF_AUDIO_MSGSM, BUF_AUDIO_GSM610, 0 @@ -275,7 +275,7 @@ }; const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ + /* type, API, "name", version, special_info, init_function */ { PLUGIN_AUDIO_DECODER, 16, "gsm610", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c --- a/src/audio_dec/xine_a52_decoder.c +++ b/src/audio_dec/xine_a52_decoder.c @@ -76,11 +76,11 @@ typedef struct { audio_decoder_class_t decoder_class; config_values_t *config; - + float a52_level; int disable_dynrng_compress; int enable_surround_downmix; - + const AVCRC *av_crc; } a52dec_class_t; @@ -226,7 +226,7 @@ */ #ifdef LOG_PTS printf("a52dec:decode_frame:pts=%lld\n",pts); -#endif +#endif if (!this->bypass_mode) { int a52_output_flags, i; @@ -278,7 +278,7 @@ this->stream->audio_out->close (this->stream->audio_out, this->stream); - this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, + this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, 16, this->a52_sample_rate, output_mode) ; @@ -302,13 +302,13 @@ for (i = 0; i < 6; i++) { if (a52_block (this->a52_state)) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "liba52: a52_block error on audio channel %d\n", i); -#if 0 +#if 0 for(n=0;n<2000;n++) { printf("%02x ",this->frame_buffer[n]); if ((n % 32) == 0) printf("\n"); } printf("\n"); -#endif +#endif buf->num_frames = 0; break; } @@ -460,7 +460,7 @@ * We call the start of an A52 frame a frame header. * So, if a A52 pack has 2 "Number of frame headers" is means that the A52 pack contains 2 A52 frame headers. * The "First access unit" then tells us which A52 frame the PTS value applies to. - * + * * Take the following example: - * PACK1: PTS = 10. Contains the entire A52 frame1, followed by the beginning of the frame2. PTS applies to frame1. * PACK2: PTS = 1000, Contains the rest of frame2, and the whole of frame3. and the start of frame4. PTS applies to frame4. @@ -582,14 +582,14 @@ } } break; - + case 2: /* Filling frame_buffer with sync_info bytes */ *this->frame_ptr++ = *current++; this->frame_todo--; if (this->frame_todo < 1) { this->sync_state = 3; } else break; - + case 3: { /* Ready for decode */ if (av_crc(this->class->av_crc, 0, &this->frame_buffer[2], this->frame_length - 2) != 0) { /* CRC16 failed */ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "liba52:a52 frame failed crc16 checksum.\n"); @@ -622,7 +622,7 @@ this->syncword = 0; this->sync_state = 0; break; - default: /* No come here */ + default: /* No come here */ break; } } @@ -676,14 +676,14 @@ this->pts_list_position = 0; if( !this->a52_state ) { - this->a52_state = + this->a52_state = #ifdef HAVE_A52DEC_A52_H /* External liba52 */ /* When using external liba52, enable _all_ capabilities, even if that might break stuff if they add some new capability that depends on CPU's caps. At the moment the only capability is DJBFFT, which is tested only if djbfft is being used at compile time. - + The actual question would be: why don't they check for capabilities themselves? */ diff --git a/src/audio_dec/xine_dts_decoder.c b/src/audio_dec/xine_dts_decoder.c --- a/src/audio_dec/xine_dts_decoder.c +++ b/src/audio_dec/xine_dts_decoder.c @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2007 the xine project - * + * * This file is part of xine, a unix video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -75,7 +75,7 @@ dts_state_t *dts_state; int64_t pts; - int audio_caps; + int audio_caps; int sync_state; int ac5_length, ac5_pcm_length, frame_todo; uint32_t syncdword; @@ -83,7 +83,7 @@ uint8_t *frame_ptr; int output_open; - + int bypass_mode; int dts_flags; int dts_sample_rate; @@ -91,8 +91,8 @@ int dts_flags_map[11]; /* Convert from stream dts_flags to the dts_flags we want from the dts downmixer */ int ao_flags_map[11]; /* Convert from the xine AO_CAP's to dts_flags. */ int have_lfe; - - + + } dts_decoder_t; static void dts_reset (audio_decoder_t *const this_gen) { @@ -143,7 +143,7 @@ int output_mode = AO_CAP_MODE_STEREO; uint8_t *data_out; uint8_t *const data_in = this->frame_buffer; - + lprintf("decode_frame\n"); audio_buffer = this->stream->audio_out->get_buffer (this->stream->audio_out); audio_buffer->vpts = pts; @@ -152,13 +152,13 @@ /* SPDIF digital output */ if (!this->output_open) { this->output_open = ((this->stream->audio_out->open) (this->stream->audio_out, this->stream, - 16, this->dts_sample_rate, + 16, this->dts_sample_rate, AO_CAP_MODE_AC5)); } - - if (!this->output_open) + + if (!this->output_open) return; - + data_out=(uint8_t *) audio_buffer->mem; if (this->ac5_length > 8191) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "libdts: ac5_length too long\n"); @@ -176,7 +176,7 @@ ac5_spdif_type = 0x0d; /* DTS-1 (2048-sample bursts) */ break; default: - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "libdts: DTS %i-sample bursts not supported\n", this->ac5_pcm_length); return; } @@ -256,17 +256,17 @@ if (!this->output_open) { this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, this->stream, - 16, this->dts_sample_rate, + 16, this->dts_sample_rate, output_mode); } - - if (!this->output_open) + + if (!this->output_open) return; - number_of_dts_blocks = dts_blocks_num (this->dts_state); + number_of_dts_blocks = dts_blocks_num (this->dts_state); audio_buffer->num_frames = 256*number_of_dts_blocks; for(i = 0; i < number_of_dts_blocks; i++) { if(dts_block(this->dts_state)) { - xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, + xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "libdts: dts_block error on audio channel %d\n", i); audio_buffer->num_frames = 0; break; @@ -320,10 +320,10 @@ } } } - + this->stream->audio_out->put_buffer (this->stream->audio_out, audio_buffer, this->stream); - - + + } static void dts_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { @@ -332,7 +332,7 @@ uint8_t *current = (uint8_t *)buf->content; uint8_t *sync_start=current + 1; uint8_t *const end = buf->content + buf->size; - + lprintf("decode_data\n"); if (buf->decoder_flags & BUF_FLAG_PREVIEW) @@ -431,14 +431,14 @@ } } break; - + case 2: /* Filling frame_buffer with sync_info bytes */ *this->frame_ptr++ = *current++; this->frame_todo--; if (this->frame_todo < 1) { this->sync_state = 3; } else break; - + case 3: /* Ready for decode */ #if 0 dtsdec_decode_frame (this, this->pts_list[0], buf->decoder_flags & BUF_FLAG_PREVIEW); @@ -450,18 +450,18 @@ this->syncdword = 0; this->sync_state = 0; break; - default: /* No come here */ + default: /* No come here */ break; } } } static void dts_dispose (audio_decoder_t *this_gen) { - dts_decoder_t *const this = (dts_decoder_t *) this_gen; - - if (this->output_open) + dts_decoder_t *const this = (dts_decoder_t *) this_gen; + + if (this->output_open) this->stream->audio_out->close (this->stream->audio_out, this->stream); - + free (this); } @@ -507,7 +507,7 @@ this->dts_flags_map[DTS_3F2R] = DTS_3F2R | DTS_LFE; this->ao_flags_map[DTS_2F2R] = AO_CAP_MODE_4CHANNEL; this->ao_flags_map[DTS_3F2R] = AO_CAP_MODE_5CHANNEL; - + } else if (this->audio_caps & AO_CAP_MODE_5CHANNEL) { this->dts_flags_map[DTS_2F2R] = DTS_2F2R; @@ -574,7 +574,7 @@ return this; } -static const uint32_t audio_types[] = { +static const uint32_t audio_types[] = { BUF_AUDIO_DTS, 0 }; @@ -584,7 +584,7 @@ }; const plugin_info_t xine_plugin_info[] EXPORTED = { - /* type, API, "name", version, special_info, init_function */ + /* type, API, "name", version, special_info, init_function */ { PLUGIN_AUDIO_DECODER, 16, "dts", XINE_VERSION_CODE, &dec_info_audio, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/audio_dec/xine_faad_decoder.c b/src/audio_dec/xine_faad_decoder.c --- a/src/audio_dec/xine_faad_decoder.c +++ b/src/audio_dec/xine_faad_decoder.c @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2005 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -58,29 +58,29 @@ audio_decoder_t audio_decoder; xine_stream_t *stream; - + /* faad2 stuff */ NeAACDecHandle faac_dec; NeAACDecConfigurationPtr faac_cfg; NeAACDecFrameInfo faac_finfo; int faac_failed; - + int raw_mode; - + unsigned char *buf; int size; int rec_audio_src_size; int max_audio_src_size; int pts; - + unsigned char *dec_config; int dec_config_size; - + unsigned long rate; - int bits_per_sample; - unsigned char num_channels; + int bits_per_sample; + unsigned char num_channels; int sbr; - + int output_open; unsigned long total_time; @@ -138,7 +138,7 @@ if( this->dec_config ) { used = NeAACDecInit2(this->faac_dec, this->dec_config, this->dec_config_size, &this->rate, &this->num_channels); - + if( used < 0 ) { xprintf( this->stream->xine, XINE_VERBOSITY_LOG, _("libfaad: libfaad NeAACDecInit2 failed.\n")); @@ -149,7 +149,7 @@ } else { used = NeAACDecInit(this->faac_dec, this->buf, this->size, &this->rate, &this->num_channels); - + if( used < 0 ) { xprintf ( this->stream->xine, XINE_VERBOSITY_LOG, _("libfaad: libfaad NeAACDecInit failed.\n")); @@ -157,16 +157,16 @@ } else { lprintf( "NeAACDecInit() returned rate=%"PRId32" channels=%d (used=%d)\n", this->rate, this->num_channels, used); - + this->size -= used; memmove( this->buf, &this->buf[used], this->size ); } } } - + if( !this->bits_per_sample ) this->bits_per_sample = 16; - + if( this->faac_failed ) { if( this->faac_dec ) { NeAACDecClose( this->faac_dec ); @@ -176,7 +176,7 @@ } else { faad_meta_info_set(this); } - + return this->faac_failed; } @@ -184,10 +184,10 @@ int ao_cap_mode; this->rec_audio_src_size = this->num_channels * FAAD_MIN_STREAMSIZE; - + switch( this->num_channels ) { case 1: - ao_cap_mode=AO_CAP_MODE_MONO; + ao_cap_mode=AO_CAP_MODE_MONO; break; case 6: if(this->stream->audio_out->get_capabilities(this->stream->audio_out) & @@ -202,11 +202,11 @@ } case 2: [... 98 lines omitted ...] + if(used >= this->size){ this->size = 0; } else { @@ -335,7 +335,7 @@ } if( !this->raw_mode ) - this->size = 0; + this->size = 0; } if( this->size ) @@ -346,31 +346,31 @@ static void faad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { faad_decoder_t *this = (faad_decoder_t *) this_gen; - + if (buf->decoder_flags & BUF_FLAG_PREVIEW) return; /* store config information from ESDS mp4/qt atom */ if( !this->faac_dec && (buf->decoder_flags & BUF_FLAG_SPECIAL) && buf->decoder_info[1] == BUF_SPECIAL_DECODER_CONFIG ) { - + this->dec_config = malloc(buf->decoder_info[2]); this->dec_config_size = buf->decoder_info[2]; memcpy(this->dec_config, buf->decoder_info_ptr[2], buf->decoder_info[2]); - + if( faad_open_dec(this) ) return; this->raw_mode = 0; } - /* get audio parameters from file header - (may be overwritten by libfaad returned parameters) */ + /* get audio parameters from file header + (may be overwritten by libfaad returned parameters) */ if (buf->decoder_flags & BUF_FLAG_STDHEADER) { this->rate=buf->decoder_info[1]; - this->bits_per_sample=buf->decoder_info[2] ; - this->num_channels=buf->decoder_info[3] ; - + this->bits_per_sample=buf->decoder_info[2] ; + this->num_channels=buf->decoder_info[3] ; + if( buf->size > sizeof(xine_waveformatex) ) { xine_waveformatex *wavex = (xine_waveformatex *) buf->content; @@ -379,7 +379,7 @@ this->dec_config_size = wavex->cbSize; memcpy(this->dec_config, buf->content + sizeof(xine_waveformatex), wavex->cbSize); - + if( faad_open_dec(this) ) return; @@ -395,15 +395,15 @@ if( !this->size ) this->pts = buf->pts; - + if( this->size + buf->size > this->max_audio_src_size ) { this->max_audio_src_size = this->size + 2 * buf->size; this->buf = realloc( this->buf, this->max_audio_src_size ); } - + memcpy (&this->buf[this->size], buf->content, buf->size); this->size += buf->size; - + if( !this->faac_dec && faad_open_dec(this) ) return; @@ -421,23 +421,23 @@ static void faad_dispose (audio_decoder_t *this_gen) { - faad_decoder_t *this = (faad_decoder_t *) this_gen; + faad_decoder_t *this = (faad_decoder_t *) this_gen; - if (this->output_open) + if (this->output_open) this->stream->audio_out->close (this->stream->audio_out, this->stream); this->output_open = 0; - + if( this->buf ) free(this->buf); this->buf = NULL; this->size = 0; this->max_audio_src_size = 0; - + if( this->dec_config ) free(this->dec_config); this->dec_config = NULL; this->dec_config_size = 0; - + if( this->faac_dec ) NeAACDecClose(this->faac_dec); this->faac_dec = NULL; @@ -461,7 +461,7 @@ this->stream = stream; this->output_open = 0; this->raw_mode = 1; - this->faac_dec = NULL; + this->faac_dec = NULL; this->faac_failed = 0; this->buf = NULL; this->size = 0; @@ -490,7 +490,7 @@ return this; } -static const uint32_t audio_types[] = { +static const uint32_t audio_types[] = { BUF_AUDIO_AAC, 0 }; diff --git a/src/audio_dec/xine_lpcm_decoder.c b/src/audio_dec/xine_lpcm_decoder.c --- a/src/audio_dec/xine_lpcm_decoder.c +++ b/src/audio_dec/xine_lpcm_decoder.c @@ -1,18 +1,18 @@ -/* +/* * Copyright (C) 2000-2003 the xine project - * + * * This file is part of xine, a free video player. - * + * * xine 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. - * + * * xine 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA @@ -62,10 +62,10 @@ xine_stream_t *stream; uint32_t rate; - uint32_t bits_per_sample; - uint32_t number_of_channels; - uint32_t ao_cap_mode; - + uint32_t bits_per_sample; + uint32_t number_of_channels; + uint32_t ao_cap_mode; + int output_open; int cpu_be; /**< TRUE, if we're a Big endian CPU */ } lpcm_decoder_t; @@ -86,7 +86,7 @@ int stream_be; audio_buffer_t *audio_buffer; int format_changed = 0; - + /* Drop preview data */ if (buf->decoder_flags & BUF_FLAG_PREVIEW) return; @@ -97,7 +97,7 @@ unsigned int bits_per_sample = 16; unsigned int sample_rate = 0; unsigned int num_channels; - + num_channels = (buf->decoder_info[2] & 0x7) + 1; switch ((buf->decoder_info[2]>>4) & 3) { case 0: sample_rate = 48000; break; @@ -110,7 +110,7 @@ case 1: bits_per_sample = 20; break; case 2: bits_per_sample = 24; break; } - + if( this->bits_per_sample != bits_per_sample || this->number_of_channels != num_channels || this->rate != sample_rate || @@ -119,16 +119,16 @@ this->number_of_channels = num_channels; this->rate = sample_rate; format_changed++;... [truncated message content] |