Commit Graph

2562 Commits

Author SHA1 Message Date
uau 8b59dd4d83 Matroska seeking fixes
If a relative seek forward went past the last index position the
Matroska demuxer did not seek to any index position. It did however set
the mkv_d->skip_to_timecode variable which meant that the next
fill_buffer() call would read from the current position until the target
position (probably the end of the file). Fix this by changing the code
to seek to the last index position if that is between the current and
target positions.

Also change backwards relative seek to accept an exactly matching index
position (<= vs <) and reorganize the seeking conditionals to allow
making the above change without turning the code into a complete mess.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22634 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-16 14:55:41 +00:00
diego a6eca2eef8 Use explicit path for headers from the loader/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22624 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 22:34:45 +00:00
diego e085bc8dcf Add explicit location for headers from the stream/ directory.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:36:36 +00:00
diego 8868c13dc7 Add live555 include flags to CXXFLAGS only.
patch by Carl Eugen Hoyos, cehoyos ag.or at


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22621 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 18:07:12 +00:00
reimar ec62af965e Check for eof in loop searching for data chunk.
Fixes bug #775.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22604 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-15 10:38:51 +00:00
diego 5519d98983 cosmetics: Fix indentation, reorder some lines for consistency.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22549 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 21:55:23 +00:00
diego 60b39e2786 Give more descriptive names to the source and library variables and split
between common, MPlayer-specific and MEncoder-specific parts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22546 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-13 12:10:57 +00:00
nicodvb 8eee548895 cosmetics: renamed variable amr as headersize, more meaningful; patch by Carl Eugen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22537 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 22:13:48 +00:00
diego 4a75f5849f Source files should not contain non-ASCII characters.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22525 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-12 15:52:34 +00:00
uau c60af33716 Move the sh_audio->delay field to mpctx->delay.
The value is related to overall a/v sync and is not used by audio
demuxers or decoders.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22506 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-11 06:16:14 +00:00
ods15 a8f031fbc0 remove some lines which should have never been in demux_nut.c, broke CPU
percentage meter for audio only files.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22502 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-09 15:40:03 +00:00
uau 0f35f8354e Fix audio samplerates below 7000 Hz.
Patch from John Koleszar, jkoleszar on2 com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22482 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-07 01:23:37 +00:00
nicodvb f1c7edfaa6 support for AMR; it works inserting in the first byte of the demux_packet
a 1-byte header that live555 seems to be stripping for some reason, although according
to the specs it should be there. Patch by Carl Eugen Hoyos.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22481 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-06 22:53:52 +00:00
nicodvb f6687e7a78 removed unused definition of insertRTPData(); it's not only unused,
but conceptually wrong as it passed extradata as first demux_packet
to the corresponding demux_stream. Patch by Carl Eugen Hoyos



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22472 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 22:23:30 +00:00
reimar dd866c4d11 Audio should now work fine, so remove the ENABLE_AUDIO ifdef
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22468 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 13:29:06 +00:00
reimar ea365aa53f Implement percent-based seeking
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22467 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 13:27:42 +00:00
reimar 1221718d50 Fix seeking for avisynth audio.
Based on patch by Alexander Ponyatikh (ranma at 274 ru).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22466 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 13:17:16 +00:00
reimar e18c2bd2d6 Fix DEMUXER_CTRL_GET_PERCENT_POS with -novideo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22465 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 12:56:41 +00:00
reimar 4cb645c043 remove pointless cast to int
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22464 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 12:53:43 +00:00
reimar 4b217802c4 Remove subcp_open/subcp_close from mkv demuxer, they are useless since a long time.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22463 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-05 12:02:57 +00:00
nicodvb b14bee2928 when seeking consider stream->start_pos instead of 0 as initial position; patch by Zuxy Meng approved by Michael
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22458 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 16:23:18 +00:00
reimar 10552969c3 Remove variable that is unnecessary after last patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22452 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 15:15:59 +00:00
reimar bd039d9cfe Remove hack that sets demuxer->video->pts after seeking, it seems no longer needed.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22451 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 15:13:38 +00:00
reimar 85671d7ee6 Set pts also for audio packets
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22450 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 15:02:53 +00:00
reimar 723fc2a290 Already frameno == num_frames means we reached EOF.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22449 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 14:59:23 +00:00
reimar 8849f44f77 Fix crash with avisynth audio-only files and take audio length into account when length is queried.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22448 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 14:53:26 +00:00
reimar 9a90222cc9 Support more avisynth audio sample types (untested)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22447 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 14:42:17 +00:00
reimar 7a2d48ad6f Remove useless void * casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22446 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 14:24:03 +00:00
reimar 76160e7e5c Do not read more audio samples than available
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22445 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 14:11:44 +00:00
reimar 0733dc5f01 Fix pakcet -> packet typo in output
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22444 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 13:56:45 +00:00
reimar 0ff9a193c1 Set format tag for float samples correctly (currently useless)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22443 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 13:49:55 +00:00
reimar 5c9ee0eb4d Move/simplify some variable declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22440 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 12:59:48 +00:00
reimar bf9ed9dc26 Demuxers have no business setting o_bps
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22439 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 12:55:45 +00:00
reimar e1783b6b91 First half-working avisynth audio support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22438 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 12:52:16 +00:00
reimar e1b26346cc Fix wrong setting of samplesize (must be bytes per sample, not bits)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22437 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 12:43:55 +00:00
reimar bdf99c924b ENABLE_AUDIO now selects only between -nosound and -aid 0 as default, can be overridden at runtime.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22436 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 11:31:43 +00:00
reimar 28aaefce90 Enable aid/vid stream selection, although it is quite useless currently.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22435 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 11:23:11 +00:00
reimar 30220b2a24 Fix type and usage of avs_get_audio function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22432 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-04 09:45:32 +00:00
compn 66d4061303 warn users about drm files, patch by zuxy meng
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22427 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-03 21:33:40 +00:00
reimar 3462da0b5c Replace MIN with FFMIN
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22396 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 12:54:38 +00:00
reimar 8e7945155c Use libavutil's av_clip* instead of unreadable MIN/MAX chaos.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22395 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-03-01 12:54:08 +00:00
nicodvb 6c36825079 test the continuity of timestamps for STREAMTYPE_VCD, too; patch by Zuxy Meng
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22381 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-28 23:47:05 +00:00
nicodvb 309dc7e6c6 implementation of DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS; patch by the usual Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22373 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 22:25:00 +00:00
nicodvb 4671533096 assign missing frametime as 1.0/fps; patch by Carl Eigen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22372 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 21:20:24 +00:00
nicodvb e4fbdd185e 1000l, removed code that messed with the internals of demux_packet_t (but there's still more); patch by C.E.Hoyos fixed by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22371 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 21:16:54 +00:00
nicodvb 5ad12e4fbb removed duplicated code in demux_seek(); stream_seek() already aligns to STREAM_BUFFER_SIZE boundary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22370 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 20:22:05 +00:00
nicodvb 09262ff552 100000l: average != semidistance, fixed seeking to the middle position; patch by Zuxy meng (zuxy.megn gmail com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22369 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-27 20:15:31 +00:00
nicodvb 3f7582cca2 copy the content of QDM2 atom as extradata for ffqdm2 playback; patch by Carl Eugen Hoyos
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22354 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-26 21:54:52 +00:00
nicodvb 921e985a12 2 less variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22351 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 23:01:13 +00:00
nicodvb 37b65c2eca cosmetics: reformatted
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22350 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-25 22:55:14 +00:00