1
0
mirror of https://github.com/mpv-player/mpv synced 2025-03-25 04:38:01 +00:00
Commit Graph

2736 Commits

Author SHA1 Message Date
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
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
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
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
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
96b385bc79 vd_xanim.c: Give functions proper prototypes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31611 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:20 +02:00
reimar
077c9025bf vf_geq: Fix function prototypes to match the required type.
Fixes "initialization from incompatible pointer type" warnings.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31609 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:14:19 +02:00
reimar
2308e045de cleanup: Add const qualifiers for struct ad_functions pointers
The ad_functions structs are in rodata, mark some pointers to them
const.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31606 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:02 +02:00
attila
4a0f67ca35 ad_faad: fix compilation using external libfaad
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31603 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:13:00 +02:00
diego
d86aad3d56 ad_mpg123: add MP3 decoding through libmpg123
patch by Thomas Orgis, thomas-forum orgis org

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:46 +02:00
diego
e2dea75e4a vd_ffmpeg: add av_unused attribute to swap_palette()
Only used on bigendian machines.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31586 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
reimar
368d11d4cc vf_ffmpeg: make VP8 decoder work by disabling dr
Allow the FFmpeg VP8 decoder to work by disabling dr for it (thus we do not
need edge emulation).

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31560 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:43 +02:00
cehoyos
f455b6e91b ad_faad: Improve LATM recognition
Patch by Dan Oscarsson,  Dan d Oscarsson a tieto d com

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31543 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:42 +02:00
diego
a7bc7d8e63 cleanup: #include loader/wine/winbase.h instead of local declarations
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:44 +02:00
siretart
082b6f86d3 vf_rgb2bgr: remove the filter
Its functionality has been superseeded by sws by quite some time, and
the "swap" functionality is now provided by vf_format.

see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for
a full discussion.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31350 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:07:27 +02:00
reimar
f604df4f76 vd_ffmpeg: Minor code simplification.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31336 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-10-27 20:27:39 +03:00
Uoti Urpala
96312757c5 vd_ffmpeg: fix aspect ratio problems with recent FFmpeg
The code left ctx->last_sample_aspect_ratio at 0/0 when allocating a
context. In older FFmpeg versions av_cmp_q() against 0/0 always said
the numbers are equal; but this changed recently, triggering incorrect
overwrite of container aspect ratio. The logic looks like it'd need
further fixes, but for now just initialize last_sample_aspect_ratio to
0/1; this should restore the previous behavior from before FFmpeg
changes, which worked well enough for the most common cases.
2010-10-16 05:14:25 +03:00
Uoti Urpala
266e0341ba vd_ffmpeg: fix calloc/av_free mixup
avctx->palctrl was allocated with calloc() but freed with av_freep().
Free it with free() instead. Also change the main decoder context
allocation to use talloc.
2010-10-16 04:38:20 +03:00
Uoti Urpala
8362ad36ac Merge svn changes up to r31332 2010-06-05 23:37:42 +03:00
Uoti Urpala
dde8b753e4 Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point
isn't quite safe), but it was a failure case already...
2010-06-05 23:35:42 +03:00
reimar
7e9ff557a0 Extend -vf format to allow substituting the format for a compatible one
(e.g. chaning rgb24 to bgr24).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:55:20 +00:00
reimar
1689c3422f Fix -vf format and -vf noformat to work with slices.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 17:45:35 +00:00
cehoyos
ef14d50ad6 Fix compilation after FFmpeg r23485.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-05 13:44:20 +00:00
reimar
82aabb77d3 Limit buffered PTS only when we actually got a frame from the decoder.
This avoids some issues with H.264 PAFF due to dropping PTS values too
early because only every second packet actually produced output.
Just keeping up to one additional pts value would have avoided this
particular issue as well, but this is more generic.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-03 20:59:40 +00:00
cehoyos
1c906775a0 ass_set_aspect_ratio() takes three arguments since 0x00907010.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-02 20:12:50 +00:00
Uoti Urpala
80be936a56 Merge svn changes up to r31303 2010-06-02 19:12:01 +03:00
Uoti Urpala
9d14cec1d7 ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_level 2010-06-02 18:38:24 +03:00
Uoti Urpala
3f076c0fb3 options: move -a52drc to option struct
Also allow a range up to 2.
2010-06-02 18:34:21 +03:00
Uoti Urpala
4cf9a52a64 Merge svn changes up to r31265 2010-06-02 17:46:33 +03:00
siretart
1cbf1ec468 avoid using swscale internals by copying in palette8torbg16 and its bgr variant
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 21:07:02 +00:00
siretart
b2dc062825 deprecate palette8topacked32 in favor of public API functions sws_convertPalette8ToPacked32 and -24
additionallym deprecate palette8torgb16 and its bgr variant without
replacement. These functions are not meant to be used by applications.

Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 19:35:16 +00:00
cehoyos
d9396facdc Fix compilation after FFmpeg r23402.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 10:28:45 +00:00
siretart
88c4cbb3f9 remove palette8torgb15 and palette8tobgr15
They contain exactly the same code as their 16bit variants, so this is
effectively code de-duplication.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-06-01 06:53:56 +00:00
reimar
a8dab8b521 Forgotten part of previous commit (extern declaration of drc_level).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31287 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:48:18 +00:00
reimar
b19b09df54 Use the -a52drc option also for the libavcodec decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-30 16:46:31 +00:00
Uoti Urpala
0e0d88ede9 Merge svn changes up to r31256 2010-05-30 16:39:41 +03:00
Uoti Urpala
2f1a518d45 Merge svn changes up to r31211
The merged cache2.c changes are known to have problems. Will merge
further fixes to them before merging this to the master branch.
2010-05-30 16:14:55 +03:00
Uoti Urpala
adbb0477a0 Merge svn change r31191 2010-05-30 15:53:08 +03:00
Uoti Urpala
e74361c488 Merge svn changes up to r31189 2010-05-30 15:51:33 +03:00
Uoti Urpala
a286506467 Merge svn changes up to r31176 2010-05-30 15:37:34 +03:00
Uoti Urpala
6f199ab3d9 Merge svn changes up to r31169 2010-05-30 15:27:58 +03:00
Uoti Urpala
18657beb19 Merge svn changes up to r31145 2010-05-30 15:21:18 +03:00
Uoti Urpala
1888e57af7 cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"
Change 'struct vf_instance' pointer arguments to more standard style
as in the subject. Also some other minor formatting fixes.

