Commit Graph
2160 Commits
Author SHA1 Message Date
Uoti Urpala 02efad79a2 Update OSD while paused
When OSD contents change while paused, try to change the OSD drawn in
the currently visible frame. If such OSD updates are not supported
then advance by one frame and draw the OSD normally. Add some support
for OSD redrawing to vo xv.

The new xv code makes a copy of the original frame contents before
drawing the OSD if MPlayer is already paused when the frame is drawn.
If such a copy of the current frame exists then the frame contents can
be restored and a different OSD drawn on top of the same frame.
2008-12-09 04:31:07 +02:00
Uoti Urpala e948b1ae06 Work around vo gl/libass subtitle timing problem
vo gl generates bitmaps for EOSD content (libass subtitles) when
DRAW_EOSD is called but actual drawing of both EOSD and OSD is done in
draw_osd(). Since draw_osd() was called first it drew the EOSD content
from the previous frame, so the subtitles were always one frame late.
As a simple workaround update EOSD content first, then normal OSD.
This makes vo gl work correctly and should have no effect on anything
else.
2008-12-09 04:14:38 +02:00
Uoti Urpala 8c144171bb Merge svn changes up to r28087
Conflicts:
	command.c
	libao2/ao_ivtv.c
	libao2/ao_v4l2.c
	libmpcodecs/dec_video.h
	libvo/aspect.h
	libvo/sub.c
	libvo/sub.h
	libvo/vo_directx.c
	libvo/vo_macosx.m
	libvo/vo_quartz.c
	mp_core.h
	mplayer.c
	mplayer.h
	osdep/getch2.h
	osdep/timer.h
2008-12-04 01:55:52 +02:00
diego 0864f92e7a Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-12-03 23:01:03 +00:00
Uoti Urpala 835511ac39 Merge svn changes up to r28038 2008-11-25 21:12:01 +02:00
diego 5351098826 Create a separate codecs.conf entry for Tremor and use it if MPlayer is
with Tremor support instead of libvorbis. Previously MPlayer would show
the same output on the console when decoding with libvorbis and Tremor.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-24 08:31:44 +00:00
diego 929dc9a8ac cosmetics: Move up uninit() to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27983 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 12:01:48 +00:00
diego 0ad147ed5c cosmetics: consistent function declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27982 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:59:37 +00:00
diego 9e2505a3f5 cosmetics: Remove tabs and trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27981 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-23 11:58:11 +00:00
Uoti Urpala e46ce9c0ac Merge svn changes up to r27899 2008-11-06 20:41:40 +02:00
reimar 7a3fc5ad5a Use libavutil FFMIN etc. instead of defining our own variants.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27878 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 15:51:00 +00:00
reimar 9f7bae92df Avoid pointless casting of void*
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27877 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-11-02 11:52:49 +00:00
Uoti Urpala 479f5e742f Merge svn changes up to r27841
Conflicts:
	mplayer.c
2008-10-28 04:12:18 +02:00
diego 91c3f024a9 Fix smartblur filter crash due to missing default scaler choice;
set bicubic as the default scaler.
patch by Kurt Garloff, kurt garloff de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27838 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-27 21:00:12 +00:00
Uoti Urpala 4db39fdfdb vd.c: Remove pointless SCREEN_SIZE_[XY] #defines
The #defines look like they're pointless leftovers from removed code
so remove them too.
2008-10-25 05:18:08 +03:00
Uoti Urpala 0301309425 Merge svn changes up to 27824
Conflicts:
	cfg-common-opts.h
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libvo/x11_common.h
	mplayer.c
	stream/cache2.c
2008-10-25 05:12:34 +03:00
uau 1a089681fc vf_palette: Fix compilation after libswscale API changes
Patch from Guillaume Poirier. I didn't test the functionality of the
filter but at least it fixes compilation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27822 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-25 00:07:59 +00:00
diego 4722fa0b82 IWMMXT optimizations were removed from our internal libmpeg2 copy, so now
remove it from the library interface code as well.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27812 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-22 23:39:39 +00:00
reimar 57281a3170 Use av_malloc/av_free for audio-related buffers to avoid crashes due to
insufficient alignment on systems without memalign.
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-October/058743.html


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27799 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-18 18:54:05 +00:00
diego 26b29f4f2d Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should
be the most correct and portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 20:17:56 +00:00
diego 6b52a2e974 Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.
Neither variant is valid C99 syntax, but __asm__ is the most portable variant.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:59:27 +00:00
diego af21f25f31 Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.
config.h should only contain option definitions, no logic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27785 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-16 18:24:18 +00:00
diego 1a85bf593b #include necessary libavcodec header and remove duplicated struct declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27769 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 16:04:09 +00:00
diego 49faefb669 Remove useless '#undef realloc', realloc is not referenced anywhere near.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27767 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 09:04:40 +00:00
diego b282622c71 Remove duplicate extern declaration, fixes the warning:
libmpcodecs/vf_zrmjpeg.c:73: warning: redundant redeclaration of 'avcodec_initialized'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27766 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-14 08:56:48 +00:00
diego b9ce738825 Remove unused variable ncomps.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27765 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-13 23:10:42 +00:00
ulion 78f37058ff Fix channel order for ffmpeg flac codec.
This patch comes from Andrew de Quincey <adq_dvb at lidskialf dot net>.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27732 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-09 07:46:20 +00:00
diego b9509b1795 Remove unnecessary HAVE_AV_CONFIG_H #define.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27726 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-07 08:25:47 +00:00
diego 526cfa28a2 Remove word size check and macro and use __WORDSIZE directly instead.
It has been done this way in libswscale for years without apparent ill effect.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27699 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-10-04 10:16:48 +00:00
Uoti Urpala 849dc0ba31 Merge svn changes up to r27649
Conflicts:
	Makefile
	configure
	libvo/x11_common.c
