Commit Graph

71 Commits

Author SHA1 Message Date
reimar a2c2268cdf Work around a dvdread bug where DVDReadBlocks would return values < 0 on read error,
causing hangs e.g. when seeking to the very last chapter (which would read beyond the
size of the DVD).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28216 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-31 14:21:50 +00:00
diego 6f6bf7f765 Replace typeof by __typeof__, the former is a non-portable GNU extension.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27807 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-20 09:55:38 +00:00
diego 261e389fdd With -identify, ID_DVD_VOLUME_ID is not shown on some systems.
Using DVDISOVolumeInfo instead of DVDUDFVolumeInfo fixes this.
patch by Mathieu SCHROETER, mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27631 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-16 21:30:04 +00:00
reimar fd75ca0c6a Print DVD volume ID with -identify.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27497 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-30 11:21:11 +00:00
nicodvb b16d3fd6c2 in dvd streams the title part ranges from 1 to 99
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27267 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-12 08:07:54 +00:00
nicodvb efb1379f72 avoid unnecessary strdup(); patch by Aurel
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27226 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-06 18:04:14 +00:00
nicodvb a4b4b991dc cosmetics: in ifo_stream_oped() aligned the prototype to the style
of the rest of the file and renamed dvd_priv to spriv
(it's a stream_priv_s*, while dvd_priv is used for other
purposes in the rest of the file)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27198 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:03:57 +00:00
nicodvb 8742c266db in ifo_stream_open() propagate the device based on the dirname of stream->url; patch by Mathieu SCHROETER mathieu.schroeter gamesover ch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27197 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 16:00:07 +00:00
nicodvb 7043b6d0d1 dvd_device must be handled exclusively by the option parser; it can't be changed at will in ifo_stream_open()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27196 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:57:33 +00:00
nicodvb 93b837f0a7 added support for the device part in the url; patch by
Mathieu SCHROETER mathieu.schroeter gamesover ch


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27195 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-04 15:54:45 +00:00
reimar 5560a0b358 Add basic support for stream controls with cache enabled.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26865 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-05-24 07:48:35 +00:00
nicodvb f785eba8a1 -chapter is now handled uniformly calling demuxer_seek_chapter() instead
of letting individual demuxers and stream readers do their nasty job


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25987 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-11 22:03:34 +00:00
reimar 6f616c316d stream_opts should be const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25719 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 12:34:42 +00:00
reimar 16f7105ffc Make dvd_audio_stream_types and dvd_audio_stream_channels const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25713 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 11:52:05 +00:00
nicodvb cf350b07f0 implemented _ANGLE STREAM_CTRLs, patch by oattila chello hu
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25601 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:22:05 +00:00
nicodvb 995e7b9e1c fixed bug when playing multi-angle titles: the address field in the agli data
of the current angle must be != 0x7fffffff to be skippable;
patch by oattila chello hu


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25597 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 10:48:17 +00:00
diego a6cf8a908c Replace SYS_DARWIN by __APPLE__ and __DARWIN__ where appropriate.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25370 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-11 23:52:55 +00:00
reimar dd2fcb4370 stream_opts arrays should be const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25270 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 21:37:08 +00:00
reimar c3fc57f402 Add appropriate const specifiers to some custom parse functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25260 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 16:40:20 +00:00
reimar cd3d3369e1 Mark all stream_info_t as const
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25239 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 13:22:53 +00:00
voroshil 6e6214052c When IFO file is opened (detected by extension), set dvd-device to IFO file's
directory and start dvd:// stream instead of file://.

If VTS_<N>_*.IFO is opened, open stream as dvd://<N>

As Nico Sabbi said:
There is no no guarantie that title N is in titleset N,
but there are at least good chances.

The main purpose of this patch is ability to load DVDs, stored on HDD,
using OSD menu.