Patch by Diego Biurrun.
2010-05-29 17:20:44 +03:00
diego
e962e643be cosmetics: Remove some commented-out #includes, fix a comment grammar error.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:07:10 +00:00
diego
6dda52e496 Directly mark jpeg_buf_src() as void instead of using some indirection marcro.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-29 10:06:29 +00:00
cehoyos
95e8630981 Use MSGT_DECVIDEO in a video decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-28 11:52:12 +00:00
diego
b17704e6a8 cosmetics: Drop pointless _s suffix from 'struct ad_functions'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:10:27 +00:00
diego
9bc124bcda cosmetics: Drop pointless _s suffix from 'struct mp_image'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31230 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 10:08:30 +00:00
diego
67958c9b9f cosmetics: Drop _s suffix from 'struct vd_functions'.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31229 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:59:15 +00:00
diego
4ab8fea71b cosmetics: K&R coding style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31228 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:37 +00:00
diego
ca04a9c8ea cosmetics: K&R coding style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31227 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-27 09:54:11 +00:00
diego
e765b9cd43 whitespace cosmetics
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31217 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-25 11:39:58 +00:00
reimar
9016e5cf0a Avoid decoding of 0-size packets. This also fixes that the main loop believes
tehre is an infinite number of delayed frames, thus never finishing (happens
with -demuxer lavf -vc theora).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31206 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 23:24:25 +00:00
diego
cc75267c6b cosmetics: reformat ad_pcm.c in K&R style
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31193 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-23 14:15:27 +00:00
cehoyos
1dce94a26d Ignore (but print out) offset with libtheora decoder.
Patch by Giorgio Vazzana, mywing81 gmail


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31191 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-22 16:32:39 +00:00
iive
31bc24b1d8 Fix compilation broken by FFmpeg-r23201 that changed the api of error logging.
Also fix evaluation after FFmpeg-r23149 "change order of parameters".
Let the filters fail if evaluation can't be done.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31187 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-20 23:17:41 +00:00
Uoti Urpala
a47ef5fed6 ad_pcm: don't rely on demux packets staying valid
Change ad_pcm to copy input packet data into an internal buffer
instead of relying on the packet still existing at the next decode()
call. The extra memcpy could be avoided by improving the demuxer API a
bit but I don't feel like implementing that now. Also add a
ADCTRL_RESYNC_STREAM handler to drop buffered data from previous
stream position.
2010-05-15 06:08:44 +03:00
Uoti Urpala
c1c68a6914 ad_pcm: fix crash at EOF
Fix use of unsigned type where negative values were needed. When
playing a file with multichannel PCM audio the bug could result in the
channel reorder function scrambling memory at the end of playback,
causing a crash.
2010-05-15 05:52:00 +03:00
Uoti Urpala
584b43e9f8 cosmetics: reindent ad_pcm.c 2010-05-15 05:45:02 +03:00
cehoyos
2b26048cca Fix compilation after r31173.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31174 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 14:20:19 +00:00
siretart
e3f191fa3f remove vf_yuy2, functionality is replaced by -vf format=yuv2
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31173 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-14 13:49:05 +00:00
diego
12f67b8372 Remove internal liba52 copy.
Nowadays FFmpeg is faster than liba52 and external liba52 is well supported.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31147 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 14:45:29 +00:00
reimar
d6f2685181 Handle Y8/Y800 formats more similar to other YUV formats.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31144 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-09 00:18:26 +00:00
Uoti Urpala
5266b5de98 vd_ffmpeg: remove #ifdef for old FFmpeg-mt versions
The #ifdef is obsolete since trying to compile against the relevant
old versions will fail for other reasons.
2010-05-07 22:15:19 +03:00
Uoti Urpala
e1cd86076f Merge svn changes up to r31141 2010-05-07 22:13:35 +03:00
cehoyos
02641f54ee Add support for 12-bit color mode on framebuffer devices.
Patch Janusz Krzysztofik, jkrzyszt A tis icnet pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31139 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-06 10:18:25 +00:00
Uoti Urpala
bc767c2a98 vd_ffmpeg: use skip_frame instead of deprecated hurry_up field 2010-05-04 04:50:57 +03:00
Uoti Urpala
9a34ae4fd0 Merge svn changes up to r31050 2010-04-26 18:46:18 +03:00
Uoti Urpala
8df340271e Merge svn changes up to r31040 2010-04-26 18:38:11 +03:00
Uoti Urpala
7795726e0f Merge svn changes up to r31033 2010-04-26 18:25:34 +03:00
Uoti Urpala
837c48ddee Merge svn changes up to r31020 2010-04-26 18:06:00 +03:00
Uoti Urpala
e913d6c5da Merge svn changes up to r31004 2010-04-26 17:55:05 +03:00
Uoti Urpala
6a7956a11b Merge svn changes up to r30972 2010-04-26 17:44:48 +03:00
Uoti Urpala
4785c2617e Merge svn changes up to r30967 2010-04-26 17:42:20 +03:00
Uoti Urpala
95fba94860 Merge svn changes up to r30917 2010-04-26 17:11:04 +03:00
Uoti Urpala
ff559b8e90 Merge svn changes up to r30907 2010-04-26 16:57:25 +03:00
Uoti Urpala
f9d224b1ad Move some sh_audio field setting out of demuxer.c
These fields are decoder details, not information set by the demuxer.
2010-04-23 20:50:11 +03:00
reimar
06c6130710 Cosmetics/indentation fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31052 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:24:01 +00:00
reimar
903dedd64f Add workaround for aac-sbr-ffaac-slow.mkv playing to slow with FFmpeg
AAC decoder due to wrong sample rate in container.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31051 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 20:22:49 +00:00
lorenm
c462186142 Tell x264 that we aren't going to give it timestamps.
Fixes some warnings starting in x264-r1480.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 09:14:54 +00:00
zuxy
6fe158d7e7 Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systems
lacking memalign(), e.g. Win32.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-20 04:33:00 +00:00
reimar
c0aa5c32b2 Move functions that really do not need to be inlined from the header
to the .c file.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31038 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-15 05:39:36 +00:00
iive
e16f02fe40 Fix build due to FFmpeg r22858 change (function rename).
Patch by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31033 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 20:03:26 +00:00
diego
86ea8d4f4a Fix build after FFmpeg symbol rename:
ff_eval2      --> ff_parse_and_eval_expr
ff_parse_eval --> ff_eval_expr
patch by ubitux, ubitux gmail com


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31031 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-12 08:03:39 +00:00
iive
e3ed371d51 Fix build due to FFmpeg r22833 change (typedef rename).
Found by ubitux on irc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31029 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-11 13:47:13 +00:00
diego
9ceb70782b cosmetics: Reorder some x86-related preprocessor conditionals.
This fixes two of the following warnings on non-x86 machines:
libmpcodecs/vf_gradfun.c:388:5: warning: "HAVE_EBX_AVAILABLE" is not defined


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31025 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-06 09:46:47 +00:00
reimar
d55c67d157 Change ifdefs to make more sense: HAVE_SSSE3 should only be around SSSE3-code,
not around MMX code etc.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31018 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-05 16:38:40 +00:00
diego
935147dd64 Mark vf_size_preset_fields m_option_t array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31001 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 16:15:08 +00:00
diego
75fad5bac6 Mark encoder-related m_option_t struct arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-04 15:59:09 +00:00
diego
ff93cd656b Add a header for x264enc_set_param() instead of forward declaring it.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 14:20:34 +00:00
diego
8b4b82d008 Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.
The file is only compiled if that condition is true.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-04-03 13:51:14 +00:00
reimar
91ec3ae682 Fix crash with incomplete yuv2 frames.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30972 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-28 00:08:28 +00:00
diego
a8a34f32a1 Convert asm keyword to __asm__.
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm).
The latter form is accepted in any syntax as an extension (without
requiring further command-line options).

Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30962 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-26 08:13:10 +00:00
diego
db734715dc Fix build due to codecs_path vs. codec_path typo.
patch by Erik Auerswald, auerswal unix-ag.uni-kl de


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30950 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 19:40:37 +00:00
diego
5e480c7b81 Get rid of pointless def_path variable; use codec_path directly instead.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30949 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 18:01:00 +00:00
diego
cb26eaf0bb Real binary loader code should respect the binary codec path.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30948 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-23 17:52:46 +00:00
Uoti Urpala
faea4ef439 ad_ffmpeg: prefer codec to container samplerate for ffaac
Container-level information can be unreliable for AAC because of SBR
handling problems, so use the samplerate value from the codec
instead.
2010-03-21 18:46:19 +02:00
diego
70c66c0476 Rename get_path.[ch] --> path.[ch].
These files now contain different functions related to path handling.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30943 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:38:27 +00:00
diego
a06a3d476d Move SetCodecPath() from loader to get_path.c and make it unconditional.
This fixes compilation with the Win32 loader disabled but other binary
codec loaders enabled.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30942 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 23:27:07 +00:00
reimar
443a427b0e Remove unnecessary size limits and a related define for hm12 decoder.
Patch by Stephen Warren [swarren nvidia com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30940 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:44:02 +00:00
diego
a04b23c3b3 Drop support for XANIM_MOD_DIR environment variable.
It is now possible to specify alternative codec paths on the comand line.
Furthermore, XANIM_MOD_DIR was never properly documented.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30936 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:37:57 +00:00
diego
0e1acdbf9b Reuse codec path variable used in the binary loader in the XAnim loader.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30935 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:32:14 +00:00
aurel
3f8efed4d9 cosmetics: indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30933 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:53 +00:00
aurel
4709cde305 add support for lavf style extradata in vd_theora
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30932 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 21:53:02 +00:00
diego
e4905ab24f Remove unused variable, fixes the warning:
libmpcodecs/vd_qtvideo.c:242: warning: unused variable 'result'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30912 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:35:43 +00:00
sesse
9ffcd31e7d Fix libmpcodecs/vd_qtvideo.c compilation on OS X:
- Declare the "result" variable even for native QuickTime.
 - ExitMovies returns void; don't check its result value.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30911 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 14:30:31 +00:00
sesse
45fd2e0457 Use the high-level QuickTime decoding APIs (DecompressSequenceFrameS and
friends) instead of the unsupported, internal ones (ImageCodecBeginBand
etc.). This is a prerequisite for, among others, Apple ProRes 4:2:2 support,
and simplifies the file by quite a bit.

Tested on Linux with all existing QuickTime codecs I could get to work in the
first place; qt261, qtavui, qtsvq3 have no change. qtcvid appears to not give
bit-exact the same output as before, but it looks just the same in playback
to me. qt3ivx stops crashing on exit (so works better than before). With some
extra patches and a codecs.conf entry, ProRes 4:2:2 also works, including on
Linux.

Since codec initialization is now actually done on decoder init instead of on
first frame, fallback should also work a bit better (although usually, qtvideo
is last in the chain). Also made the decoder complain explicitly if the
demuxer data is not there (ie., the user tried to run without -demuxer mov).

This patch is a cleaned up version of what Andrew Wason (rectalogic A
rectalogic D com) posted to mplayer-dev-eng in June.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30899 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 12:05:56 +00:00
diego
aee9749bca Replace separate Win32, XAnim and Real codec directories by one global dir.
Nowadays MPlayer does not use the codecs from other installed programs.
A runtime setting will soon take over the rare case that binary codecs
should be searched for in non-standard directories.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30888 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-14 16:13:32 +00:00
reimar
d06c04bb67 Support extradata format of the speex.acm windows codec formerly available
from openacm.org.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30884 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-12 18:19:51 +00:00
reimar
fdd4ddccd4 Fix crash if speex_packet_to_header fails.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30883 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-12 17:29:48 +00:00
Uoti Urpala
00323c06e2 Delete things related to old translation system
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
2010-03-10 03:47:14 +02:00
Uoti Urpala
0269d22d32 Merge svn changes up to r30876 2010-03-10 03:18:42 +02:00
Uoti Urpala
240550bbb9 Merge svn changes up to r30848 2010-03-10 03:00:14 +02:00
Uoti Urpala
bc1d0ca37d Merge svn changes up to r30798 2010-03-10 02:35:02 +02:00
Uoti Urpala
e74708f619 Merge svn changes up to r30748 2010-03-10 01:50:55 +02:00
Uoti Urpala
acdce0176a Merge svn changes up to r30732 2010-03-10 01:25:15 +02:00
Uoti Urpala
5099b1458d Merge svn changes up to r30683 2010-03-10 00:52:17 +02:00
Uoti Urpala
13221a7165 Merge svn changes up to r30663
Conflicts:
	gui/cfg.c
	libmpcodecs/vd_dmo.c
	mplayer.c
2010-03-10 00:13:11 +02:00
Uoti Urpala
c37f09693d Merge svn changes up to r30643 2010-03-10 00:00:06 +02:00
Uoti Urpala
42bf12c2d3 Merge svn changes up to r30595
Conflicts:
	mplayer.c
	vidix/nvidia_vid.c
2010-03-09 23:37:00 +02:00
Uoti Urpala
e03e0597d0 Merge svn changes up to r30570 2010-03-09 23:20:56 +02:00
Uoti Urpala
8365d174b6 Merge svn changes up to r30557 2010-03-09 23:09:46 +02:00
Uoti Urpala
36e7a20e69 Merge svn changes up to r30550 2010-03-09 23:03:14 +02:00
Uoti Urpala
f1b6cdbe9d Merge svn changes up to r30484 2010-03-09 19:24:47 +02:00
Uoti Urpala
b0986b3760 Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the
default behavior as claimed in the commit message. It only breaks
"-af-adv force=0", which was already pretty much useless though.
2010-03-09 18:59:15 +02:00
Uoti Urpala
b34a88e4f4 translations: tweak cases that relied on concatenating adjacent strings
Tweak some code parts that used to rely on string literals from
translation macros being concatenated with other adjacent string
literals. Break up the resulting string into independently translated
parts, so that the existing translations for those parts can still be
used.
2010-03-07 21:35:23 +02:00
Uoti Urpala
5234c72e28 Restore collapsed whitespace in output messages
For some reason commit e306174952, which
replaced translation macro names with the corresponding English
strings, also collapsed multiple consecutive space characters into
one. Change most of these back. In a couple of cases the amount of
whitespace is important for alignment, and for the rest it at least
keeps the strings closer to the existing translations.
2010-03-07 21:34:54 +02:00
sesse
a8804d4d71 Fix QuickTime emulated OSErr type.
The OSErr type on Mac OS X is int16_t, not int32_t (see
http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html).
The upper 16 bits will typically be something random (they're entirely
undefined). Change the type so it's right; a few places tried to compensate
for this by masking out the upper bits, but a few places also missed them,
which made for unpredictable behavior.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-06 11:12:32 +00:00
greg
ca7cbc0724 Enable ASS/SSA subtitle support in mencoder
Enable ASS/SSA rendering through libass in mencoder. This duplicates a
bit of code (to parse font attachments, for example). Additionally, add
a filter "fixpts" that generates PTS, simulating fixed fps. PTS
generated by this filter are then used for subtitle timing.

Original patch by Nicolas George. (nicolas.george normalesup.org)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-05 23:13:08 +00:00
reimar
57f4448e7a Partially revert r30645, the final output format is determined by
mpcodecs_config_vo so we need to query it afterwards.
Still try to set a more sensible, codec-dependant preferred format even
though it is currently ignored.
Fixes bug #1659, based on patch by Andrew Wason [rectalogic rectalogic com]


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30824 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-03 21:32:31 +00:00
reimar
e86ecdac03 Reuse the keyframe flag from x264 instead of trying to derive it on our own.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:52:34 +00:00
reimar
4d08f30d25 Use the KEYFRAME define instead of some magic number.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 07:45:23 +00:00
cehoyos
6c0da216d7 Get rid of many ugly casts.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30786 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 01:06:09 +00:00
cehoyos
fd21cdeb47 Make close_toolame() static, only used in ae_toolame.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30785 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 00:28:14 +00:00
cehoyos
aa4388fea4 Make close_twolame() static, only used in ae_twolame.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30783 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-28 00:23:58 +00:00
cehoyos
5a1eca395c Actually use existing uninit() function in remove_logo filter.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30778 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 22:32:25 +00:00
cehoyos
f21d2dcc7e Make function Gsm_Long_Term_Synthesis_Filtering() static, only used in xa_gsm.c.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30772 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-27 21:02:14 +00:00
diego
0d7e91b104 Mark all fmt_list arrays as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30750 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 19:56:03 +00:00
diego
2ec8252503 Mark vf_opts/vf_opts_fields structures as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30749 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 17:21:06 +00:00
diego
b63759b175 Do not cast the results of malloc/calloc/realloc.
These functions return void*, which is compatible with any pointer,
so there is no need for casts.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 15:01:37 +00:00
reimar
25f353346d Add const to mpvdec declaration
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30734 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:23:58 +00:00
reimar
5a2289137f Fix check for wrong variable: len can be unitialized but not normally < 0,
the return value needs to be checked to detect an error.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30732 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-25 22:06:05 +00:00
diego
5206db7e60 Mark member info of struct ad_functions_s as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30705 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:04:39 +00:00
diego
b2172f784d Mark a bunch of video filter structures as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30704 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:03:46 +00:00
diego
50e3d811db Remove commented-out cruft line.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30703 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 14:02:18 +00:00
diego
36a14ac50c Declare externally used variables from vd.c as extern in vd.h.
This saves declaring them as extern all over the place.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-22 09:51:44 +00:00
diego
e0bc115b4d cosmetics: Rename struct vf_instance_s --> vf_instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 15:48:03 +00:00
diego
28cf6ea2be Rename open() vf initialization function to vf_open().
This avoids clashes with fcntl.h under certain circumstances.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 13:40:49 +00:00
diego
d819c05ced Add malloc.h #include for memalign(), fixes the warning:
libmpcodecs/vd_dmo.c:81: warning: implicit declaration of function 'memalign'


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30678 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-21 12:48:56 +00:00
diego
2a5c4d21f2 Mark ad_functions_t structures and mpcodecs_ad_drivers array as const.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30676 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-20 21:27:49 +00:00