2008-09-20 16:13:33 +03:00
rathann a5e9a8d0ca External liba52 support, part 2 of 2.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27620 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:32:31 +00:00
rathann d977c6e812 External liba52 support part 1 of 2.
Conditionalize enabling of some the acceleration because
liba52-0.7.4 doesn't support all that MPlayer's included
copy does.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27619 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-15 16:30:24 +00:00
Uoti Urpala 259ea9d703 Merge svn changes up to r27573
Conflicts:
	libmpcodecs/vd_ffmpeg.c
2008-09-10 23:59:08 +03:00
gpoirier 2bfa730214 fix compilation with lavc version > r15270
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27549 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 20:01:10 +00:00
uau 923f67082e Fix compilation after libavcodec major version 52 changes
Some symbols were dropped or renamed, requiring corresponding changes
in MPlayer.
 - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample.
 - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT.
 - Don't set AVCodecContext->rtp_mode (already marked unused before).
 - Use ff_eval2() instead of ff_eval().

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-08 17:02:32 +00:00
diego 3311a2ae9c Replace casual GPL notices by proper license headers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27541 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-07 14:09:51 +00:00
diego d5f550e257 Remove outdated URL from vd_info_t struct.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27533 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:16:39 +00:00
diego 5c282f9a49 Remove version information from libmpeg2 vd_info_t struct.
It is available in other places and needs to be updated continuously.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27532 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-09-06 18:13:44 +00:00
Uoti Urpala b56858342f Merge svn changes up to r27514 2008-09-03 10:16:30 +03:00
aurel a5f69284d9 handle the lavfpref demuxer in the same way as the lavf one
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27489 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-27 11:31:53 +00:00
diego 3932c5e0b9 Remove unused static declarations, fixes the warnings:
libmpcodecs/vd_qtvideo.c:69: warning: 'ImageCodecDrawBand' defined but not used
libmpcodecs/vd_qtvideo.c:71: warning: 'ImageCodecEndBand' defined but not used


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27464 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-14 16:04:32 +00:00
Uoti Urpala f6dfaf26f8 Make various functions static 2008-08-12 14:57:12 +03:00
Uoti Urpala 17d3e4b36d Merge svn changes up to r27441
Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h
2008-08-08 02:13:09 +03:00
diego e0b1c9a6b7 Give a CONFIG_ prefix to preprocessor directives that lacked one and
change arbitrary prefixes to CONFIG_.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-07 12:20:50 +00:00
diego 473e2824cb Rename all preprocessor directives related to Apple / Mac OS X.
Switch them from a HAVE_ to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27420 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-06 07:42:26 +00:00
diego 0a749ffdc5 Rename preprocessor directives related to image libraries.
Change a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27417 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-05 08:47:51 +00:00
Uoti Urpala 2ba9df3df3 ad_pcm: Track pts explicitly
ad_pcm used the old audio timestamp tracking system that calculated
timestamp at end of decoder output as
last_timestamp_in_input_decoder_has_read +
bytes_read_after_that_timestamp / input_bitrate.
For PCM this can be accurate as input bitrate is constant. However it
relies on input bitrate being known and actually set. At least in some
case with .mov input and libavformat demuxer it wasn't set. Instead of
special-casing PCM to make sure input bitrate is set (in general it
may not be known or constant at all) change ad_pcm to explicitly set
the pts information on the decoder output side.
2008-08-03 21:25:48 +03:00
diego 02135001b4 Change a bunch of video/audio-output-specific preprocessor directives from
a HAVE_ prefix to a CONFIG_ prefix.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-03 15:21:40 +00:00
Uoti Urpala 6cce822505 Merge svn changes up to r27399
Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c
2008-08-02 22:04:35 +03:00
compn ded7033671 cosmetics: reindent after last commit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27399 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-08-02 18:43:17 +00:00