Menu
▾
▴
[xine-cvs] HG: xine-lib-1.2-vdr: Merge from 1.2 main branch.
|
From: <li...@yo...> - 2007-05-17 01:26:59
|
# HG changeset patch
# User Darren Salt <li...@yo...>
# Date 1179361042 -3600
# Node ID cc990a4dcd27f1530fb429e559a99a55fef5cc1b
# Parent 53e05173507701f049c58fdadc6714de2970fd31
# Parent b6333d7b37ba4dd26e7c2b8cd845028a4f3d10f2
Merge from 1.2 main branch.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 AUTHORS
--- a/AUTHORS Thu May 17 01:17:22 2007 +0100
+++ b/AUTHORS Wed May 09 02:13:21 2007 +0200
@@ -76,7 +76,7 @@ James Stembridge <jst...@us...ur
VIDIX driver, real media and ffmpeg interface fixes and improvements
mpeg-4 postprocessing, initial software DTS decoding
-Frantisek Dvorak <va...@at...>
+František Dvořák <va...@at...>
czech translations and multilanguage support (xine lib/ui),
RIP Input Plugin, WIN32 porting, lots of other improvements and bugfixes
@@ -185,7 +185,7 @@ Philip Stadermann <pst...@gm...>
Philip Stadermann <pst...@gm...>
arts audio server support, kde frontend
-Jme Villette <vil...@ch...>
+Jérôme Villette <vil...@ch...>
'xinetic', 'CelomaGold', 'CelomaMdk', 'CelomaChrome', 'Centori'
and 'Keramic' skins.
@@ -364,7 +364,7 @@ Anders D. Wiehe <an...@wi...>
Anders D. Wiehe <an...@wi...>
OSD stream informations patch.
-ZoltBrmi <zb...@fr...>
+Zoltán Böszörményi <zb...@fr...>
tremendous help in porting sputext to 1.0 API
Micael Beronius <mic...@te...>
@@ -380,10 +380,10 @@ Fredrik Noring <no...@no...>
Fredrik Noring <no...@no...>
linux fb frontend. improved fb driver with zero copy
-Marco Z<an...@us...>
+Marco Zühlke <an...@us...>
visualization improvements, demuxer cleanups
-Julio Shez <j.s...@te...>
+Julio Sánchez <j.s...@te...>
patch for drawing OSD bitmaps
Stuart Caie <ky...@4u...>
@@ -422,7 +422,7 @@ Darren Vincent Hart <dv...@by...>
Darren Vincent Hart <dv...@by...>
libstk video out plugin
-Philip Jnstedt <ph...@te...>
+Philip Jägenstedt <ph...@te...>
rework of aspect ratio to support float values
Laurent Aimar <fe...@vi...>
@@ -437,7 +437,7 @@ Jeroen Asselman <je...@as...>
Jeroen Asselman <je...@as...>
v4l improvements, audio support
-NjT. Borch <Nja...@nj...>
+Njål T. Borch <Nja...@nj...>
Ipv6 patch
Ramon van der Aar <rv...@it...>
@@ -501,7 +501,7 @@ Daniel Mack <xi...@zo...>
Daniel Mack <xi...@zo...>
native Mac OS X video and audio output plugins
-Andrang <oz...@al...>
+André Pang <oz...@al...>
Mac OS X fixes and framework/frontend work
Annodex and CMML support
@@ -514,7 +514,7 @@ Casper Boemann <cb...@bo...>
Casper Boemann <cb...@bo...>
reuse stubs for unresolved exports of win32 dlls
-Thomas Hel...@sh...>
+Thomas Hellström <uni...@sh...>
XxMC driver with reworked XvMC support, including VIA CLE266 vld
extensions.
@@ -527,12 +527,12 @@ Barry Scott <bar...@on...>
Barry Scott <bar...@on...>
fix V4l source selection code by MRL
-Reinhard Nissl <rn...@gm...>
+Reinhard Nißl <rn...@gm...>
contributions for VDR interoperability, bugfixes,
overlay blending quality improvements, audio post plugin support for xine-ui,
upmix_mono post plugin
-Pekka Jkelen <pja...@cs...>
+Pekka Jääskeläinen <pja...@cs...>
DVB mouse-control and EPG enhancements
Assaf Gillat <gi...@gm...>
@@ -547,10 +547,10 @@ Keenan Pepper <kee...@gm...>
Keenan Pepper <kee...@gm...>
gcc4 patches
-Dams Nad...@li...>
+Dams Nadé <an...@li...>
gcc4 patches
-Diego 'Flameeyes' Pet...@ge...>
+Diego 'Flameeyes' Pettenò <fla...@ge...>
build system improvements, LE_64/BE_64 macro fixes
Jason Tackaberry <ta...@sa...>
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 ChangeLog
--- a/ChangeLog Thu May 17 01:17:22 2007 +0100
+++ b/ChangeLog Wed May 09 02:13:21 2007 +0200
@@ -33,6 +33,7 @@ xine-lib (1.1.7) (unreleased)
* Ensure that the ffmpeg video image size is properly initialised.
* Allow XxMC to switch back to software decoding; don't deinterlace if it's
not needed for any given frame.
+ * Document dvba: MRLs (ATSC with full tuning info).
xine-lib (1.1.6)
* Split the DirectFB plugin into X11 and non-X versions.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 doc/man/en/xine.5
--- a/doc/man/en/xine.5 Thu May 17 01:17:22 2007 +0100
+++ b/doc/man/en/xine.5 Wed May 09 02:13:21 2007 +0200
@@ -54,6 +54,8 @@ to read from. Valid MRLs may be plain fi
.br
.BI dvbt://<channel_name>:<tuning_parameters>
.br
+.BI dvba://<channel_name>:<tuning_parameters>
+.br
.BR pvr:/<tmp_files_path>!<saved_files_path>!<max_page_age> " (for WinTV PVR 250 and 350)"
.LP
.TP
@@ -199,13 +201,16 @@ of the following forms:
of the following forms:
.TP
.B DVB-S
-<frequency>:<polarisation>:<sat_no>:<sym_rate>:<vpid>:<apid>
+<frequency>:<polarisation>:<sat-no>:<sym-rate>:<vpid>:<apid>:<service-id>
.TP
.B DVB-C
-<frequency>:<inversion>:<sym_rate>:<fec>:<qam>:<vpid>:<apid>
+<frequency>:<inversion>:<sym-rate>:<fec>:<qam>:<vpid>:<apid>:<service-id>
.TP
.B DVB-T
-<frequency>:<inversion>:<bw>:<fec_hp>:<fec_lp>:<qam>:<transmission_mode>:<guardlist>:<hierarchy_info>:<vpid>:<apid>
+<frequency>:<inversion>:<bw>:<fec-hp>:<fec-lp>:<qam>:<transmission-mode>:<guardlist>:<hierarchy-info>:<vpid>:<apid>:<service-id>
+.TP
+.B DVB-A
+<frequency>:<qam>:<vpid>:<apid>:<service-id>
.PP
The individual parameters are:
.TP 20
@@ -215,16 +220,16 @@ number, usually in kHz
.B polarisation
`v' or `h'
.TP 20
-.B sat_no
+.B sat-no
unsigned long, usually 0
.TP 20
-.B sym_rate
+.B sym-rate
symbol rate in MSyms/sec
.TP 20
.B inversion
INVERSION_ON, INVERSION_OFF, INVERSION_AUTO
.TP 20
-.B fec, fec_hp, fec_lp
+.B fec, fec-hp, fec-lp
FEC_1_2, FEC_2_3, FEC_3_4 ... FEC_8_9, FEC_AUTO, FEC_NONE
.TP 20
.B qam
@@ -233,13 +238,13 @@ QPSK, QAM_128, QAM_16 ...
.B bw
BANDWIDTH_6_MHZ, BANDWIDTH_7_MHZ, BANDWIDTH_8_MHZ
.TP 20
-.B transmission_mode
+.B transmission-mode
TRANSMISSION_MODE_2K, TRANSMISSION_MODE_8K
.TP 20
.B guardlist
GUARD_INTERVAL_1_4, GUARD_INTERVAL_1_8, GUARD_INTERVAL_1_16, GUARD_INTERVAL_1_32,
.TP 20
-.B hierarchy_info
+.B hierarchy-info
HIERARCHY_1, HIERARCHY_2, HIERARCHY_4, HIERARCHY_NONE
.TP 20
.B vpid
@@ -247,6 +252,9 @@ video program ID
.TP 20
.B apid
audio program ID
+.TP 20
+.B service-id
+service ID (needed for now/next information etc.)
.SH SUBTITLE
.B external subtitle files (any mrl)
.br
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/demuxers/demux_ts.c
--- a/src/demuxers/demux_ts.c Thu May 17 01:17:22 2007 +0100
+++ b/src/demuxers/demux_ts.c Wed May 09 02:13:21 2007 +0200
@@ -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 */
@@ -683,7 +682,11 @@ static int demux_ts_parse_pes_header (xi
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 +1247,7 @@ printf("Program Number is %i, looking fo
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 +1269,7 @@ printf("Program Number is %i, looking fo
}
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 +1283,7 @@ printf("Program Number is %i, looking fo
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 +1292,7 @@ printf("Program Number is %i, looking fo
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 +1308,7 @@ printf("Program Number is %i, looking fo
}
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 +1326,7 @@ printf("Program Number is %i, looking fo
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 +1361,11 @@ printf("Program Number is %i, looking fo
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
}
}
@@ -1531,12 +1535,7 @@ static unsigned char * demux_synchronise
*/
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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/input_dvb.c
--- a/src/input/input_dvb.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/input_dvb.c Wed May 09 02:13:21 2007 +0200
@@ -27,7 +27,7 @@
* Date Author
* ---- ------
*
- * 01-Feb-2005 Pekka Jkelen <po...@ik...>
+ * 01-Feb-2005 Pekka Jääskeläinen <po...@ik...>
*
* - This history log started.
* - Disabled the automatic EPG updater thread until EPG demuxer
@@ -111,6 +111,7 @@
#define LOG_VERBOSE
/*
#define LOG
+#define LOG_READS
*/
#include "xine_internal.h"
@@ -589,7 +590,8 @@ static tuner_t *tuner_init(xine_t * xine
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;
@@ -634,7 +636,7 @@ static tuner_t *tuner_init(xine_t * xine
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);
@@ -1010,7 +1012,7 @@ static int tuner_tune_it (tuner_t *this,
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;
}
@@ -1036,7 +1038,7 @@ static int tuner_tune_it (tuner_t *this,
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;
}
@@ -2476,8 +2478,10 @@ static off_t dvb_plugin_read (input_plug
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);
@@ -2529,9 +2533,11 @@ static off_t dvb_plugin_read (input_plug
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;
@@ -2905,13 +2911,13 @@ static int dvb_plugin_open(input_plugin_
{
fprintf(stderr,"input_dvb: 2a %x\n",tuner->feinfo.type);
/*
- * This is dvbc://<channel name>:<qam tuning parameters>
+ * This is dvba://<channel name>:<atsc tuning parameters>
*/
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;
}
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/input_http.c
--- a/src/input/input_http.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/input_http.c Wed May 09 02:13:21 2007 +0200
@@ -829,7 +829,7 @@ static int http_plugin_open (input_plugi
_("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"),
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/input_plugin.h
--- a/src/input/input_plugin.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/input_plugin.h Wed May 09 02:13:21 2007 +0200
@@ -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);
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/input_v4l.c
--- a/src/input/input_v4l.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/input_v4l.c Wed May 09 02:13:21 2007 +0200
@@ -517,11 +517,9 @@ static int extract_mrl(v4l_input_plugin_
/* 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;
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/bswap.h
--- a/src/input/libdvdnav/bswap.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/bswap.h Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
/*
* Copyright (C) 2000, 2001 Billy Biggs <ve...@du...>,
- * Hn Hjort <d95...@dt...>
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/decoder.c
--- a/src/input/libdvdnav/decoder.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/decoder.c Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Martin Norb, Hn 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/decoder.h
--- a/src/input/libdvdnav/decoder.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/decoder.h Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Martin Norb, Hn 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_input.c
--- a/src/input/libdvdnav/dvd_input.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_input.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2002 Samuel Hocevar <sa...@zo...>,
- * Hn Hjort <d95...@dt...>
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_input.h
--- a/src/input/libdvdnav/dvd_input.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_input.h Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
/*
* Copyright (C) 2001, 2002 Samuel Hocevar <sa...@zo...>,
- * Hn Hjort <d95...@dt...>
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_reader.c
--- a/src/input/libdvdnav/dvd_reader.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_reader.c Wed May 09 02:13:21 2007 +0200
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2001-2004 Billy Biggs <ve...@du...>,
- * Hn Hjort <d95...@dt...>,
- * BjEnglund <d4...@dt...>
+ * Håkan Hjort <d95...@dt...>,
+ * Björn Englund <d4...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_reader.h
--- a/src/input/libdvdnav/dvd_reader.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_reader.h Wed May 09 02:13:21 2007 +0200
@@ -3,8 +3,8 @@
/*
* Copyright (C) 2001, 2002 Billy Biggs <ve...@du...>,
- * Hn Hjort <d95...@dt...>,
- * BjEnglund <d4...@dt...>
+ * Håkan Hjort <d95...@dt...>,
+ * Björn Englund <d4...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_types.h
--- a/src/input/libdvdnav/dvd_types.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_types.h Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 BjEnglund, Hn 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_udf.c
--- a/src/input/libdvdnav/dvd_udf.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_udf.c Wed May 09 02:13:21 2007 +0200
@@ -4,7 +4,7 @@
*
* Modifications by:
* Billy Biggs <ve...@du...>.
- * BjEnglund <d4...@dt...>.
+ * Björn Englund <d4...@dt...>.
*
* dvdudf: parse and read the UDF volume information of a DVD Video
* Copyright (C) 1999 Christian Wolff for convergence integrated media
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/dvd_udf.h
--- a/src/input/libdvdnav/dvd_udf.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/dvd_udf.h Wed May 09 02:13:21 2007 +0200
@@ -7,7 +7,7 @@
*
* Modifications by:
* Billy Biggs <ve...@du...>.
- * BjEnglund <d4...@dt...>.
+ * Björn Englund <d4...@dt...>.
*
* dvdudf: parse and read the UDF volume information of a DVD Video
* Copyright (C) 1999 Christian Wolff for convergence integrated media
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/ifo_read.c
--- a/src/input/libdvdnav/ifo_read.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/ifo_read.c Wed May 09 02:13:21 2007 +0200
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2000, 2001, 2002, 2003
- * BjEnglund <d4...@dt...>,
- * Hn Hjort <d95...@dt...>
+ * Björn Englund <d4...@dt...>,
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/ifo_read.h
--- a/src/input/libdvdnav/ifo_read.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/ifo_read.h Wed May 09 02:13:21 2007 +0200
@@ -2,8 +2,8 @@
#define IFO_READ_H_INCLUDED
/*
- * Copyright (C) 2000, 2001, 2002 BjEnglund <d4...@dt...>,
- * Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000, 2001, 2002 Björn Englund <d4...@dt...>,
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/ifo_types.h
--- a/src/input/libdvdnav/ifo_types.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/ifo_types.h Wed May 09 02:13:21 2007 +0200
@@ -2,8 +2,8 @@
#define IFO_TYPES_H_INCLUDED
/*
- * Copyright (C) 2000, 2001 BjEnglund <d4...@dt...>,
- * Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000, 2001 Björn Englund <d4...@dt...>,
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/nav_print.c
--- a/src/input/libdvdnav/nav_print.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/nav_print.c Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001, 2002, 2003 Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95...@dt...>
*
* Much of the contents in this file is based on VOBDUMP.
*
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/nav_print.h
--- a/src/input/libdvdnav/nav_print.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/nav_print.h Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
/*
* Copyright (C) 2001, 2002 Billy Biggs <ve...@du...>,
- * Hn Hjort <d95...@dt...>
+ * Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/nav_read.c
--- a/src/input/libdvdnav/nav_read.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/nav_read.c Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001, 2002, 2003 Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000, 2001, 2002, 2003 Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/nav_read.h
--- a/src/input/libdvdnav/nav_read.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/nav_read.h Wed May 09 02:13:21 2007 +0200
@@ -2,7 +2,7 @@
#define NAV_READ_H_INCLUDED
/*
- * Copyright (C) 2000, 2001, 2002 Hn Hjort <d95...@dt...>.
+ * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95...@dt...>.
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/nav_types.h
--- a/src/input/libdvdnav/nav_types.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/nav_types.h Wed May 09 02:13:21 2007 +0200
@@ -2,7 +2,7 @@
#define NAV_TYPES_H_INCLUDED
/*
- * Copyright (C) 2000, 2001, 2002 Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000, 2001, 2002 Håkan Hjort <d95...@dt...>
*
* 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/vm.c
--- a/src/input/libdvdnav/vm.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/vm.c Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Hn Hjort
+ * Copyright (C) 2000, 2001 Håkan Hjort
* Copyright (C) 2001 Rich Wareham <ric...@us...>
* 2002-2004 the dvdnav project
*
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/vm.h
--- a/src/input/libdvdnav/vm.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/vm.h Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Hn Hjort
+ * Copyright (C) 2000, 2001 Håkan Hjort
* Copyright (C) 2001 Rich Wareham <ric...@us...>
*
* This file is part of libdvdnav, a DVD navigation library. It is modified
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/vmcmd.c
--- a/src/input/libdvdnav/vmcmd.c Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/vmcmd.c Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Martin Norb, Hn 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/libdvdnav/vmcmd.h
--- a/src/input/libdvdnav/vmcmd.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/libdvdnav/vmcmd.h Wed May 09 02:13:21 2007 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001 Martin Norb, Hn 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/input/vcd/libcdio/cdio/cd_types.h
--- a/src/input/vcd/libcdio/cdio/cd_types.h Thu May 17 01:17:22 2007 +0100
+++ b/src/input/vcd/libcdio/cdio/cd_types.h Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
Copyright (C) 2003 Rocky Bernstein <ro...@pa...>
Copyright (C) 1996,1997,1998 Gerd Knorr <kr...@by...>
- and Heiko Eieldt <he...@he...>
+ and Heiko Eißfeldt <he...@he...>
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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libfaad/mdct.c
--- a/src/libfaad/mdct.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libfaad/mdct.c Wed May 09 02:13:21 2007 +0200
@@ -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 ICASSP91, 1991, pp. 2209-2212.
+ * Cancellation'," IEEE Proc. on ICASSP'91, 1991, pp. 2209-2212.
*
*
* As of April 6th 2002 completely rewritten.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libfaad/syntax.c
--- a/src/libfaad/syntax.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libfaad/syntax.c Wed May 09 02:13:21 2007 +0200
@@ -2048,11 +2048,11 @@ static uint16_t extension_payload(bitfil
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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libmpeg2/idct_mlib.c
--- a/src/libmpeg2/idct_mlib.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libmpeg2/idct_mlib.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* idct_mlib.c
- * Copyright (C) 1999-2002 Hn Hjort <d95...@dt...>
+ * Copyright (C) 1999-2002 Håkan Hjort <d95...@dt...>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
* See http://libmpeg2.sourceforge.net/ for updates.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libmpeg2/idct_mlib.h
--- a/src/libmpeg2/idct_mlib.h Thu May 17 01:17:22 2007 +0100
+++ b/src/libmpeg2/idct_mlib.h Wed May 09 02:13:21 2007 +0200
@@ -1,7 +1,7 @@
/*
* idct_mlib.h
*
- * Copyright (C) 1999, Hn Hjort <d95...@dt...>
+ * Copyright (C) 1999, Håkan Hjort <d95...@dt...>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
*
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libmpeg2/motion_comp_mlib.c
--- a/src/libmpeg2/motion_comp_mlib.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libmpeg2/motion_comp_mlib.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* motion_comp_mlib.c
- * Copyright (C) 2000-2002 Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000-2002 Håkan Hjort <d95...@dt...>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
* See http://libmpeg2.sourceforge.net/ for updates.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libmpeg2new/libmpeg2/idct_mlib.c
--- a/src/libmpeg2new/libmpeg2/idct_mlib.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libmpeg2new/libmpeg2/idct_mlib.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* idct_mlib.c
- * Copyright (C) 1999-2003 Hn Hjort <d95...@dt...>
+ * Copyright (C) 1999-2003 Håkan Hjort <d95...@dt...>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
* See http://libmpeg2.sourceforge.net/ for updates.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libmpeg2new/libmpeg2/motion_comp_mlib.c
--- a/src/libmpeg2new/libmpeg2/motion_comp_mlib.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libmpeg2new/libmpeg2/motion_comp_mlib.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* motion_comp_mlib.c
- * Copyright (C) 2000-2003 Hn Hjort <d95...@dt...>
+ * Copyright (C) 2000-2003 Håkan Hjort <d95...@dt...>
*
* This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
* See http://libmpeg2.sourceforge.net/ for updates.
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libspucc/cc_decoder.c
--- a/src/libspucc/cc_decoder.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libspucc/cc_decoder.c Wed May 09 02:13:21 2007 +0200
@@ -223,10 +223,14 @@ static const uint8_t *const cc_alpha_pal
/* 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) */
}
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/libw32dll/wine/pe_image.c
--- a/src/libw32dll/wine/pe_image.c Thu May 17 01:17:22 2007 +0100
+++ b/src/libw32dll/wine/pe_image.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
* Copyright 1994 Eric Youndale & Erik Bos
- * Copyright 1995 Martin von L
+ * Copyright 1995 Martin von Löwis
* Copyright 1996-98 Marcus Meissner
*
* based on Eric Youndale's pe-test and:
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/goom/goom_core.c
--- a/src/post/goom/goom_core.c Thu May 17 01:17:22 2007 +0100
+++ b/src/post/goom/goom_core.c Wed May 09 02:13:21 2007 +0200
@@ -151,7 +151,7 @@ guint32 *goom_update (PluginInfo *goomIn
guint32 pointWidth;
guint32 pointHeight;
int i;
- float largfactor; /* elargissement de l'intervalle d'lution des points */
+ float largfactor; /* elargissement de l'intervalle d'évolution des points */
Pixel *tmp;
ZoomFilterData *pzfd;
@@ -215,7 +215,7 @@ guint32 *goom_update (PluginInfo *goomIn
}
}
- /* par dut pas de changement de zoom */
+ /* par défaut pas de changement de zoom */
pzfd = NULL;
/*
@@ -532,7 +532,7 @@ guint32 *goom_update (PluginInfo *goomIn
}
/*
- * arreter de decrnter 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/goom/goom_filters.h
--- a/src/post/goom/goom_filters.h Thu May 17 01:17:22 2007 +0100
+++ b/src/post/goom/goom_filters.h Wed May 09 02:13:21 2007 +0200
@@ -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 ppliquer (cf les #define) */
+ char mode; /* type d'effet à appliquer (cf les #define) */
/** @since June 2001 */
int hPlaneEffect; /* deviation horitontale */
int vPlaneEffect; /* deviation verticale */
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/goom/mmx.c
--- a/src/post/goom/mmx.c Thu May 17 01:17:22 2007 +0100
+++ b/src/post/goom/mmx.c Wed May 09 02:13:21 2007 +0200
@@ -109,7 +109,7 @@ void zoom_filter_mmx (int prevX, int pre
"pmullw %%mm4, %%mm1 \n\t"
"pmullw %%mm5, %%mm2 \n\t"
- /* ajout des valeurs obtenues a valeur finale */
+ /* ajout des valeurs obtenues à la valeur finale */
"paddw %%mm1, %%mm0 \n\t"
"paddw %%mm2, %%mm0 \n\t"
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/goom/sound_tester.c
--- a/src/post/goom/sound_tester.c Thu May 17 01:17:22 2007 +0100
+++ b/src/post/goom/sound_tester.c Wed May 09 02:13:21 2007 +0200
@@ -90,7 +90,7 @@ void evaluate_sound(gint16 data[2][512],
if (info->goom_limit>1)
info->goom_limit=1;
- /* toute les 2 secondes : vfier 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/goom/xmmx.c
--- a/src/post/goom/xmmx.c Thu May 17 01:17:22 2007 +0100
+++ b/src/post/goom/xmmx.c Wed May 09 02:13:21 2007 +0200
@@ -234,7 +234,7 @@ void zoom_filter_xmmx (int prevX, int pr
pmullw_r2r (mm4, mm1);
pmullw_r2r (mm5, mm2);
- /* ajout des valeurs obtenues a valeur finale */
+ /* ajout des valeurs obtenues à la valeur finale */
paddw_r2r (mm1, mm0);
paddw_r2r (mm2, mm0);
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/post/planar/Makefile.am
--- a/src/post/planar/Makefile.am Thu May 17 01:17:22 2007 +0100
+++ b/src/post/planar/Makefile.am Wed May 09 02:13:21 2007 +0200
@@ -10,9 +10,9 @@ postproc_lib = $(top_builddir)/contrib/f
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
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/libdha/kernelhelper/dhahelper.c
--- a/src/video_out/libdha/kernelhelper/dhahelper.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/libdha/kernelhelper/dhahelper.c Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
(C) 2002 Alex Beregszaszi <al...@na...>
(C) 2002-2003 Nick Kurshev <nic...@ma...>
- (C) 2002-2004 M Rullg <mr...@us...>
+ (C) 2002-2004 Måns Rullgård <mr...@us...>
Accessing hardware from userspace as USER (no root needed!)
@@ -109,7 +109,7 @@
#define irqreturn(n) return
#endif
-MODULE_AUTHOR("Alex Beregszaszi <al...@na...>, Nick Kurshev <nic...@ma...>, M Rullg <mr...@us...>");
+MODULE_AUTHOR("Alex Beregszaszi <al...@na...>, Nick Kurshev <nic...@ma...>, Måns Rullgård <mr...@us...>");
MODULE_DESCRIPTION("Provides userspace access to hardware");
#ifdef MODULE_LICENSE
MODULE_LICENSE("GPL");
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/libdha/libdha.c
--- a/src/video_out/libdha/libdha.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/libdha/libdha.c Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
Copyrights:
1996/10/27 - Robin Cutshaw (ro...@xf...)
XFree86 3.3.3 implementation
- 1999 - vind Aabling.
+ 1999 - Øyvind Aabling.
Modified for GATOS/win/gfxdump.
2002 - library implementation by Nick Kurshev
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/libdha/libdha.h
--- a/src/video_out/libdha/libdha.h Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/libdha/libdha.h Wed May 09 02:13:21 2007 +0200
@@ -3,7 +3,7 @@
Copyrights:
1996/10/27 - Robin Cutshaw (ro...@xf...)
XFree86 3.3.3 implementation
- 1999 - vind Aabling.
+ 1999 - Øyvind Aabling.
Modified for GATOS/win/gfxdump.
2002 - library implementation by Nick Kurshev
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/libdha/pci.c
--- a/src/video_out/libdha/pci.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/libdha/pci.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
(C) 2002 - library implementation by Nick Kyrshev
- XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by vind 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/libdha/ports.c
--- a/src/video_out/libdha/ports.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/libdha/ports.c Wed May 09 02:13:21 2007 +0200
@@ -1,6 +1,6 @@
/*
(C) 2002 - library implementation by Nick Kyrshev
- XFree86 3.3.3 scanpci.c, modified for GATOS/win/gfxdump by vind 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 -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/video_out_xv.c
--- a/src/video_out/video_out_xv.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/video_out_xv.c Wed May 09 02:13:21 2007 +0200
@@ -56,6 +56,7 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/Xvlib.h>
+#include <time.h>
#define LOG_MODULE "video_out_xv"
#define LOG_VERBOSE
@@ -262,7 +263,9 @@ static XvImage *create_ximage (xv_driver
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
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);
@@ -296,6 +300,22 @@ static XvImage *create_ximage (xv_driver
_("%s: => not using MIT Shared Memory extension.\n"), LOG_MODULE);
this->use_shm = 0;
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);
@@ -754,6 +774,16 @@ static int xv_redraw_needed (vo_driver_t
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;
@@ -797,9 +827,14 @@ static void xv_display_frame (vo_driver_
* 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,
@@ -818,8 +853,19 @@ static void xv_display_frame (vo_driver_
}
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 (LOG_MODULE ": xv_display_frame... done\n");
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/vidix/drivers/cyberblade_vid.c
--- a/src/video_out/vidix/drivers/cyberblade_vid.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/vidix/drivers/cyberblade_vid.c Wed May 09 02:13:21 2007 +0200
@@ -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 Rullg
+ Based on Permedia 3 driver by Måns Rullgård
Thanks to Gilles Frattini for bugfixes
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/vidix/drivers/pm2_vid.c
--- a/src/video_out/vidix/drivers/pm2_vid.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/vidix/drivers/pm2_vid.c Wed May 09 02:13:21 2007 +0200
@@ -1,7 +1,7 @@
/**
Driver for 3DLabs Permedia 2.
- Copyright (C) 2002 M Rullg
+ 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 @@ static vidix_capability_t pm2_cap =
static vidix_capability_t pm2_cap =
{
"3DLabs Permedia2 driver",
- "M Rullg <mr...@us...>",
+ "Måns Rullgård <mr...@us...>",
TYPE_OUTPUT,
{ 0, 0, 0, 0 },
2048,
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/vidix/drivers/pm3_vid.c
--- a/src/video_out/vidix/drivers/pm3_vid.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/vidix/drivers/pm3_vid.c Wed May 09 02:13:21 2007 +0200
@@ -1,7 +1,7 @@
/**
Driver for 3DLabs GLINT R3 and Permedia3 chips.
- Copyright (C) 2002, 2003 M Rullg
+ 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 vidix_capability_t pm3_cap =
static vidix_capability_t pm3_cap =
{
"3DLabs GLINT R3/Permedia3 driver",
- "M Rullg <mr...@us...>",
+ "Måns Rullgård <mr...@us...>",
TYPE_OUTPUT,
{ 0, 0, 0, 0 },
2048,
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/xvmc_vld.c
--- a/src/video_out/xvmc_vld.c Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/xvmc_vld.c Wed May 09 02:13:21 2007 +0200
@@ -22,7 +22,7 @@
*
* xvmc_vld.c, X11 decoding accelerated video extension interface for xine
*
- * Author: Thomas Hellstr(2004)
+ * Author: Thomas Hellström, (2004)
*/
#include "xxmc.h"
diff -r cc990a4dcd27f1530fb429e559a99a55fef5cc1b -r 53e05173507701f049c58fdadc6714de2970fd31 src/video_out/xxmc.h
--- a/src/video_out/xxmc.h Thu May 17 01:17:22 2007 +0100
+++ b/src/video_out/xxmc.h Wed May 09 02:13:21 2007 +0200
@@ -31,7 +31,7 @@
*
* overlay support by James Courtier-Dutton <Ja...@su...> - July 2001
* X11 unscaled overlay support by Miguel Freitas - Nov 2003
- * XxMC implementation by Thomas Hellstr August 2004
+ * XxMC implementation by Thomas Hellström - August 2004
*/
#ifndef _XXMC_H
|