Commit Graph

32148 Commits

Author SHA1 Message Date
diego 5b14a1b44f ao_coreaudio: Remove some unused variables
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31723 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 2c949a1c25 vo_tga: specify 15 bpp tga format endianness
15 bpp tga format is little endian.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31720 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar c2abfa3799 vo_tga: Use the proper imgfmt names
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31719 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar a7308d3546 vo_tag: fix RGB with alpha output on little-endian
Fix vo_tga RGB with alpha output on little-endian (blue and alpha were
swapped), and simplify by letting libswscale do everything, since it
nowadays supports alpha. This has the side-effect of actually
producing a useful alpha channel when one is encoded in the video.

Patch by Marton Balint [cus fazekas.hu]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31718 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian 4505a8f06a ao_coreaudio: Process the CoreFoundation runloop
Process it in case the vo doesn't do that, e.g. when vo_corevideo is
used with shared_buffer.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31717 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian 2d35ff8332 ao_coreaudio: Refactor device selection
Add output device selection and correctly set the default device if
it's selected.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31715 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix cosmetics after r31715.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31716 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian 2050baef96 ao_coreaudio: use same types as coreaudio API
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31714 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian 6d19d34506 ao_coreaudio: replace deprecated functions with OSX 10.4 ones
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31713 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian 1b023f8d7b ao_coreaudio: Fix printf specifiers
Fixes warnings:
libao2/ao_coreaudio.c:203: warning: format '%lu' expects type 'long unsigned int', but argument n has type 'UInt32'

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31712 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 5b8366e051 sub_cc: remote pointless assignments
Remove pointless assignments that would assign the value it already
was initialized to.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31710 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 45d5565493 av_sub: Set size correctly for decoded text subs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31708 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar 15575403e5 spudec: Faster paletted to OSD conversion
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31707 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 95db5dd48c spudec: Fix conversion from paletted to MPlayer's OSD format
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31705 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
Uoti Urpala e73ff7ae70 vo_vdpau: fix indentation of some switch statements 2010-11-02 04:14:43 +02:00
Uoti Urpala 3acf2eb563 vo_vdpau: add extra check for unknown image format
Add a default case for unknown image format in create_vdp_decoder. I
think this condition shouldn't currently happen, but it's worth a
sanity check. Avoids a compiler warning about vdp_decoder_profile
being possibly used uninitialized.

Also remove an obsolete #ifdef (should always be true now).
2010-11-02 04:14:43 +02:00
Uoti Urpala 8115fedc97 vo_gl: remove unused label 2010-11-02 04:14:43 +02:00
Uoti Urpala 26bd101530 x11_common.h: remove some unused declarations 2010-11-02 04:14:43 +02:00
reimar bd2f8560aa spudec: Reuse spudec_draw for the unscaled case
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31703 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 8c00770615 spudec.c: minor improvements
Remove useless casts

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31702 b3059339-0415-0410-9bf9-f77b7e298cf2

Simplify alpha conversion code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31704 b3059339-0415-0410-9bf9-f77b7e298cf2

