diff options
| -rw-r--r-- | src/demuxers/demux_asf.c | 16 | ||||
| -rw-r--r-- | src/demuxers/demux_eawve.c | 12 |
2 files changed, 19 insertions, 9 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 9b09ceb51..e26873d38 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.74 2002/11/01 17:41:04 mroi Exp $ + * $Id: demux_asf.c,v 1.75 2002/11/03 20:39:28 guenter Exp $ * * demultiplexer for asf streams * @@ -40,9 +40,9 @@ #include "demux.h" #include "xineutils.h" -/* + #define LOG -*/ + #define PACKET_SIZE 3200 #define PACKET_HEADER_SIZE 12 @@ -396,6 +396,12 @@ static int asf_read_header (demux_asf_t *this) { get_guid(this, &g); if (memcmp(&g, &asf_header, sizeof(GUID))) { printf ("demux_asf: file doesn't start with an asf header\n"); +#ifdef LOG + printf ("demux_asf: GUID: 0x%x, 0x%x, 0x%x, " + "{ 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx, 0x%hx }\n", + g.v1, g.v2, g.v3, + g.v4[0], g.v4[1], g.v4[2], g.v4[3], g.v4[4], g.v4[5], g.v4[6], g.v4[7]); +#endif return 0; } get_le64(this); @@ -1314,6 +1320,10 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, if (input->read (input, buf, 8192) != 8192) return NULL; +#ifdef LOG + printf ("demux_asf: PREVIEW data unavailable, but seek+read worked.\n"); +#endif + } else return NULL; } diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 0e2d308df..6156955fd 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_eawve.c,v 1.2 2002/11/03 01:11:14 komadori Exp $ + * $Id: demux_eawve.c,v 1.3 2002/11/03 20:39:28 guenter Exp $ * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * @@ -137,13 +137,13 @@ static int process_header(demux_eawve_t *this) int inHeader; uint32_t blockid, size; - if (this->input->get_current_pos(this->input) != 0) { - if ((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) == 0) { - return 0; - } - this->input->seek(this->input, 0, SEEK_SET); + if ((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) == 0) { + /* FIXME: use preview data in that case */ + return 0; } + this->input->seek(this->input, 0, SEEK_SET); + if (this->input->read(this->input, (void*)&blockid, 4) != 4) { return 0; } |