From cbdad87eb7b57d4da0fd679f9b86c6f0aeacd5b3 Mon Sep 17 00:00:00 2001 From: "hadess@cookie.hadess.net" Date: Fri, 11 May 2007 16:27:50 +0100 Subject: Throw a XINE_MSG_PERMISSION_ERROR error when HTTP returns a 401 status Patch from Dmitri Fedortchenko angelhill.net>, required for upstream Totem bug: http://bugzilla.gnome.org/show_bug.cgi?id=418316 --- src/input/input_http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/input/input_http.c b/src/input/input_http.c index 6b7ae9158..6e8932700 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -829,7 +829,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { _("input_http: http status not 2xx: >%d %s<\n"), httpcode, httpstatus); return -7; - } else if (httpcode == 403) { + } else if (httpcode == 403 || httpcode == 401) { _x_message(this->stream, XINE_MSG_PERMISSION_ERROR, this->mrl, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: http status not 2xx: >%d %s<\n"), -- cgit v1.2.3 From 0f6bdecec4561e7475c31ef8434785d9855001bc Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 13 May 2007 03:38:43 +0100 Subject: Correct the dvba:// MRL / tuner mismatch message. --- src/input/input_dvb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index ae7c0c21e..6536af8d8 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -2899,13 +2899,13 @@ static int dvb_plugin_open(input_plugin_t * this_gen) { fprintf(stderr,"input_dvb: 2a %x\n",tuner->feinfo.type); /* - * This is dvbc://: + * This is dvba://: */ if (tuner->feinfo.type != FE_ATSC) { fprintf(stderr,"input_dvb: FAILED 1\n"); xprintf(this->class->xine, XINE_VERBOSITY_LOG, - _("input_dvb: dvbc mrl specified but the tuner doesn't appear to be QAM (DVB-C)\n")); + _("input_dvb: dvba mrl specified but the tuner doesn't appear to be ATSC (DVB-A)\n")); tuner_dispose(tuner); return 0; } -- cgit v1.2.3 From 84133d2fad4c392de75d41d88a19850734ea5523 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 2 May 2007 17:23:48 +0100 Subject: [PATCH] Enhance logging in demux_ts, input_dvb and video_out_xv The three attached patches (against 1.1.6) each increase the amount of debug logging in their respective components. We've found the extra logging useful when trying to track down faults. I've split this into three patches to make it easier to apply only some of our changes. -- Comments welcome, Simon Farnsworth --- src/demuxers/demux_ts.c | 21 +++++++++++-------- src/input/input_dvb.c | 14 +++++++++---- src/video_out/video_out_xv.c | 48 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 70 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index aea0c8ca1..c57fc34ef 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -683,7 +683,11 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, stream_id = p[3]; if (packet_len==0) + { + xprintf (xine, XINE_VERBOSITY_DEBUG, + "demux_ts: error pes length 0\n"); return 0; + } #ifdef TS_LOG printf ("demux_ts: packet stream id: %.2x len: %d (%x)\n", @@ -1244,7 +1248,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num case ISO_14496_PART10_VIDEO: if (this->videoPid == INVALID_PID) { #ifdef TS_PMT_LOG - printf ("demux_ts: PMT video pid 0x%.4x\n", pid); + printf ("demux_ts: PMT video pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif demux_ts_pes_new(this, this->media_num, pid, this->video_fifo,stream[0]); this->videoMedia = this->media_num; @@ -1266,7 +1270,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num } if(!found) { #ifdef TS_PMT_LOG - printf ("demux_ts: PMT audio pid 0x%.4x\n", pid); + printf ("demux_ts: PMT audio pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif demux_ts_pes_new(this, this->media_num, pid, this->audio_fifo,stream[0]); this->audio_tracks[this->audio_tracks_count].pid = pid; @@ -1280,7 +1284,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num break; case ISO_13818_PRIVATE: #ifdef TS_PMT_LOG - printf ("demux_ts: PMT streamtype 13818_PRIVATE, pid: 0x%.4x\n", pid); + printf ("demux_ts: PMT streamtype 13818_PRIVATE, pid: 0x%.4x type %2.2x\n", pid, stream[0]); for (i = 5; i < coded_length; i++) printf ("%.2x ", stream[i]); @@ -1289,7 +1293,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num break; case ISO_13818_TYPE_C: /* data carousel */ #ifdef TS_PMT_LOG - printf ("demux_ts: PMT streamtype 13818_TYPE_C, pid: 0x%.4x\n", pid); + printf ("demux_ts: PMT streamtype 13818_TYPE_C, pid: 0x%.4x type %2.2x\n", pid, stream[0]); #endif break; case ISO_13818_PES_PRIVATE: @@ -1305,7 +1309,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num } if(!found) { #ifdef TS_PMT_LOG - printf ("demux_ts: PMT AC3 audio pid 0x%.4x\n", pid); + printf ("demux_ts: PMT AC3 audio pid 0x%.4x type %2.2x\n", pid, stream[0]); #endif demux_ts_pes_new(this, this->media_num, pid, this->audio_fifo, 0x81); @@ -1323,7 +1327,7 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num else if (stream[i] == 0x56) { #ifdef TS_PMT_LOG - printf ("demux_ts: PMT Teletext, pid: 0x%.4x\n", pid); + printf ("demux_ts: PMT Teletext, pid: 0x%.4x type %2.2x\n", pid, stream[0]); for (i = 5; i < coded_length; i++) printf ("%.2x ", stream[i]); @@ -1358,10 +1362,11 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num pid, this->video_fifo, stream[0]); #ifdef TS_LOG - printf("demux_ts: DVBSUB: pid 0x%.4x: %s page %ld %ld\n", + printf("demux_ts: DVBSUB: pid 0x%.4x: %s page %ld %ld type %2.2x\n", pid, lang->desc.lang, lang->desc.comp_page_id, - lang->desc.aux_page_id); + lang->desc.aux_page_id, + stream[0]); #endif } } diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 6536af8d8..6cb4be50e 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -105,6 +105,7 @@ #define LOG_VERBOSE /* #define LOG +#define LOG_READS */ #include "xine_internal.h" @@ -583,7 +584,8 @@ static tuner_t *tuner_init(xine_t * xine, int adapter) this = (tuner_t *) xine_xmalloc(sizeof(tuner_t)); _x_assert(this != NULL); - + + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "tuner_init adapter=%d\n", adapter); this->fd_frontend = -1; for (x = 0; x < MAX_FILTERS; x++) this->fd_pidfilter[x] = 0; @@ -628,7 +630,7 @@ static tuner_t *tuner_init(xine_t * xine, int adapter) xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno)); /* and the internal filter used for PAT & PMT */ if(fcntl(this->fd_pidfilter[INTERNAL_FILTER], F_SETFL, O_NONBLOCK)<0) - xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set EIT to nonblock: %s\n",strerror(errno)); + xprintf(this->xine,XINE_VERBOSITY_DEBUG,"input_dvb: couldn't set INTERNAL to nonblock: %s\n",strerror(errno)); /* and the frontend */ fcntl(this->fd_frontend, F_SETFL, O_NONBLOCK); @@ -1004,7 +1006,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters while (ioctl(this->fd_frontend, FE_GET_EVENT, &event) != -1); if (ioctl(this->fd_frontend, FE_SET_FRONTEND, front_param) <0) { - xprintf(this->xine, XINE_VERBOSITY_DEBUG, "setfront front: %s\n", strerror(errno)); + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: setfront front: %s\n", strerror(errno)); return 0; } @@ -1030,7 +1032,7 @@ static int tuner_tune_it (tuner_t *this, struct dvb_frontend_parameters do { status = 0; if (ioctl(this->fd_frontend, FE_READ_STATUS, &status) < 0) { - xprintf(this->xine, XINE_VERBOSITY_DEBUG, "fe get event: %s\n", strerror(errno)); + xprintf(this->xine, XINE_VERBOSITY_DEBUG, "input_dvb: fe get event: %s\n", strerror(errno)); return 0; } @@ -2470,8 +2472,10 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen, if (!this->tuned_in) return 0; dvb_event_handler (this); +#ifdef LOG_READS xprintf(this->class->xine,XINE_VERBOSITY_DEBUG, "input_dvb: reading %" PRIdMAX " bytes...\n", (intmax_t)len); +#endif #ifndef DVB_NO_BUFFERING nbc_check_buffers (this->nbc); @@ -2523,9 +2527,11 @@ static off_t dvb_plugin_read (input_plugin_t *this_gen, break; } +#ifdef LOG_READS xprintf(this->class->xine,XINE_VERBOSITY_DEBUG, "input_dvb: got %" PRIdMAX " bytes (%" PRIdMAX "/%" PRIdMAX " bytes read)\n", (intmax_t)n, (intmax_t)total, (intmax_t)len); +#endif if (n > 0){ this->curpos += n; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index dde15fb0f..95a847c2c 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -56,6 +56,7 @@ #include #include #include +#include #define LOG_MODULE "video_out_xv" #define LOG_VERBOSE @@ -262,7 +263,9 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo, height = 1; if (this->use_pitch_alignment) { + lprintf ("use_pitch_alignment old width=%d",width); width = (width + 7) & ~0x7; + lprintf ("use_pitch_alignment new width=%d",width); } switch (format) { @@ -286,6 +289,7 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo, gX11Fail = 0; x11_InstallXErrorHandler (this); + lprintf( "XvShmCreateImage format=0x%x, width=%d, height=%d\n", xv_format, width, height ); image = XvShmCreateImage(this->display, this->xv_port, xv_format, 0, width, height, shminfo); @@ -297,6 +301,22 @@ static XvImage *create_ximage (xv_driver_t *this, XShmSegmentInfo *shminfo, goto finishShmTesting; } + { + int q; + + lprintf( "XvImage id %d\n", image->id ); + lprintf( "XvImage width %d\n", image->width ); + lprintf( "XvImage height %d\n", image->height ); + lprintf( "XvImage data_size %d\n", image->data_size ); + lprintf( "XvImage num_planes %d\n", image->num_planes ); + + for( q=0; q < image->num_planes; q++) + { + lprintf( "XvImage pitches[%d] %d\n", q, image->pitches[q] ); + lprintf( "XvImage offsets[%d] %d\n", q, image->offsets[q] ); + } + } + shminfo->shmid = shmget(IPC_PRIVATE, image->data_size, IPC_CREAT | 0777); if (image->data_size==0) { @@ -750,6 +770,16 @@ static int xv_redraw_needed (vo_driver_t *this_gen) { return ret; } +/* Used in xv_display_frame to determine how long XvShmPutImage takes + - if slower than 60fps, print a message +*/ +static double timeOfDay() +{ + struct timeval t; + gettimeofday( &t, NULL ); + return ((double)t.tv_sec) + (((double)t.tv_usec)/1000000.0); +} + static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { xv_driver_t *this = (xv_driver_t *) this_gen; xv_frame_t *frame = (xv_frame_t *) frame_gen; @@ -793,9 +823,14 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { * ask for offset and output size */ xv_redraw_needed (this_gen); + { + double start_time; + double end_time; + double elapse_time; + int factor; LOCK_DISPLAY(this); - + start_time = timeOfDay(); if (this->use_shm) { XvShmPutImage(this->display, this->xv_port, this->drawable, this->gc, this->cur_frame->image, @@ -814,9 +849,20 @@ static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { } XSync(this->display, False); + end_time = timeOfDay(); UNLOCK_DISPLAY(this); + elapse_time = end_time - start_time; + factor = (int)(elapse_time/(1.0/60.0)); + + if( factor > 1 ) + { + lprintf( "%s PutImage %dX interval (%fs)\n", + log_line_prefix(), factor, elapse_time ); + } + } + /* printf ("video_out_xv: xv_display_frame... done\n"); */ -- cgit v1.2.3 From f7bd2c6ee4e3f066248e087cbf5f97a21103ebd1 Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 2 May 2007 17:31:11 +0100 Subject: [PATCH] Remove packet count from demux_ts, to remove a long delay The attached patch applies after my logging patches (I can regenerate if needed). demux_ts attempted to read packets from the input 200 times before giving up. When playing a local file, this is harmless, as it will hit EOF 200 times; however, input_dvb waits 5 seconds for packets on each call to read, resulting in a 1000 second delay if tuning fails. Remove the counting of input packets, and add a comment to read() in input_plugin.h, to indicate that we expect inputs to try and return some data when read() is called. This fixes the delay, and makes it clear to future maintainers that they shouldn't expect to loop like this. -- Simon Farnsworth --- src/demuxers/demux_ts.c | 8 +------- src/input/input_plugin.h | 2 ++ 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index c57fc34ef..f2da5f268 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -337,7 +337,6 @@ typedef struct { int32_t packet_number; /* NEW: var to keep track of number of last read packets */ int32_t npkt_read; - int32_t read_zero; uint8_t buf[BUF_SIZE]; /* == PKT_SIZE * NPKT_PER_READ */ @@ -1536,12 +1535,7 @@ static unsigned char * demux_synchronise(demux_ts_t* this) { */ if (this->npkt_read == 0) { - /* printf ("demux_ts: read 0 packets! (%d)\n", this->read_zero); */ - this->read_zero++; - } else this->read_zero = 0; - - if (this->read_zero > 200) { - xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets too many times!\n"); + xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_ts: read 0 packets\n"); this->status = DEMUX_FINISHED; return NULL; } diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index 370dc6a71..11e1303e7 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -115,6 +115,8 @@ struct input_plugin_s { /* * read nlen bytes, return number of bytes read + * Should block until some bytes available for read; + * a return value of 0 indicates no data available */ off_t (*read) (input_plugin_t *this, char *buf, off_t nlen); -- cgit v1.2.3 From be3a453c296d3999f1a93ba26b43b995eeb41a2f Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Tue, 8 May 2007 21:25:00 +0100 Subject: Fix the build rules for libavutil.a and libpostproc.a (for the planar plugin). --- src/post/planar/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 4461f8314..73d300f31 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -10,9 +10,9 @@ ff_cflags = -I$(top_srcdir)/contrib/ffmpeg/libpostproc postproc_lib = $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a \ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a: - $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a + $(MAKE) -C $(top_builddir)/contrib ffmpeg/libpostproc/libpostproc.a $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a: - $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine libpostproc/libpostproc.a + $(MAKE) -C $(top_builddir)/contrib ffmpeg/libavutil/libavutil.a endif # -fomit-frame-pointer is always needed. it might cause debug to not -- cgit v1.2.3 From fd15adf6069b03be949c7c8d7e0f743b9ee6b90b Mon Sep 17 00:00:00 2001 From: Simon Farnsworth Date: Wed, 16 May 2007 17:37:06 +0100 Subject: v4l: replace faulty use of xprintf with lprintf. The current input_v4l in xine-lib 1.1.6 is inherently buggy (it will deference an invalid pointer in extract_mrl if the MRL contains a V4L input name or frequency). --- src/input/input_v4l.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 17c4223a2..6829470ff 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -517,11 +517,9 @@ static int extract_mrl(v4l_input_plugin_t *this, char *mrl) /* Get frequency, if available */ sscanf(locator, "/%d", &frequency); - lprintf("Tuner name: '%s' freq: %d\n", tuner_name, frequency); - } else { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "input_v4l: No tuner name given. Expected syntax: v4l:/tuner/frequency\n" - "input_v4l: Using currently tuned settings\n"); + + /* cannot use xprintf to log in this routine */ + lprintf("input_v4l: Tuner name: %s frequency %d\n", tuner_name, frequency ); } this->frequency = frequency; -- cgit v1.2.3 From 5f170aeb405f44ce67bf8827494c2a933b3e3241 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 17 May 2007 00:24:21 +0100 Subject: Convert comments (and the occasional string where it doesn't matter) to UTF-8. --- src/input/input_dvb.c | 2 +- src/input/libdvdnav/bswap.h | 2 +- src/input/libdvdnav/decoder.c | 2 +- src/input/libdvdnav/decoder.h | 2 +- src/input/libdvdnav/dvd_input.c | 2 +- src/input/libdvdnav/dvd_input.h | 2 +- src/input/libdvdnav/dvd_reader.c | 4 ++-- src/input/libdvdnav/dvd_reader.h | 4 ++-- src/input/libdvdnav/dvd_types.h | 2 +- src/input/libdvdnav/dvd_udf.c | 2 +- src/input/libdvdnav/dvd_udf.h | 2 +- src/input/libdvdnav/ifo_read.c | 4 ++-- src/input/libdvdnav/ifo_read.h | 4 ++-- src/input/libdvdnav/ifo_types.h | 4 ++-- src/input/libdvdnav/nav_print.c | 2 +- src/input/libdvdnav/nav_print.h | 2 +- src/input/libdvdnav/nav_read.c | 2 +- src/input/libdvdnav/nav_read.h | 2 +- src/input/libdvdnav/nav_types.h | 2 +- src/input/libdvdnav/vm.c | 2 +- src/input/libdvdnav/vm.h | 2 +- src/input/libdvdnav/vmcmd.c | 2 +- src/input/libdvdnav/vmcmd.h | 2 +- src/input/vcd/libcdio/cdio/cd_types.h | 2 +- src/libfaad/mdct.c | 2 +- src/libfaad/syntax.c | 4 ++-- src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c | 2 +- src/libmpeg2/idct_mlib.c | 2 +- src/libmpeg2/idct_mlib.h | 2 +- src/libmpeg2/motion_comp_mlib.c | 2 +- src/libmpeg2new/libmpeg2/idct_mlib.c | 2 +- src/libmpeg2new/libmpeg2/motion_comp_mlib.c | 2 +- src/libmusepack/mpc_decoder.c | 2 +- src/libmusepack/synth_filter.c | 10 +++++----- src/libw32dll/wine/pe_image.c | 2 +- src/post/goom/goom_core.c | 6 +++--- src/post/goom/goom_filters.h | 2 +- src/post/goom/mmx.c | 2 +- src/post/goom/sound_tester.c | 2 +- src/post/goom/xmmx.c | 2 +- src/video_out/libdha/kernelhelper/dhahelper.c | 4 ++-- src/video_out/libdha/libdha.c | 2 +- src/video_out/libdha/libdha.h | 2 +- src/video_out/libdha/pci.c | 2 +- src/video_out/libdha/ports.c | 2 +- src/video_out/video_out_xxmc.c | 4 ++-- src/video_out/vidix/drivers/cyberblade_vid.c | 2 +- src/video_out/vidix/drivers/pm2_vid.c | 4 ++-- src/video_out/vidix/drivers/pm3_vid.c | 4 ++-- src/video_out/xvmc_vld.c | 2 +- src/video_out/xxmc.h | 2 +- 51 files changed, 67 insertions(+), 67 deletions(-) (limited to 'src') diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 6cb4be50e..736b4c6d7 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -27,7 +27,7 @@ * Date Author * ---- ------ * - * 01-Feb-2005 Pekka Jääskeläinen + * 01-Feb-2005 Pekka Jääskeläinen * * - This history log started. * - Disabled the automatic EPG updater thread until EPG demuxer diff --git a/src/input/libdvdnav/bswap.h b/src/input/libdvdnav/bswap.h index c1fc7a045..36543fba5 100644 --- a/src/input/libdvdnav/bswap.h +++ b/src/input/libdvdnav/bswap.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2000, 2001 Billy Biggs , - * Håkan Hjort + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c index 270a565ac..0a2d0c3cb 100644 --- a/src/input/libdvdnav/decoder.c +++ b/src/input/libdvdnav/decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * 2002-2004 the dvdnav project * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/decoder.h b/src/input/libdvdnav/decoder.h index 2a9e455c8..13768a70e 100644 --- a/src/input/libdvdnav/decoder.h +++ b/src/input/libdvdnav/decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is modified * from a file originally part of the Ogle DVD player. diff --git a/src/input/libdvdnav/dvd_input.c b/src/input/libdvdnav/dvd_input.c index 6b7bcaeab..7b35f5eef 100644 --- a/src/input/libdvdnav/dvd_input.c +++ b/src/input/libdvdnav/dvd_input.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2002 Samuel Hocevar , - * Håkan Hjort + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/dvd_input.h b/src/input/libdvdnav/dvd_input.h index c75de9656..dacf886d8 100644 --- a/src/input/libdvdnav/dvd_input.h +++ b/src/input/libdvdnav/dvd_input.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2001, 2002 Samuel Hocevar , - * Håkan Hjort + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c index 7ecd8f1ba..1cf493ef1 100644 --- a/src/input/libdvdnav/dvd_reader.c +++ b/src/input/libdvdnav/dvd_reader.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2004 Billy Biggs , - * Håkan Hjort , - * Björn Englund + * HÃ¥kan Hjort , + * Björn Englund * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h index abaa882d0..bb3f5053b 100644 --- a/src/input/libdvdnav/dvd_reader.h +++ b/src/input/libdvdnav/dvd_reader.h @@ -3,8 +3,8 @@ /* * Copyright (C) 2001, 2002 Billy Biggs , - * Håkan Hjort , - * Björn Englund + * HÃ¥kan Hjort , + * Björn Englund * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/dvd_types.h b/src/input/libdvdnav/dvd_types.h index e942bf79f..17c437712 100644 --- a/src/input/libdvdnav/dvd_types.h +++ b/src/input/libdvdnav/dvd_types.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Björn Englund, Håkan Hjort + * Copyright (C) 2000, 2001 Björn Englund, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is a modified * file originally part of the Ogle DVD player project. diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c index 88045b8f3..8df1d133d 100644 --- a/src/input/libdvdnav/dvd_udf.c +++ b/src/input/libdvdnav/dvd_udf.c @@ -4,7 +4,7 @@ * * Modifications by: * Billy Biggs . - * Björn Englund . + * Björn Englund . * * dvdudf: parse and read the UDF volume information of a DVD Video * Copyright (C) 1999 Christian Wolff for convergence integrated media diff --git a/src/input/libdvdnav/dvd_udf.h b/src/input/libdvdnav/dvd_udf.h index d7b2ab601..e0725e6f4 100644 --- a/src/input/libdvdnav/dvd_udf.h +++ b/src/input/libdvdnav/dvd_udf.h @@ -7,7 +7,7 @@ * * Modifications by: * Billy Biggs . - * Björn Englund . + * Björn Englund . * * dvdudf: parse and read the UDF volume information of a DVD Video * Copyright (C) 1999 Christian Wolff for convergence integrated media diff --git a/src/input/libdvdnav/ifo_read.c b/src/input/libdvdnav/ifo_read.c index afc86b196..8f47d2a54 100644 --- a/src/input/libdvdnav/ifo_read.c +++ b/src/input/libdvdnav/ifo_read.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2000, 2001, 2002, 2003 - * Björn Englund , - * Håkan Hjort + * Björn Englund , + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/ifo_read.h b/src/input/libdvdnav/ifo_read.h index 3b9b27f20..5a4c513ec 100644 --- a/src/input/libdvdnav/ifo_read.h +++ b/src/input/libdvdnav/ifo_read.h @@ -2,8 +2,8 @@ #define IFO_READ_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Björn Englund , - * Håkan Hjort + * Copyright (C) 2000, 2001, 2002 Björn Englund , + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/ifo_types.h b/src/input/libdvdnav/ifo_types.h index 17be98f83..5d5124579 100644 --- a/src/input/libdvdnav/ifo_types.h +++ b/src/input/libdvdnav/ifo_types.h @@ -2,8 +2,8 @@ #define IFO_TYPES_H_INCLUDED /* - * Copyright (C) 2000, 2001 Björn Englund , - * Håkan Hjort + * Copyright (C) 2000, 2001 Björn Englund , + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/nav_print.c b/src/input/libdvdnav/nav_print.c index 5052deef9..14e14f373 100644 --- a/src/input/libdvdnav/nav_print.c +++ b/src/input/libdvdnav/nav_print.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort + * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort * * Much of the contents in this file is based on VOBDUMP. * diff --git a/src/input/libdvdnav/nav_print.h b/src/input/libdvdnav/nav_print.h index 35d4b09f0..056603e8d 100644 --- a/src/input/libdvdnav/nav_print.h +++ b/src/input/libdvdnav/nav_print.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2001, 2002 Billy Biggs , - * Håkan Hjort + * HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/nav_read.c b/src/input/libdvdnav/nav_read.c index 421678c78..1c57e2d52 100644 --- a/src/input/libdvdnav/nav_read.c +++ b/src/input/libdvdnav/nav_read.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort + * Copyright (C) 2000, 2001, 2002, 2003 HÃ¥kan Hjort * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/nav_read.h b/src/input/libdvdnav/nav_read.h index 2f41c920d..4aa9d3c15 100644 --- a/src/input/libdvdnav/nav_read.h +++ b/src/input/libdvdnav/nav_read.h @@ -2,7 +2,7 @@ #define NAV_READ_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Håkan Hjort . + * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort . * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/input/libdvdnav/nav_types.h b/src/input/libdvdnav/nav_types.h index cadcdeb5d..8cf745025 100644 --- a/src/input/libdvdnav/nav_types.h +++ b/src/input/libdvdnav/nav_types.h @@ -2,7 +2,7 @@ #define NAV_TYPES_H_INCLUDED /* - * Copyright (C) 2000, 2001, 2002 Håkan Hjort + * Copyright (C) 2000, 2001, 2002 HÃ¥kan Hjort * * The data structures in this file should represent the layout of the * pci and dsi packets as they are stored in the stream. Information diff --git a/src/input/libdvdnav/vm.c b/src/input/libdvdnav/vm.c index 68d8062f3..6c01d14e8 100644 --- a/src/input/libdvdnav/vm.c +++ b/src/input/libdvdnav/vm.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Håkan Hjort + * Copyright (C) 2000, 2001 HÃ¥kan Hjort * Copyright (C) 2001 Rich Wareham * 2002-2004 the dvdnav project * diff --git a/src/input/libdvdnav/vm.h b/src/input/libdvdnav/vm.h index 07c822d13..214570254 100644 --- a/src/input/libdvdnav/vm.h +++ b/src/input/libdvdnav/vm.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Håkan Hjort + * Copyright (C) 2000, 2001 HÃ¥kan Hjort * Copyright (C) 2001 Rich Wareham * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/vmcmd.c b/src/input/libdvdnav/vmcmd.c index 30f32576f..3e0a5fb55 100644 --- a/src/input/libdvdnav/vmcmd.c +++ b/src/input/libdvdnav/vmcmd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * 2002-2004 the dvdnav project * * This file is part of libdvdnav, a DVD navigation library. It is modified diff --git a/src/input/libdvdnav/vmcmd.h b/src/input/libdvdnav/vmcmd.h index 13e1261be..d3fd53ec2 100644 --- a/src/input/libdvdnav/vmcmd.h +++ b/src/input/libdvdnav/vmcmd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001 Martin Norbäck, Håkan Hjort + * Copyright (C) 2000, 2001 Martin Norbäck, HÃ¥kan Hjort * * This file is part of libdvdnav, a DVD navigation library. It is modified * from a file originally part of the Ogle DVD player. diff --git a/src/input/vcd/libcdio/cdio/cd_types.h b/src/input/vcd/libcdio/cdio/cd_types.h index b03cc9f72..9f4a73f67 100644 --- a/src/input/vcd/libcdio/cdio/cd_types.h +++ b/src/input/vcd/libcdio/cdio/cd_types.h @@ -3,7 +3,7 @@ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr - and Heiko Eißfeldt + and Heiko Eißfeldt This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/libfaad/mdct.c b/src/libfaad/mdct.c index cd873a6f9..0df3d6aae 100644 --- a/src/libfaad/mdct.c +++ b/src/libfaad/mdct.c @@ -33,7 +33,7 @@ * As described in: * P. Duhamel, Y. Mahieux, and J.P. Petit, "A Fast Algorithm for the * Implementation of Filter Banks Based on 'Time Domain Aliasing - * Cancellation’," IEEE Proc. on ICASSP‘91, 1991, pp. 2209-2212. + * Cancellation'," IEEE Proc. on ICASSP'91, 1991, pp. 2209-2212. * * * As of April 6th 2002 completely rewritten. diff --git a/src/libfaad/syntax.c b/src/libfaad/syntax.c index a32988177..6dc9fc57d 100644 --- a/src/libfaad/syntax.c +++ b/src/libfaad/syntax.c @@ -2048,11 +2048,11 @@ static uint16_t extension_payload(bitfile *ld, drc_info *drc, uint16_t count) return n; case EXT_FILL_DATA: /* fill_nibble = */ faad_getbits(ld, 4 - DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be ‘0000’ */ + DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be '0000' */ for (i = 0; i < count-1; i++) { /* fill_byte[i] = */ faad_getbits(ld, 8 - DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be ‘10100101’ */ + DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be '10100101' */ } return count; case EXT_DATA_ELEMENT: diff --git a/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c b/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c index adadd3ab0..111387ef0 100644 --- a/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c +++ b/src/libffmpeg/libavcodec/alpha/simple_idct_alpha.c @@ -22,7 +22,7 @@ * based upon some outcommented c code from mpeg2dec (idct_mmx.c * written by Aaron Holtzman ) * - * Alpha optimiziations by Måns Rullgård + * Alpha optimiziations by MÃ¥ns RullgÃ¥rd * and Falk Hueffner */ diff --git a/src/libmpeg2/idct_mlib.c b/src/libmpeg2/idct_mlib.c index bb1aad9a8..e573c9790 100644 --- a/src/libmpeg2/idct_mlib.c +++ b/src/libmpeg2/idct_mlib.c @@ -1,6 +1,6 @@ /* * idct_mlib.c - * Copyright (C) 1999-2002 Håkan Hjort + * Copyright (C) 1999-2002 HÃ¥kan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/src/libmpeg2/idct_mlib.h b/src/libmpeg2/idct_mlib.h index 4a5b92919..1fb0787dd 100644 --- a/src/libmpeg2/idct_mlib.h +++ b/src/libmpeg2/idct_mlib.h @@ -1,7 +1,7 @@ /* * idct_mlib.h * - * Copyright (C) 1999, Håkan Hjort + * Copyright (C) 1999, HÃ¥kan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * diff --git a/src/libmpeg2/motion_comp_mlib.c b/src/libmpeg2/motion_comp_mlib.c index eaf27d9f2..1a37070ae 100644 --- a/src/libmpeg2/motion_comp_mlib.c +++ b/src/libmpeg2/motion_comp_mlib.c @@ -1,6 +1,6 @@ /* * motion_comp_mlib.c - * Copyright (C) 2000-2002 Håkan Hjort + * Copyright (C) 2000-2002 HÃ¥kan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/src/libmpeg2new/libmpeg2/idct_mlib.c b/src/libmpeg2new/libmpeg2/idct_mlib.c index e8f321a83..55a2e9b64 100644 --- a/src/libmpeg2new/libmpeg2/idct_mlib.c +++ b/src/libmpeg2new/libmpeg2/idct_mlib.c @@ -1,6 +1,6 @@ /* * idct_mlib.c - * Copyright (C) 1999-2003 Håkan Hjort + * Copyright (C) 1999-2003 HÃ¥kan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/src/libmpeg2new/libmpeg2/motion_comp_mlib.c b/src/libmpeg2new/libmpeg2/motion_comp_mlib.c index 96f000991..71c085029 100644 --- a/src/libmpeg2new/libmpeg2/motion_comp_mlib.c +++ b/src/libmpeg2new/libmpeg2/motion_comp_mlib.c @@ -1,6 +1,6 @@ /* * motion_comp_mlib.c - * Copyright (C) 2000-2003 Håkan Hjort + * Copyright (C) 2000-2003 HÃ¥kan Hjort * * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. * See http://libmpeg2.sourceforge.net/ for updates. diff --git a/src/libmusepack/mpc_decoder.c b/src/libmusepack/mpc_decoder.c index 827dda6dc..d65708c52 100644 --- a/src/libmusepack/mpc_decoder.c +++ b/src/libmusepack/mpc_decoder.c @@ -1197,7 +1197,7 @@ mpc_bool_t mpc_decoder_initialize(mpc_decoder *d, mpc_streaminfo *si) // AB: setting position to the beginning of the data-bitstream switch (d->StreamVersion) { - case 0x04: f_seek(d, 4 + d->MPCHeaderPos); d->pos = 16; break; // Geht auch über eine der Helperfunktionen + case 0x04: f_seek(d, 4 + d->MPCHeaderPos); d->pos = 16; break; // Geht auch über eine der Helperfunktionen case 0x05: case 0x06: f_seek(d, 8 + d->MPCHeaderPos); d->pos = 0; break; case 0x07: diff --git a/src/libmusepack/synth_filter.c b/src/libmusepack/synth_filter.c index 5a14091f5..dceb0a64d 100644 --- a/src/libmusepack/synth_filter.c +++ b/src/libmusepack/synth_filter.c @@ -282,17 +282,17 @@ static void Calculate_New_V ( const MPC_SAMPLE_FORMAT * Sample, MPC_SAMPLE_FORMA A14 = MPC_SHL(B14 + B15, MPC_FIXED_POINT_SYNTH_FIX); A15 = MPC_SCALE_CONST_SHL((B14 - B15) , 0.7071067691f , 31, MPC_FIXED_POINT_SYNTH_FIX); - // mehrfach verwendete Ausdrücke: A04+A06+A07, A09+A13+A15 + // mehrfach verwendete Ausdrücke: A04+A06+A07, A09+A13+A15 V[ 5] = (V[11] = (V[13] = A07 + (V[15] = A15)) + A11) + A05 + A13; V[ 7] = (V[ 9] = A03 + A11 + A15) + A13; V[33] = -(V[ 1] = A01 + A09 + A13 + A15) - A14; V[35] = -(V[ 3] = A05 + A07 + A09 + A13 + A15) - A06 - A14; V[37] = (tmp = -(A10 + A11 + A13 + A14 + A15)) - A05 - A06 - A07; - V[39] = tmp - A02 - A03; // abhängig vom Befehl drüber - V[41] = (tmp += A13 - A12) - A02 - A03; // abhängig vom Befehl 2 drüber - V[43] = tmp - A04 - A06 - A07; // abhängig von Befehlen 1 und 3 drüber + V[39] = tmp - A02 - A03; // abhängig vom Befehl drüber + V[41] = (tmp += A13 - A12) - A02 - A03; // abhängig vom Befehl 2 drüber + V[43] = tmp - A04 - A06 - A07; // abhängig von Befehlen 1 und 3 drüber V[47] = (tmp = -(A08 + A12 + A14 + A15)) - A00; - V[45] = tmp - A04 - A06 - A07; // abhängig vom Befehl drüber + V[45] = tmp - A04 - A06 - A07; // abhängig vom Befehl drüber V[32] = -V[ 0]; V[31] = -V[ 1]; diff --git a/src/libw32dll/wine/pe_image.c b/src/libw32dll/wine/pe_image.c index aa29098c1..c99bbaed0 100644 --- a/src/libw32dll/wine/pe_image.c +++ b/src/libw32dll/wine/pe_image.c @@ -1,6 +1,6 @@ /* * Copyright 1994 Eric Youndale & Erik Bos - * Copyright 1995 Martin von Löwis + * Copyright 1995 Martin von Löwis * Copyright 1996-98 Marcus Meissner * * based on Eric Youndale's pe-test and: diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c index e6fec60ea..b24f2f496 100644 --- a/src/post/goom/goom_core.c +++ b/src/post/goom/goom_core.c @@ -151,7 +151,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512], guint32 pointWidth; guint32 pointHeight; int i; - float largfactor; /* elargissement de l'intervalle d'évolution des points */ + float largfactor; /* elargissement de l'intervalle d'évolution des points */ Pixel *tmp; ZoomFilterData *pzfd; @@ -215,7 +215,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512], } } - /* par défaut pas de changement de zoom */ + /* par défaut pas de changement de zoom */ pzfd = NULL; /* @@ -532,7 +532,7 @@ guint32 *goom_update (PluginInfo *goomInfo, gint16 data[2][512], } /* - * arreter de decrémenter au bout d'un certain temps + * arreter de decrémenter au bout d'un certain temps */ if ((goomInfo->cycle % 101 == 0) && (goomInfo->update.zoomFilterData.pertedec == 7)) { pzfd = &goomInfo->update.zoomFilterData; diff --git a/src/post/goom/goom_filters.h b/src/post/goom/goom_filters.h index f015499a8..06c6d092a 100644 --- a/src/post/goom/goom_filters.h +++ b/src/post/goom/goom_filters.h @@ -16,7 +16,7 @@ struct _ZOOM_FILTER_DATA unsigned char sqrtperte; int middleX, middleY; /* milieu de l'effet */ char reverse; /* inverse la vitesse */ - char mode; /* type d'effet à appliquer (cf les #define) */ + char mode; /* type d'effet à appliquer (cf les #define) */ /** @since June 2001 */ int hPlaneEffect; /* deviation horitontale */ int vPlaneEffect; /* deviation verticale */ diff --git a/src/post/goom/mmx.c b/src/post/goom/mmx.c index e2f25b47d..3c9d0ee4a 100644 --- a/src/post/goom/mmx.c +++ b/src/post/goom/mmx.c @@ -109,7 +109,7 @@ void zoom_filter_mmx (int prevX, int prevY, "pmullw %%mm4, %%mm1 \n\t" "pmullw %%mm5, %%mm2 \n\t" - /* ajout des valeurs obtenues à la valeur finale */ + /* ajout des valeurs obtenues à la valeur finale */ "paddw %%mm1, %%mm0 \n\t" "paddw %%mm2, %%mm0 \n\t" diff --git a/src/post/goom/sound_tester.c b/src/post/goom/sound_tester.c index ac50a11b2..b6c4af442 100644 --- a/src/post/goom/sound_tester.c +++ b/src/post/goom/sound_tester.c @@ -90,7 +90,7 @@ void evaluate_sound(gint16 data[2][512], SoundInfo *info) { if (info->goom_limit>1) info->goom_limit=1; - /* toute les 2 secondes : vérifier si le taux de goom est correct + /* toute les 2 secondes : vérifier si le taux de goom est correct * et le modifier sinon.. */ if (info->cycle % 64 == 0) { if (info->speedvar<0.01f) diff --git a/src/post/goom/xmmx.c b/src/post/goom/xmmx.c index 0048a20e8..6b76a86a3 100644 --- a/src/post/goom/xmmx.c +++ b/src/post/goom/xmmx.c @@ -234,7 +234,7 @@ void zoom_filter_xmmx (int prevX, int prevY, pmullw_r2r (mm4, mm1); pmullw_r2r (mm5, mm2); - /* ajout des valeurs obtenues à la valeur finale */ + /* ajout des valeurs obtenues à la valeur finale */ paddw_r2r (mm1, mm0); paddw_r2r (mm2, mm0); diff --git a/src/video_out/libdha/kernelhelper/dhahelper.c b/src/video_out/libdha/kernelhelper/dhahelper.c index 3ccbee107..0e755064a 100644 --- a/src/video_out/libdha/kernelhelper/dhahelper.c +++ b/src/video_out/libdha/kernelhelper/dhahelper.c @@ -3,7 +3,7 @@ (C) 2002 Alex Beregszaszi (C) 2002-2003 Nick Kurshev - (C) 2002-2004 Måns Rullgård + (C) 2002-2004 MÃ¥ns RullgÃ¥rd Accessing hardware from userspace as USER (no root needed!) @@ -109,7 +109,7 @@ #define irqreturn(n) return #endif -MODULE_AUTHOR("Alex Beregszaszi , Nick Kurshev , Måns Rullgård "); +MODULE_AUTHOR("Alex Beregszaszi , Nick Kurshev , MÃ¥ns RullgÃ¥rd "); MODULE_DESCRIPTION("Provides userspace access to hardware"); #ifdef MODULE_LICENSE MODULE_LICENSE("GPL"); diff --git a/src/video_out/libdha/libdha.c b/src/video_out/libdha/libdha.c index cb99e1c2d..73a4387a2 100644 --- a/src/video_out/libdha/libdha.c +++ b/src/video_out/libdha/libdha.c @@ -3,7 +3,7 @@ Copyrights: 1996/10/27 - Robin Cutshaw (robin@xfree86.org) XFree86 3.3.3 implementation - 1999 - Øyvind Aabling. + 1999 - Øyvind Aabling. Modified for GATOS/win/gfxdump. 2002 - library implementation by Nick Kurshev diff --git a/src/video_out/libdha/libdha.h b/src/video_out/libdha/libdha.h index e37cae515..2bd8fe39b 100644 --- a/src/video_out/libdha/libdha.h +++ b/src/video_out/libdha/libdha.h @@ -3,7 +3,7 @@ Copyrights: 1996/10/27 - Robin Cutshaw (robin@xfree86.org) XFree86 3.3.3 implementation - 1999 - Øyvind Aabling. + 1999 - Øyvind Aabling. Modified for GATOS/win/gfxdump. 2002 - library implementation by Nick Kurshev diff --git a/src/video_out/libdha/pci.c b/src/video_out/libdha/pci.c index 1cc70b7aa..db8f4ddd5 100644 --- a/src/video_out/libdha/pci.c +++ b/src/video_out/libdha/pci.c @@ -1,6 +1,6 @@ /* (C) 2002 - library implementation by Nick Kyrshev - XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling. + XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling. */ /* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */ /* diff --git a/src/video_out/libdha/ports.c b/src/video_out/libdha/ports.c index 73ad671d1..b531082d3 100644 --- a/src/video_out/libdha/ports.c +++ b/src/video_out/libdha/ports.c @@ -1,6 +1,6 @@ /* (C) 2002 - library implementation by Nick Kyrshev - XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling. + XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by Øyvind Aabling. */ /* $XConsortium: scanpci.c /main/25 1996/10/27 11:48:40 kaleb $ */ /* diff --git a/src/video_out/video_out_xxmc.c b/src/video_out/video_out_xxmc.c index 11bfc7e1a..1c71bb534 100644 --- a/src/video_out/video_out_xxmc.c +++ b/src/video_out/video_out_xxmc.c @@ -31,8 +31,8 @@ * * overlay support by James Courtier-Dutton - July 2001 * X11 unscaled overlay support by Miguel Freitas - Nov 2003 - * XvMC VLD implementation by Thomas Hellström - 2004, 2005. - * XvMC merge by Thomas Hellström - Sep 2004 + * XvMC VLD implementation by Thomas Hellström - 2004, 2005. + * XvMC merge by Thomas Hellström - Sep 2004 * */ diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/src/video_out/vidix/drivers/cyberblade_vid.c index 4b2f243f5..7a32ce7bd 100644 --- a/src/video_out/vidix/drivers/cyberblade_vid.c +++ b/src/video_out/vidix/drivers/cyberblade_vid.c @@ -4,7 +4,7 @@ Copyright (C) 2002 by Alastair M. Robinson. Official homepage: http://www.blackfiveservices.co.uk/EPIAVidix.shtml - Based on Permedia 3 driver by Måns Rullgård + Based on Permedia 3 driver by MÃ¥ns RullgÃ¥rd Thanks to Gilles Frattini for bugfixes diff --git a/src/video_out/vidix/drivers/pm2_vid.c b/src/video_out/vidix/drivers/pm2_vid.c index 1422bbd8b..075b178de 100644 --- a/src/video_out/vidix/drivers/pm2_vid.c +++ b/src/video_out/vidix/drivers/pm2_vid.c @@ -1,7 +1,7 @@ /** Driver for 3DLabs Permedia 2. - Copyright (C) 2002 Måns Rullgård + Copyright (C) 2002 MÃ¥ns RullgÃ¥rd 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 @@ -62,7 +62,7 @@ int pm2_vidmem = PM2_VIDMEM; static vidix_capability_t pm2_cap = { "3DLabs Permedia2 driver", - "Måns Rullgård ", + "MÃ¥ns RullgÃ¥rd ", TYPE_OUTPUT, { 0, 0, 0, 0 }, 2048, diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/src/video_out/vidix/drivers/pm3_vid.c index 8a9e86c7b..72a6523b3 100644 --- a/src/video_out/vidix/drivers/pm3_vid.c +++ b/src/video_out/vidix/drivers/pm3_vid.c @@ -1,7 +1,7 @@ /** Driver for 3DLabs GLINT R3 and Permedia3 chips. - Copyright (C) 2002, 2003 Måns Rullgård + Copyright (C) 2002, 2003 MÃ¥ns RullgÃ¥rd 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 @@ -63,7 +63,7 @@ static u_int page_size; static vidix_capability_t pm3_cap = { "3DLabs GLINT R3/Permedia3 driver", - "Måns Rullgård ", + "MÃ¥ns RullgÃ¥rd ", TYPE_OUTPUT, { 0, 0, 0, 0 }, 2048, diff --git a/src/video_out/xvmc_vld.c b/src/video_out/xvmc_vld.c index ba1b51795..953b65563 100644 --- a/src/video_out/xvmc_vld.c +++ b/src/video_out/xvmc_vld.c @@ -22,7 +22,7 @@ * * xvmc_vld.c, X11 decoding accelerated video extension interface for xine * - * Author: Thomas Hellström, (2004) + * Author: Thomas Hellström, (2004) */ #include "xxmc.h" diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h index 5fb9f66ee..d5c067d36 100644 --- a/src/video_out/xxmc.h +++ b/src/video_out/xxmc.h @@ -31,7 +31,7 @@ * * overlay support by James Courtier-Dutton - July 2001 * X11 unscaled overlay support by Miguel Freitas - Nov 2003 - * XxMC implementation by Thomas Hellström - August 2004 + * XxMC implementation by Thomas Hellström - August 2004 */ #ifndef _XXMC_H -- cgit v1.2.3 From ad2a7e4b516086d2dffc83e0f31a017b731d6f34 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Thu, 17 May 2007 01:02:12 +0100 Subject: Convert character constants to hex values for redability in UTF-8 terminals. Add and adjust comments appropriately. --- src/libspucc/cc_decoder.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c index 46ea5c02c..dc380c8de 100644 --- a/src/libspucc/cc_decoder.c +++ b/src/libspucc/cc_decoder.c @@ -223,10 +223,14 @@ static const uint8_t *const cc_alpha_palettes[NUM_CC_PALETTES] = { /* mapping from PAC row code to actual CC row */ static const int rowdata[] = {10, -1, 0, 1, 2, 3, 11, 12, 13, 14, 4, 5, 6, 7, 8, 9}; -/* FIXME: do real TM */ -/* must be mapped as a music note in the captioning font */ -static const char specialchar[] = {'®','°','½','¿','T','¢','£','¶','à', - TRANSP_SPACE,'è','â','ê','î','ô','û'}; +/* FIXME: do real â„¢ (U+2122) */ +/* Code 182 must be mapped as a musical note ('♪', U+266A) in the caption font */ +static const char specialchar[] = { + 174 /* ® */, 176 /* ° */, 189 /* ½ */, 191 /* ¿ */, + 'T' /* â„¢ */, 162 /* ¢ */, 163 /* £ */, 182 /* ¶ => ♪ */, + 224 /* à */, TRANSP_SPACE,232 /* è */, 226 /* â */, + 234 /* ê */, 238 /* î */, 244 /* ô */, 251 /* û */ +}; /* character translation table - EIA 608 codes are not all the same as ASCII */ static char chartbl[128]; @@ -427,16 +431,16 @@ static void build_char_table(void) for (i = 0; i < 128; i++) chartbl[i] = (char) i; /* now the special codes */ - chartbl[0x2a] = 'á'; - chartbl[0x5c] = 'é'; - chartbl[0x5e] = 'í'; - chartbl[0x5f] = 'ó'; - chartbl[0x60] = 'ú'; - chartbl[0x7b] = 'ç'; - chartbl[0x7c] = '÷'; - chartbl[0x7d] = 'Ñ'; - chartbl[0x7e] = 'ñ'; - chartbl[0x7f] = '¤'; /* FIXME: this should be a solid block */ + chartbl[0x2a] = 225; /* á */ + chartbl[0x5c] = 233; /* é */ + chartbl[0x5e] = 237; /* í */ + chartbl[0x5f] = 243; /* ó */ + chartbl[0x60] = 250; /* ú */ + chartbl[0x7b] = 231; /* ç */ + chartbl[0x7c] = 247; /* ÷ */ + chartbl[0x7d] = 209; /* Ñ */ + chartbl[0x7e] = 241; /* ñ */ + chartbl[0x7f] = 164; /* ¤ FIXME: should be a solid block ('â–ˆ'; U+2588) */ } -- cgit v1.2.3