Modified patch from Benjamin Zores ben at geexbox dot org


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25238 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-02 13:13:02 +00:00
ben 2438f463c3 this variable was nothing but a useless memleak
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25215 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-30 19:54:30 +00:00
nicodvb 298f569c21 pgc->subp_control and pgc->audio_control are no more bitfields,
but plain uint32_t and uint16_t respectively; replaced access
to bitfield members with bitmask operations (and removed some 
ugly macro)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25151 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-23 21:12:11 +00:00
reimar ee1dd235b3 Cleanup sg_io_hdr initialization a bit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25078 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:07:04 +00:00
reimar 9494622558 We do not have any use for the sense data, so we don't need a buffer for it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25077 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 19:02:30 +00:00
reimar e7b7e24cc9 Some more cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25075 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:52:42 +00:00
reimar 77d7b8c9e0 Move the zeroing directly before the other initialization code
for the array/struct


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25074 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:49:33 +00:00
reimar e40792bf0e Move everything that sets buffer values together.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25073 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:46:52 +00:00
reimar d9f35323fa Another place that can use AV_WB32
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25072 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:40:46 +00:00
reimar be0a2badf7 Some cosmetics in dvd_set_speed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25071 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:35:36 +00:00
reimar e0720debf8 Move the DVD speed factor -> KB/s conversion into the case
branch where it is actually used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25070 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:31:26 +00:00
reimar dff474a1ce Add a missing close() to dvd_set_speed function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25069 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:27:17 +00:00
reimar 17a2278031 Open device file only right before we need it, so we do not
have to add close to all the abort code-paths


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25068 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:26:25 +00:00
reimar ed3b33cf03 Do not print Ok message when setting speed limit failed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25067 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:23:46 +00:00
reimar f647aa04e6 AV_WB16(..., 1000) more obviously represents one second that assigning
0x03 and 0xe8 (0x3e8 = 1000).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25066 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:22:42 +00:00
reimar 9424a3431d Use AV_WB32 instead of manual bit-fiddling when setting DVD speed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25065 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:20:04 +00:00
reimar 509ee9591c GPCMD_SET_STREAMING command is 12 bytes large, not 16
Patch by Sebastian Kemper (sebastian_ml gmx net)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25064 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-17 18:17:19 +00:00
nicodvb adb4813ca8 report why the dvd couldn't be opened. Patch by Jan Knutar jknutar+nic+fi
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25059 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-16 21:32:09 +00:00
nicodvb 8d63528e95 at the end of open() warn users that seeking won't work correctly if the cache is enabled
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25014 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-11-10 20:45:28 +00:00
nicodvb d20ff3542d implemented STREAM_CTRL_GET_ASPECT_RATIO
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24318 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-01 15:51:41 +00:00
diego 01d92a32ad cosmetics: typo fix UNSUPORTED --> UNSUPPORTED
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24277 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-28 22:38:45 +00:00
nicodvb 0bfd6cb4f1 in stream_control() remove redefinition of d in a case block, previously assigned in the same function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24249 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 21:40:09 +00:00
nicodvb c803ba9baf in open_s() unified failure code in fail:
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24248 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-27 21:10:41 +00:00
diego 5c0d8ece5a Remove redundant variable declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24165 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-25 12:04:52 +00:00
reimar f12a0e61cc Set DVD speed earlier to avoid drive spinup during open
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24114 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-21 12:38:45 +00:00
cehoyos e5a6eae2cf Moved dvdtimetomsec to stream_dvd_common.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24013 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-04 21:59:26 +00:00
diego f1ead29ad9 The file is compiled conditional to USE_DVDREAD so the #ifdef USE_DVDREAD
in the file are senseless.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23711 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-03 08:24:01 +00:00
reimar 865605639c Fix dvd:// subtitle handling to always report the MPEG stream id, because
this is the only thing the remaining parts of MPlayer care about.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23621 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 08:14:10 +00:00
diego 5edd9af248 Remove some unused variables, patch by timwoj ieee org.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23399 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-28 08:42:35 +00:00
nicodvb 39e4226e59 fixed off-by-one bug during chapter-listing; fixed by Jared Breland (list-mplayer@legroom.net) and me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23386 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-05-26 20:27:45 +00:00