1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-17 04:15:13 +00:00
Commit Graph

1074 Commits

Author SHA1 Message Date
nicodvb
a1fc33994e in mp_property_{video,audio} permit uniniting of the corresponding chain
by setting *arg to -2


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21084 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 23:16:15 +00:00
reimar
8e56fda7d4 Remove superfluous demuxer->type==DEMUXER_TYPE_MATROSKA check,
d_dvdsub->id >= 0 is enough in for this case, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21077 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 19:39:16 +00:00
uau
e4a54f7196 Fix printf format/argument count mismatch in mp_property_video
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21073 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 18:08:03 +00:00
uau
1b0c4bb4f0 Move subtitle updating to a separate function, fix inverted condition
which caused timing of DVD subtitles to be ignored so that they were
shown as soon as they were demuxed rather than in their timed position.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21071 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 17:55:38 +00:00
voroshil
f41cff8360 new slave command: radio_step_freq
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21058 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 16:15:05 +00:00
reimar
b38e1ca6e7 Generalize subtitle switching, demux_ogg does not need a special case
anymore and demux_mov works now, too.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21054 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 14:23:54 +00:00
reimar
8979378150 Make sure sh_video == NULL when reinit_video_chain fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21047 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 11:21:09 +00:00
reimar
c339cf1fe5 Do not just skip a file when vo init fails, instead try to play it
as audio-only first.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21046 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-19 10:52:23 +00:00
nicodvb
7b79fac19a switch_audio and switch_video properties should be in the range -2..MAX_x_STREAMS-1
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21036 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 18:23:38 +00:00
uau
4799a07cf1 When changing playback speed write the current speed to OSD only after
build_afilter_chain() which can alter the value.
(Though I'm not sure whether the current limits in build_afilter_chain
are necessary or correct.)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21028 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 15:50:31 +00:00
nicodvb
b96ae083af switch_program property to switch to/set a new program
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21023 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 14:33:04 +00:00
reimar
582d0b7cab more mp_property_deinterlace simplification, patch by
Carl Eugen Hoyos [cehoyos -at- rainbow studorg tuwien ac at]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21018 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:38:03 +00:00
nicodvb
c7256fa6f9 implemented M_PROPERTY_SET in mp_property_{audio,video}
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21016 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:34:06 +00:00
reimar
09be641ba5 reinit_video_chain might set sh_video = NULL, so check against that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21014 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 12:30:48 +00:00
uau
26eb093e5d Mark some functions static
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21002 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-18 07:38:58 +00:00
reimar
b9b610ed9a Support palette for general vobsub
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20994 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 20:11:52 +00:00
reimar
8846cfd6dc consistently use M_PROPERTY_ERROR/M_PROPERTY_OK as return values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20991 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 19:03:53 +00:00
reimar
e9c16c4b55 Minor mp_property_deinterlace simplification
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20990 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:18:28 +00:00
reimar
7b25afd742 Add deinterlace property, patch by Carl Eugen Hoyos
(cehoyos [at] rainbow studorg tuwien ac at) with small modifications
by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20989 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-17 18:16:21 +00:00
nicodvb
17fde01155 handle video stream switch using 'switch_video' property'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20965 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:25:35 +00:00
nicodvb
7ddcc3ef32 moved video codec/filters/outdevice initialization code to specific function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20963 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-16 21:22:07 +00:00
reimar
7a71da01d6 Introduce step_property command.
Patch by Carl Eugen Hoyos [cehoyos <at> ag or at] with modifications by me.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20931 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:52:21 +00:00
reimar
5dcb8b7d82 Fix Unkown -> Unknown typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20930 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 19:24:41 +00:00
uau
45200bc6df Use vf control for reading pts from vf_vo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20922 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 14:02:55 +00:00
reimar
de555bc284 Fix statement-before-declaration warnings.
Having a look at the gcc output before committing is a good idea btw.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20920 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 13:41:24 +00:00
uau
31482783c5 Remove write-only variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20919 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:39:49 +00:00
uau
a703241aa9 Update OSD contents only after the correct values for the frame are known.
The most visible inaccuracy caused by the previous update location was
that the OSD always showed position 0 after seeking with demux_mkv.
Split frame decoding and filtering because with -correct-pts the pts
value that should be displayed for the frame is only known after
decoding but is needed before filtering (during which the OSD is drawn).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 12:29:20 +00:00
uau
0830e05453 Move xscreensaver_heartbeat call next to vo check_events
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20916 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:52:49 +00:00
uau
173381f74d Replace sleep time calculation in main() with a separate function.
Fixes some problems with playback_speed!=1: sleep limits which were
supposed to be real time were calculated in scaled time, timing
inaccuracies in nosound mode affected next frame by 
err*(1-1/playback_speed), auto quality code used scaled time.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20915 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 09:29:03 +00:00
uau
d1628d12f5 simplify
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20914 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:56:17 +00:00
uau
c29775e901 Move -frames check out of frame flip code (like -endpos earlier)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20913 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:49:37 +00:00
uau
7181a091f8 Remove some unused code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20912 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:44:16 +00:00
uau
031e9068cc Move endpos handling from page flip code to a saner location, change < to <=
If the shown frame was already at exactly the end pos we don't want to
show one more frame after it.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20911 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:35:55 +00:00
uau
186e0d274e move vo event check together with gui event check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20910 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 06:25:02 +00:00
uau
9e9851231f Remove some incorrect code
This code was apparently intended to duplicate frames in constant-
framerate output in case of skipped input frames, but the test used
(blit_frame not set at that location) is not correct for that use.
If removing this code turns out to make the brokenness of other code
more apparent then a better fix might be needed.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20908 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 05:56:20 +00:00
uau
e978f405a1 Try filling audio buffers more if they're very large, add some comments.
Larger buffers could make sense with lots of high-bitrate audio
channels.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20906 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 04:17:41 +00:00
uau
b65c295b31 Move audio playing code from main() into a separate function.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20905 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 03:13:45 +00:00
uau
8c6ce53875 Remove useless check.
sh_video should always be non-NULL if this code is run.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20904 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:59:46 +00:00
uau
a6863268cc Split some from main() into separate functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20903 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-14 01:40:06 +00:00
uau
0f6d5e4fd9 Change value used to indicate "unknown audio format" from 0 to -1.
0 collided with a valid format value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20787 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-08 18:31:04 +00:00
nicodvb
faa4d4ea23 now the OSD shows the value returned by demuxer_get_current_time() rather than sh_video->pts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20766 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-07 22:57:42 +00:00
reimar
74a504f25b ARCH_X86 simplifications
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20593 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-11-01 18:41:25 +00:00
eugeni
978061ad27 Move ass_library initialization code to ass_mp.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20518 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 15:26:13 +00:00
eugeni
219d0cfca9 Always initialize and destroy ass_library.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20499 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 03:23:23 +00:00
uau
4df2014879 Always initialize libass to fix crashes caused by use without initialization.
Library init was only done if ass_enabled was true at program startup.
However there are at least 2 ways how MPlayer can later try to access
the library even if ass_enabled is false at that point:
- per-file options can turn on ass support later
- if the embeddedfonts option is enabled and the file has fonts 
  demux_mkv will call ass_process_font


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20498 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-29 00:23:12 +00:00
eugeni
efea99c2c9 Libass interface reworked:
- ass_instance_t renamed to ass_renderer_t
- ass_library_t introduced
- use of mplayer-specific global variables limited to ass_mp.c


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20493 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-28 15:07:18 +00:00
reimar
3ee22e98d4 Do not forget to clear subtitles when switching files for embedded subtitles.
Fixes bug #409.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20347 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 23:45:41 +00:00
ptt
0e3c3727ce applied patch for -endpos, to work without a blit_frame, pointed out by Andrew Savchenko
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20329 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-21 09:32:58 +00:00
rtogni
c844ece6d4 Disable loading of file-specific configuration file from the same
directory as the played file. Add a command-line switch to enable it.
Patch by reimar, manpage patch by me


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20257 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-15 21:27:15 +00:00
reimar
e6fd2e126e Remove unused ABS define
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20213 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-14 16:31:41 +00:00