1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-30 19:22:11 +00:00
Commit Graph

32225 Commits

Author SHA1 Message Date
reimar
dd886133a9 spudec: Simplify creation of color/alpha map
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31788 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
cbe036312a vobsub: Only try to merge packets if we have an earlier one stored
Based on patch by 191919 [191919 gmail com].

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31787 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
7fe4aa9a3b vd_qtvideo: Some indentation fixes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
56599fe4a4 vd_qtvideo: generate a ImageDescription if not given
Generate a ImageDescription if none is passed neither via ImageDesc nor
extradata.
Makes the ProRes decoder work with -demuxer lavf.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31784 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
jrash
15365874f9 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31769
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31774 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
7db422b384 manpage: mention -af stats in -af volume section for statistics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31769 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
85392a8875 manpage: -af volume "max volume" feature requires floats
Printing maximum volume only works when prefering float format.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31762 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
reimar
f5ef880227 vo_gl2: Use identical code to -vo gl for -wid mode
Fixes the same bugs (no video, video at wrong location...).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31750 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:45 +02:00
diego
578ad534b3 configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
fea2d4dd45 configure: Fix LADSPA test variable initialization
Don't use NULL (which would required stddef.h).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31748 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
jrash
a69950df91 DOCS/man/zh_CN: sync with en/mplayer.1 rev. 31715
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31745 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
47a4652847 DOCS: Fix a few web page links in the documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
ccb01cc877 vo_gl: Make it possible to select GL_NEAREST scaling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31743 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
93336619b2 vo_gl: add helper macros to build the yuv conversion type number
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31742 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
7de77cdb11 gl_common.h: Add () around macro arguments.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31741 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
4f15b55c9b vo_gl: Cosmetics: create luma texture first
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31740 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
5544c07aab cache: Use sigaction() instead of signal()
Signal() has an unavoidable race-condition on "broken by
backwards-compatibility" systems like Solaris. (Upon receiving a
signal, the handler is reset to SIG_DFL, thus a second signal will
kill the process. The problem could also be reduced by re-installing
the handler inside the handler, but there's still a race-condition and
the risk of the handler being called inside the handler).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31738 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
5ed772b9cd audio: support parameter changes (e.g. channel count) during playback
Add support for parameter changes (e.g. channel count) during playback.
This makes decoding AC3 files that switch between 2 and 6 channels
work reasonably well even with -channels 6 and ffac3 decoder.

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

Fix typo in error message: ACC -> AAC

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

Avoid printing AAC with SBR warning on every decode call, instead print
it only after every decoder reconfiguration.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32476 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
6be6ba4094 commands: Allow fullscreen switching during -idle.
Useful in combination with -fixed-vo and a vo that can do rescaling
during "pause" like gl.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31736 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
a22c69b980 configure: use correct arguments in signal handler tests
Give signal handler function in test programs correct argument list.
This avoids a number of warnings from those test programs.
patch by Giorgio, mywing81 gmail com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31735 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
c625cec1f8 osdep: Fix gettimeofday type to match the real one
Avoids issues if the system headers have a declaration for
gettimeofday but there's just no implementation there.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31733 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
f1773d911a ad_mpeg123: Enable robust resync
This prevents the decoder from giving up give after long pieces of invalid
data, for example during transmission errors with DVB-T and similar.

patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31732 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
3f413403e8 configure: Move PIC test out of the x86 section
It is not only required on x86.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31729 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
diego
c2e37e4346 manu.c: Remove unused static function menu_text_get_next_line
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31727 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
adrian
ef236e1fe2 ao_coreaudio: Improve handling of the "help" suboption
Avoid flagging it as an error and continue intialization if it is selected.

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

Reindent and align after r31725.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31726 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
reimar
8362b060d4 demux_ts: Improve subtitle support
Make it use the infrastructure for subtitle handling so e.g. switching
subtitles at runtime works and add support for PGS subtitles.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31724 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:44 +02:00
Uoti Urpala
7d17b5e254 demuxer.c: add new_sh_sub_sid_lang
Allocates a new sh_sub and specifies language at the same time. I
don't think this is a particularly good API but add it for easier
compatibility with some svn changes.
2010-11-02 04:14:44 +02:00
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