Document code inefficiency.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31706 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 16a14da730 spudec: Fix calc_bbox to always return sensible values
When the scaled width is equal to the current width we could reuse the
previous bbox value, however we havent saved them anywhere...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31701 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar f8509c52c0 af_lavcresample: avoid multiple calls to av_resample_init
Avoid calling av_resample_init again when the values are the same as before.
The init function can be called multiple times when e.g. additional format
filters are inserted, so this speeds things up.
Patch by Dan Oscarsson [Dan.Oscarsson tieto com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31698 b3059339-0415-0410-9bf9-f77b7e298cf2

Reindent.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31699 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 1bcb3fc805 subs: improve scaling for avcodec subs
Try to get subtitle scaling somewhat right with libavcodec decoded
bitmap subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31697 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 4a466e9573 spudec.c: add missing orig_frame_width setting
10l, also assign the original width in spudec_new_scaled.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31696 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar ba08c0e690 spudec.c: indentation fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 9e537d1f6e subs: Add support for DVB and XSUB subtitles, not yet working properly
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31694 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 3b92d75481 mpcommon.c: Remove dvdsub_id checks that should not be necessary
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31692 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar aa82817945 mp_msg: avoid mangling other output with status line
Output a '\n' when printing a message after a status line to move the
terminal to the next line instead of writing on top of the status one.

Patch by Dan Oscarsson [Dan.Oscarsson tieto com]

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31691 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 747a30b81b av_sub: Fix memory leak for subtitles decoded by libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31690 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 5deeba5f6a ao_pcm: Remove some disabled and pointless code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31686 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar ce19a13986 asfheader, demux_audio: Remove some pointless be2me/le2me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31685 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 5f65cbcc07 demux_pva.c: Remove completely nonsensical le2me usages
The only effect these had was breaking playback on big-endian.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31682 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 01a95808f1 aviheader.c: Remove obfuscating use of le2me_32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31681 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar d12c624ea8 Use AV_RL* macros instead of typecasts where appropriate
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31680 b3059339-0415-0410-9bf9-f77b7e298cf2

100l compialtion fix and use AV_RB32.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31683 b3059339-0415-0410-9bf9-f77b7e298cf2

Current FFmpeg installs intreadwrite.h, but keep using the internal
version for now to keep the possibility of compiling against older
FFmpeg lib versions.
2010-11-02 04:14:43 +02:00
reimar 1663d97a11 subs: Change global subtitle numbering scheme
Change numbering so that demuxers can "asynchronously" add subtitles
during playback.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31678 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix calculation of global_sub_size.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31711 b3059339-0415-0410-9bf9-f77b7e298cf2

Update global_sub_pos if we auto-selected a subtitle.
This avoid strange behaviour with subtitle selection in that
case, because the subtitle selection code thinks no subtitle
was displayed while we actually did display one.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31863 b3059339-0415-0410-9bf9-f77b7e298cf2

Move function to avoid a forward declaration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31864 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix subtitle selection: make selecting -sid 0 work again by replacing the
M_PROPERTY_STEP_UP hack by M_PROPERTY_SET and set the global sub pos also
when we do not yet have a subtitle stream but do know the number of subs
from out-of-band as e.g. for DVD.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31882 b3059339-0415-0410-9bf9-f77b7e298cf2

100l, re-add vobsub_get_id_by_index call accidentally removed in
r31678.
Patch by ubitux [ubitux gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31985 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 0eb5662a05 subs: Automatically allocate a vo_spudec if there is none
Allows playback of DVD subtitles from "raw" MPEG-PS.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31674 b3059339-0415-0410-9bf9-f77b7e298cf2

Move initialization of vo_spudec further behind to avoid issues with
PGS subtitles being scaled incorrectly.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31917 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 29f20dc812 demux_ts: add memory access checks
Add packet->len checks to avoid out-of-bounds reads and negative
es->size values.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31671 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 5c53ce6bae demux_ts: fix crash on broken packets
Check packet size before memmove to avoid crashes e.g. if we recognized the
wrong type and subtracted more header bytes than there are overall bytes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31669 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
diego 5e95024317 configure: Move EBX availability #define within config.h
It is not FFmpeg-specific.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31667 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 96c17fe68b subs: Add support for PGS subtitle decoding via libavcodec
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31665 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar d6322407c5 subs: change subdelay handling and vobsub timing
Make subdelay handling work the same way for all subtitle types and
also allow changing subtitle delay to work better with vobsubs.
This probably breaks vobsub behaviour with timestamp wrapping though.

Positive values for sub delay now delay subtitles compared to video,
where before the effect was in the opposite direction.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 1882a37adb spudec.c: simplify
Reuse spudec_visible to avoid code duplication.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31661 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar 4a9c879ca7 spudec: Add warning about bad values in bounding box handling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31660 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:43 +02:00
reimar dd70420bb8 spudec.c: Extract image allocation code to a separate function
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31659 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:37 +02:00
reimar 8200a8d532 stream.c: add <libavutil/common.h> include needed for GET_UTF16
Patch by Erik Auerswald {auerswal unix-ag.uni-kl.de}

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31658 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:35 +02:00
reimar 6c3c1588f5 libgsm: Remove libgsm wrapper
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:22 +02:00
reimar 4d83c67b5c codecs.conf: Add/fix GSM audio decoding through FFmpeg
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31656 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
jrash 9fc71c777c DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31648
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31652 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
cehoyos b3c3a40c6e vo_gl: remove "broken" comment from quadbuffer stereo
Independent tests indicate that GLX_STEREO is working fine on
supported hardware.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31647 b3059339-0415-0410-9bf9-f77b7e298cf2

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31648 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
aurel d7a9c6d240 demux_lavf: stricter check for convergence_duration validity
Avoid using meaningless values

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31642 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
ben 4662ea6409 stream_bluray: implement slave mode compatible controls
Added stream controls: get/set for chapters and angles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31640 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00