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/input') 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/input') 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/input/input_dvb.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/input') 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; -- 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/input/input_plugin.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/input') 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 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/input') 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 +- 24 files changed, 29 insertions(+), 29 deletions(-) (limited to 'src/input') 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 -- cgit v1.2.3