2c8e65329f
Demuxer-independent functions for selecting tracks based on language.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26118 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:43 +00:00
579e353b0f
Remove stupid checks of free() argument.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26117 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:41 +00:00
85a8aa6f8e
Add language info to sh_sub_t and sh_audio_t.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26114 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-29 17:25:33 +00:00
e063c10ea9
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26103 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-25 22:29:45 +00:00
8f0095af65
New member in demuxer_t: reference_clock.
...
If it's != MP_NOPTS_VALUE ds_fill_buffer() will keep
on demuxing until the pts of the next_pts is <= reference_clock.
It guarantees the compliance with the buffering model indicated
by the transmitter of the multiplex and a long-time stability
of playback (at least for me).
In any case up to a maximum of 64 packets are accumulated to prevent
memory hogging and leaks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26069 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-23 10:31:44 +00:00
df6f7b80c6
Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
...
I did not see anything obvious that would break, it if it does it should be
fixed properly once and for all.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25988 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-12 10:48:42 +00:00
40dca58f37
Allow demuxers to choose a default value for correct_pts
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25951 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-03 12:14:29 +00:00
5960ddb8e5
Use defines to give names to the different seek flags.
...
A better solution should be considered later, esp. for the many
broken demuxers that do not treat these flags correctly.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 15:11:38 +00:00
4134a853e4
Make mov subtitles work with -ass
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25909 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-29 14:30:53 +00:00
f3216dba06
clarify comments/docs about lav* being the preferred place to implement new
...
codecs and (de)muxers, except for wrappers around external libraries and
codecs and (de)muxers requiring binary support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25908 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 22:09:21 +00:00
572d74b206
copy note on new demuxers and codecs to the top of the array as well to be
...
extra clear
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25904 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 16:03:22 +00:00
1203499e51
note on new demuxers and codecs, add them to lav* instead of libmp*
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25900 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-28 12:11:41 +00:00
35ef167321
Make all demuxer_desc_t const, thus moving them to .rodata
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 16:00:39 +00:00
df7c312313
First step towards making all demuxer_desc_t const
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25734 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 15:47:24 +00:00
f1df834442
Remove a useless assignment (there is an if just a few lines above
...
that ensures those two are already equal).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25733 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 15:41:21 +00:00
b58f5adbfd
Add a forgotten #ifdef USE_ASS around ass_free_track
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25730 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-13 13:37:19 +00:00
c0e1f353e0
Add demuxer interface for attachments.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25685 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 01:12:36 +00:00
0d36212f39
Remove global_ass_track. Instead create an ass_track for each 't' track.
...
Global_ass_track obviously can not work when there is more than one 't tracks,
their lines will be mixed up.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25684 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:20 +00:00
d9d27bb8c4
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25682 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:15 +00:00
18e9531401
Add extradata to sh_sub_t.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25680 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-11 21:45:10 +00:00
0039652a08
Deallocate audio track codecdata.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25642 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-07 14:13:50 +00:00
a913d90614
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25603 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-05 14:28:57 +00:00
77e2ce680b
Move ds->current=NULL; further up to the free_demux_packet.
...
This does not change behaviour in the normal case but avoids
a double-free if the function is aborted via a signal handler.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25472 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-20 11:21:02 +00:00
e34efdf167
Add demuxer functions for chapter feature.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25386 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-13 12:51:05 +00:00
24dafeee09
Fix memory leak that tmp allocated but maybe not used.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25342 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-10 14:43:09 +00:00
a1fe08b750
Make libnemesi use specific struct and DEMUXER_TYPE
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25294 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-04 13:05:25 +00:00
a47c3bec6d
Fix typos in comments to stop them hurting my eyes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25225 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-12-01 13:35:25 +00:00
1f5bb6386e
demuxer.c: Remove useless code
...
Remove "while(1) { }" around two instances of code that always do
"return" in the loop body. No functionality changes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24854 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-25 19:21:24 +00:00
1c5d870414
Fix missing subtitles after seeking back
...
Subtitle packets that had been demuxed but whose start time had not
yet been reached were left in the demuxer stream after seeking.
When using the default (non-libass) subtitle rendering this could
block subtitles from appearing as long as the playback position stayed
below the original one before seek. External subtitle files were not
affected.
Fixed by making seek code free all packets from the subtitle stream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24698 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-10-04 02:35:34 +00:00
0ff4b3fd9f
libnemesi support, yet another rtsp/rtp library...
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24584 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-09-19 21:38:22 +00:00
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
185bc3320f
When a new subtitle stream becomes available check if it is the one that
...
was requested by the user and set up sub->id and sub->sh accordingly.
Fixes -slang and -sid with DVD subtitles (basically only 'j' during playback
could make them show). This was broken by r23786.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24042 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-08-09 10:26:00 +00:00
5bd192c77d
Make sure fformat is set before use
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23885 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 20:25:43 +00:00
958fc672cb
Remove some unneeded extern variable declarations
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23884 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-27 20:22:55 +00:00
f36073916f
make opt argument of demux_info_get const.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23631 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-24 10:20:42 +00:00
74047be59a
Fix memleak due to not freeing demuxer->s_streams
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23612 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-23 17:39:27 +00:00
276394a205
More accurate seeking for demuxers lacking DEMUXER_CTRL_GET_TIME_LENGTH control
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23572 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-17 13:28:52 +00:00
6a09e8e2ed
Replace implicit use of fast_memcpy via macro by explicit use to allow
...
for future optimization.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-06-05 14:27:54 +00:00
05c7a055e8
Simplify preprocessor directives: There is a general variable for
...
static/shared FFmpeg libraries now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-26 15:10:07 +00:00
b5aa994f1c
Cosmetics: remove duplicate space in ifdef
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23090 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:59:14 +00:00
effc6dcf23
demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23087 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-22 20:32:15 +00:00
ef91f5aad8
Add lavf_preferred demuxer for lavf formats we want to be probed
...
before our native demuxers and remove some now unneeded file-extension
hacks.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22989 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-14 10:03:42 +00:00
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
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
45defa1aa0
Fix a few gcc warnings, approved by Diego and Reimar.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-02-05 23:46:08 +00:00
9e1add871e
Make ds_get_next_pts return MP_NOPTS_VALUE instead of -1 on error,
...
-1 could be a perfectly valid pts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21827 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-01-05 15:24:38 +00:00
55303b223e
removed unused variable
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21803 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 17:24:14 +00:00
8558d03eb9
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21798 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:09:53 +00:00
b5898c2aa6
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21796 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-31 11:05:26 +00:00
016b1cb9e5
don't compile demux_mpc.c when libmpcdec is disabled
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21783 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-12-28 23:44:38 +00:00
96e829fc9c
added code to switch video stream
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20964 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:23:06 +00:00
c5fa0bbf92
Make subtitle stream handling more similar to audio and video streams.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20888 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-13 16:15:23 +00:00
6e28f63e36
consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-12 17:19:56 +00:00
c42fa438f4
removed duplicated check in demuxer_seek_chapter
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20857 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 13:57:09 +00:00
5c361eff9d
in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20855 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-11 11:53:32 +00:00
6200940dcb
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20765 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:55:49 +00:00
0fa1a3e4c6
now demux_seek() tries to seek aided by the stream layer, if possible
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20764 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:54:28 +00:00
2b13b3a6c8
Cosmetics: indentation fix indentation broken by last two demuxer.c commits
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20325 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:36:59 +00:00
d42038edb9
Fix opening of demuxers without check_file function, broken by r20309.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20324 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-20 19:31:52 +00:00
d4d22f49e9
Try other demuxers if open() fails.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20309 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-19 18:20:12 +00:00
fa92a6aad5
Simplify: replace malloc + memset 0 by calloc
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20078 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-05 21:31:21 +00:00
2f07a40d8d
conditional declerations are unnecessary
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19868 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 10:22:23 +00:00
1b8971d82e
Add demux_nut to MPlayer repo
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-09-17 09:32:28 +00:00
ccf75d6711
Get rid of demux_aid_vid_mismatch mess.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19546 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-26 19:17:04 +00:00
b38ff54517
100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19485 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:52:11 +00:00
b7b319395e
demuxer_seek_chapter() returns informations about chapters count and name
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19484 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-21 19:19:00 +00:00
1870190d37
clarification in a comment
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19445 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 19:03:59 +00:00
e8870c3db7
support relative seeking in the stream-driven case
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19444 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 19:03:31 +00:00
01602c31b3
added first revision of demuxer_seek_chapter()
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19441 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-18 16:48:22 +00:00
85d85da0f2
Update information and print new value when demux_info_add is called
...
twice for the same tag.
Should show currently playing title with Ogg streams.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19419 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-16 23:32:39 +00:00
1de0c3327d
Add matroska chapter seeking capability.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19348 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-08-06 18:55:34 +00:00
1a16cbfec3
marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-13 05:03:43 +00:00
e2727ec797
Add a new video pts tracking mode, enabled by option -correct-pts.
...
This mode has the following differences:
- Video timing is correct for streams with B frames, at least with some
demuxers.
- Video filters can modify frame timestamps and insert new frames, and
removing frames is handled better than before.
- Some things are known to break, it's not usable as the default yet.
Things should work as before when the -correct-pts option is not used.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-06 06:58:17 +00:00
58237ff084
move some ill-behaving demuxers further down the list
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18905 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-04 21:26:41 +00:00
7022f65d0c
Change free_sh_audio() to take demuxer and stream id as parameters
...
(same as new_sh_audio()) instead of sh_audio_t *, use those to remove
the pointer from demuxer->a_streams[] before freeing it.
Some demuxers use free_sh_audio() to undo the creation of an
already-allocated audio stream in case of error. These uses were unsafe
since free_sh_audio() freed the data structure but left the pointer in
demuxer->a_streams[], leading to double free later in free_demuxer()
(and perhaps use of the freed stream before that, I didn't check).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18711 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-14 14:05:59 +00:00
bc30e8e673
Unconditionally compile the Matroska demuxer.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-05-08 21:41:15 +00:00
c843190441
Change common pts variables from floats to doubles. Individual demuxers
...
should be changed later.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18310 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-27 11:13:21 +00:00
6c4d9bfe51
4 - Implement a better way to calculate current audio pts and use it for
...
audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad.
Patch by Uoti Urpala
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 10:58:40 +00:00
3a406e94d7
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-24 07:20:34 +00:00
1cfdfe73be
fixes decoding demoscene.tv nsv at http://213.186.36.129:8000
...
Fix suggested by Reimar, patch by RC.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18129 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-04-17 13:47:57 +00:00
eebf08b978
Convert all if(verbose>X) to mp_msg_test calls.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17933 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-03-24 08:12:03 +00:00
1ab575101a
Second-try commit of this patch.
...
1. Include audio_delay as an argument to demux_seek.
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
I've quadruple checked this time; hopefully I haven't missed anything.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-17 01:57:41 +00:00
3f6e7ce5f5
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 19:39:51 +00:00
15debd85d2
1. Include audio_delay as an argument to demux_seek.
...
2. Modify demux_seek_avi to adjust the audio/video stream positions so
that mplayer/mencoder will instantly be in sync even when -delay is
specified.
Other demuxers could be modified similarly in the future.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-07 20:22:44 +00:00
ab417b391a
function to read from a demuxer up to (and including) the specified
...
3-byte pattern.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17418 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-17 20:04:49 +00:00
2601de4120
massive attack: mp_msg printf format fixes
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17367 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-12 20:04:36 +00:00
ad978de549
added support for external libavformat
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17355 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-01-09 19:35:44 +00:00
f44b5a9e96
include fastmemcpy.h before stream.h, so it is used for the stream_read
...
function, too. Gives a small speedup for e.g. high bandwidth MPEG2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17201 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-12-17 10:46:48 +00:00
36e1974be0
Unify include path handling, -I.. is in CFLAGS.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17013 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-18 14:39:25 +00:00
fb99b3a5c4
estimate total time also for audio-only files.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16926 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-11-06 14:14:53 +00:00
2912984517
move resync_audio_stream after seeking to demuxer.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16878 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-10-30 09:19:05 +00:00
b383ffa4b7
"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16573 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-23 22:35:04 +00:00
c437f82e72
Prints -identify output for:
...
- video codec of the current file;
- signal numbers;
- demuxer help header.
Patch by kiriuja <mplayer DATH patches AH en DATH directo POIS net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16523 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-19 16:33:39 +00:00
7b14f06edb
Make the fourcc output endianness-independent.
...
patch by Luca Barbato < lu_zero -- at -- gentoo -- at -- org >
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16478 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-13 18:13:58 +00:00
a6c5758715
execute the check function even when a demuxer is forced, to avoid crashes.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16414 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-06 19:50:21 +00:00
aacbf3f8c4
Forgotten mpc demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16413 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-06 19:46:48 +00:00
d620029e4b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
...
accuracey may be totally fake for some demuxers (mpg), but accurate for
others.. (avi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16347 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-09-02 08:32:32 +00:00
e1d1e3bc74
Fix move playlists (control must be returned to mplayer.c, with the demuxer
...
returning the real URL as a packet).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16327 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-31 13:04:22 +00:00
0446e090b1
Allow forcing of demuxers and codecs by prepending '+'
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 23:56:24 +00:00
655334804b
support MPEG in GXF container with extension-based detection.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16311 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-26 17:40:02 +00:00
dead4d1193
Do not free demuxer before using demuxer->desc->type (happened when using -audiofile).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16292 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-23 08:03:26 +00:00
d59f67f879
fix brokeness caused by demuxer patch, this code is useless for
...
any case other than avi and should not be run even then.
patch by Uoti Urpala (urpala BANG cc MEEP helsinki MEEP fi)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16199 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-11 17:01:13 +00:00
cd68e1618b
Demuxer modularization
...
Demuxer selection by name with -demuxer command (bakward compatible)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-05 19:57:47 +00:00
84ec577508
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16153 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-31 00:26:07 +00:00
c54b5a06bd
musepack demuxing and decoding support (demuxing is v7 bitstream only).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15959 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-10 17:14:12 +00:00
38d2e2afc8
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15939 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-07 17:35:05 +00:00
9dd8f241ac
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 23:07:35 +00:00
a3e5eab301
fix memleak when playing mov files
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15781 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-20 14:16:59 +00:00
12a755b63b
added AAC ADTS demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15721 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-13 20:40:29 +00:00
2b1fef3a98
moved mpeg-ps/es probing code to demux_mpg.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15671 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-06-06 21:30:53 +00:00
fdd23f29ba
setting sh_audio to NULL is nonsense, since it is only a local variable,
...
use d_audio->sh instead.
Fixes crash for incoming/VTS_01_1_orig.VOB, though it still doesn't select
the other audio stream automatically.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15577 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-05-27 12:38:29 +00:00
a69f29069b
revert one line of version 1.182 patch (caused use of already-freed
...
memory and multiple double-free errors). i am fairly confident that
all the relevant memory is now freed once and exactly once, but it's
better than corrupting the heap in any case.
100l to reimar :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15298 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-29 21:57:05 +00:00
be54f4813f
adds a parameter to the switch_audio command to directly select a track.
...
Patch by kiriuja mplayer-patches at en-directo net
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15286 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-28 14:43:19 +00:00
9e909f0dde
Added support of audio stream switching in the MPEG demuxer using the #-key
...
Patch by Michael Behrisch < behrisch $ informatik * hu-berlin * de >
commited with the kind blessing of D. Richard Felker III
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15047 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-04-03 14:08:28 +00:00
0c7b6fc212
Rather simple patch for RAWDV demuxer which lets it say whats the total
...
movie length.
Patch by Oded Shimon
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14935 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-03-09 20:29:50 +00:00
9ba19353ed
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14694 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-13 13:39:19 +00:00
02f5ebf1d5
Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14667 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-02-06 10:30:10 +00:00
d147077c21
Move generic length and percent pos calculation to demuxer.c
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14503 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-01-15 16:11:45 +00:00
939e46626e
TwinVQ decoder and demuxer
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14277 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-29 19:51:56 +00:00
507121f7fe
removing AFMT_ dependancy
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-27 17:30:15 +00:00
3426117ee8
Use demuxer_get_percent_pos for the OSD position bar
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14198 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-21 12:25:59 +00:00
22d8dd7d32
disable demuxer_bmp,
...
that works with signle image in single file.
removing is part of vu1nerabi1ity fix.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14161 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-12-15 18:39:51 +00:00
50a86fcc34
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14047 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-25 22:24:00 +00:00
939cfe1341
merged DEMUXER_TYPE_MPEG4_ES in the ordinary TS; added support for H264 in TS
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14035 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-24 18:55:03 +00:00
3ebf6f0135
Reduce excessive verbosity.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13947 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-11-15 09:09:29 +00:00
6943b13bb5
seeking based on the largest timestamp in an mpeg stream
...
It is often more accurate than the current seeking and it has the
additional benefit of giving the (almost) precise total time of the movie.
patch by Michael Behrisch < behrisch at informatik.hu-berlin.de >
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13739 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-23 00:05:38 +00:00
e532c80b02
Remove redundant ASF status line, there is another for all formats.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13687 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-19 01:21:54 +00:00
a594e93e86
Fix segfault for unexistant/unreachable rtsp streams
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13674 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-18 18:51:35 +00:00
e55f4b7153
Support ON2 variation of AVI format (.vp5 files)
...
Also closes bug #104
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13589 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-08 21:28:19 +00:00
ac7f335995
fixed small memleak
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13521 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-01 19:51:03 +00:00
5da7e8895a
missing extern
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13451 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-23 23:01:48 +00:00
6068c1846e
moved sh_audio initialization from dec_audio to demuxer.c to fix
...
-hr-mp3-seek bug (pts was -inf after seeking) and remove the workaround
from demux_audio.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13358 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-16 19:51:13 +00:00
c3a928cbe6
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13302 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-09-10 02:07:16 +00:00
9c48cc012a
DTS support via lavc and libdts
...
Patch by Aurelien Jacobs ( aurel at gnuage dot org )
dts in wav by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13007 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-08-12 12:36:08 +00:00
9b0d8c680f
cache min fill adjustment, based on patch by Jeremy Huddleston
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12836 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-07-16 20:31:17 +00:00
7ca187a068
Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12435 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-05-07 08:31:39 +00:00
e3daf3ca75
Respect -playlist for asx streams
...
Patch by adland
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-17 16:46:41 +00:00
087c4e5801
nsv (Nullsoft streaming video) demuxer
...
Patch by Reza Jelveh <reza (dot) jelveh (at) tu-harburg (dot) de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12176 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-12 14:19:12 +00:00
8580ca5c5f
demux_lavf
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12165 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-11 14:26:04 +00:00
0949f9a230
Added support for multiplexed (audio+video) RTP streams.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11986 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-02-22 06:20:48 +00:00
f861d2a4b3
LML-M4 mpeg4 capture card raw stream format support
...
original code by Maxim Yevtyushkin <max@linuxmedialabs.com>
partially rewritten, "mplayerized" by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11591 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 19:33:38 +00:00
36aee71950
Fixes for a couple of warnings.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11577 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:51:10 +00:00
a1f615e34d
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11576 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-12-08 09:47:15 +00:00
fb744fcef8
missing extern
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11467 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-15 22:27:02 +00:00
72f330c8a0
seek in realmedia files
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11442 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-11-12 10:27:16 +00:00
175884718b
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10892 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-20 12:50:25 +00:00
57e119d8be
get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10883 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-09-19 19:40:46 +00:00
38f4f0b4cf
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
...
patch by Nico <nsabbi@libero.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10688 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-24 18:08:54 +00:00
d32a75c7c3
10l - some forgotten ifdefs
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10539 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-08-07 12:40:15 +00:00
150b1bc680
inconsistency
...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10443 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-19 17:39:47 +00:00
eugeni
nicodvb
reimar
ivo
ulion
lu_zero
uau
diego
zuxy
rathann
aurel
ods15
reynaldo
rtognimp
gpoirier
corey
rsf
iive
ranma
rfelker
faust3
alex
mosu
michael
arpi
luran
lumag
henry