Commit Graph

30904 Commits

Author SHA1 Message Date
attila a1f7ee1a4b Make all instances of codec_patch unconditional, otherwise
compilation will break on systems that do not have win32 dlls
enabled. Fixes compilation bug introduced by r30942

10l to the anonymous guy who explains the importance of commit messages
and would like to have romance novels in these very messages.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30945 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-21 10:13:00 +00:00
diego d84999d480 Rename SetCodecPath() --> set_codec_path().
This keeps the naming of all path-related functions consistent.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30944 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-21 08:34:09 +00: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
jrash 64c4d367af sync with en/mplayer.1 rev. 30936
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30941 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-20 01:33:54 +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
reimar 498bd63ccc Use vd_raw to handle NV12/NV21 formats, since we support them as pixel formats
there is no need to do any conversion during decoding.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30939 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 19:42:23 +00:00
diego 0f759a5da0 Replace wrong condition name in #endif comment by correct instance.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30938 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:58:45 +00:00
diego 2406c23406 Check whether COMPILE_ALTIVEC is defined, not if it is set to a 0/1 value.
COMPILE_ALTIVEC is never set to 1, it is just #defined.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30937 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-19 09:57:36 +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
cehoyos e3e6f84258 Extend the generic path of the yuv2rgb converter with support for rgb444
output format.

Patch by Janusz Krzysztofik, jkrzyszt A tis D icnet D pl 


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30934 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 23:02:32 +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 77b8678bec Remove unnecessary #ifdefs around harmless loader/codecpath.h #include.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30931 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 20:57:49 +00:00
reimar a743c0a738 Split codec path related code into a separate file to fix Windows build.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30930 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 20:44:01 +00:00
cehoyos 70017fa388 Fix first line(s) of vo vdpau documentation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30929 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-18 00:45:18 +00:00
sesse 67b20ea611 Fix thread safety issue in mreq_private: last_alloc was accessed from multiple
threads without being under a mutex.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30928 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:42:11 +00:00
sesse c7dbfb6467 Announce Windows XP SP2 instead of Windows 95 OSR2.
It's time we move to 2010: Announce Windows XP SP2 to codecs instead of Win95
OSR2.

Note: We still don't support the *Ex fields in the version info struct
properly (we shouldn't really overwrite the structure size, but rather check
it to see if it's safe to fill the extra fields). No codec I've found seems
to care.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30927 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:38:26 +00:00
sesse d5f3f8caab Announce SMP support for Win32.
Don't hardcode dwNumberOfProcessors=1 for Win32 anymore; the mutex/event code
is still far from perfect, but now good enough that I can't find any codecs
that breaks with this (tested on a quad with various codecs). This tells
codecs they can use more than one core if they want to (some already did, by
launching multiple threads even when told there was only a single core).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30926 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 23:33:26 +00:00
diego 9e8f301f22 Introduce mak_enable function to set variables in config.mak.
This avoids manually setting target architecture and CPU extensions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30925 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 14:41:32 +00:00
diego d32a13a467 Rename SGI_MIPS architecture to plain MIPS.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30924 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 14:09:09 +00:00
diego 82b8a649ae Drop libavcodec_arch hack; ARCH can now be set directly in config.mak.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30923 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:55:59 +00:00
diego c52aed20ee Lowercase arch and subarch values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30922 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:41:54 +00:00
diego 0be7b19c27 cosmetics: Drop leading underscore from cpuexts variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30921 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:37:36 +00:00
diego dc440b47d3 Make ff_config_enable work with lowercase values.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30920 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:34:33 +00:00
diego f3928b9464 Split subarch handling off from generic arch handling.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30919 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 13:20:06 +00:00
diego 3cd1525bf3 Prefer FFmpeg AAC decoder over libfaad.
This is a tentative change to give the decoder more testing;
it can always be reverted in short order if it turns out suboptimal.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30918 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 12:39:21 +00:00
diego 0426d5d72d Rename libopencore AMR decoder entries.
FFmpeg now has an AMR-NB decoder, this avoids name clashes.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30917 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 12:35:36 +00:00
cehoyos 8e8387f7bd Fix compilation after FFmpeg r22569 at least for some architectures.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30916 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:46:18 +00:00
diego 43ccbad38c cosmetics: Drop leading underscores from arch variables.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30915 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 10:10:47 +00:00
komh 11eeaf5005 Follow a more proper way to support -codecpath.
1. Include loader/drv.h for SetCodecPath() instead of a declaration of it.

    2. Move codec_path from get_path.h to mpcommon.h and mpcommon.c.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30914 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-17 09:12:51 +00:00
sesse f414a15b33 Fix return value of InitializeCriticalSectionAndSpinCount.
InitializeCriticalSectionAndSpinCount returns a nonzero value on success,
and some codecs (notably VP7) seemingly got confused when it didn't, if and
only if we tried to emulate NT or newer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30913 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 22:08:56 +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
diego c19c71be2b Remove some commented-out debugging and similar cruft.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30910 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:38:29 +00:00
diego 0e8f7d0e58 Remove unnecessary forward declarations for a bunch of functions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30909 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:24:18 +00:00
diego 2c099abea9 cosmetics: Move all functions before main().
This will help avoid some forward declarations.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30908 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:14:57 +00:00
diego b864ff1b8d Remove disabled flip_upside_down function; it has been unused for ages.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30907 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 12:11:14 +00:00
diego b05bbdd097 Remove unnecessary forward declaration of print_wave_header().
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30906 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 11:57:52 +00:00
cehoyos 151e9a8303 Fix compilation after FFmpeg r22565.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30905 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-16 10:25:54 +00:00
cehoyos 6c239f12ff Calculate width and height in mp4_header_process_vop().
Fixes elementary streams with -vc ffodivxvdpau and the native demuxer.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30904 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:32:11 +00:00
cehoyos 0eee2d2bd5 Fix value of bit counter at end of functions to prepare for future patches.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30903 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 22:28:08 +00:00
sesse 2990ec1682 Fix indentation in GetVersionExW.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30902 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 16:09:35 +00:00
sesse 95f68d3976 Add support for Apple's ProRes and AIC codecs, now that all prerequisites
are in place.

Add codecs.conf entry for both codecs, and qt_comp.h entry for ProRes
(not used except for debugging, so mainly for completeness). Both work
with -demuxer mov only, as all other QuickTime binary codecs.
AIC support is for OS X only, and untested.

Split out from a patch Andrew Wason (r e c t a l o g i c <at> rectalogic
<dot> com) posted in June.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30901 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 12:58:17 +00:00
sesse 22ede70e58 Implement GetVersionExW with the same data as GetVersionExA but taking in a
different structure, and CreateMutexW, CreateEventW and CreateSemaphoreW as
simple wrappers around the A versions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30900 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 12:54:54 +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
komh 7092da127c Relocate -codecpath description in alphabetical order.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30898 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 09:32:53 +00:00
komh 8686b281f8 Add -codecpath option.
It allows to search binary codecs in non-standard directories.



git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30897 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 08:30:06 +00:00
diego 2c2097601e Add CONFIG_DCT and CONFIG_DWT to config.h as well as to config.mak for FFmpeg.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30896 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-03-15 06:39:21 +00:00