1
0
mirror of https://github.com/mpv-player/mpv synced 2025-01-04 05:52:09 +00:00
Commit Graph

87 Commits

Author SHA1 Message Date
Uoti Urpala
5f3c3f8c32 video, audio: use lavc decoders without codecs.conf entries
Add support for using libavcodec decoders that do not have entries in
codecs.conf. This is currently only used with demux_lavf, and the
codec selection is based on codec_id returned by libavformat. Also
modify codec-related terminal output somewhat to make it use
information from libavcodec and avoid excessively long default output.

The new any-lavc-codec support is implemented with codecs.conf entries
that invoke vd_ffmpeg/ad_ffmpeg without directly specifying any
libavcodec codec name. In this mode, the decoders now instead select
the libavcodec codec based on codec_id previously set by demux_lavf
(if any). These new "generic" codecs.conf entries specify "status
buggy", so that they're tried after any specific entries with
higher-priority status.

Add new directive "anyinput" to codecs.conf syntax. This means the
entry will always match regardless of fourcc. This is used for the
above new codecs.conf entries (so the driver always gets to decide
whether to accept the input, and will fail init() if it can't find a
suitable codec in libavcodec). Remove parsing support for the obsolete
codecs.conf directive "cpuflags". This directive has not had any
effect and has not been used in default codecs.conf since many years
ago.

Shorten codec-related terminal output. When using libavcodec decoders,
show the libavcodec long_name field rather than codecs.conf "info"
field as the name of the codec. Stop showing the codecs.conf entry
name and "vfm/afm" name by default, as these are rarely needed;
they're now in verbose output only. Show "VIDEO:" line at VO
initialization rather than at demuxer open. This didn't really belong
in demuxer code; the new location may show more accurate values (known
after decoder has been opened) and works right if video track is
changed after initial demuxer open.

The vd.c changes (primarily done for terminal output changes) remove
round-to-even behavior from code setting dimensions based on aspect
ratio. I hope nothing depended on this; at least the even values were
not consistently guaranteed anyway, as the rounding code did not run
if the video file did not specify a nonzero aspect value.
2012-07-24 09:01:47 +03:00
reimar
2465ec9027 codec-cfg: set CODEC_CFG_MIN to the release value in codecs.conf
Auto-update CODEC_CFG_MIN value to release value in etc/codecs.conf.
Allowing them to differ causes more issues than it is worth.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31472 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-11-02 04:11:07 +02:00
diego
a535f7bfca the great MPlayer tab removal: part II
some extra indentation fixes are put in as a bonus


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31134 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-05-03 23:34:38 +00:00
diego
89777b1f57 cosmetics: Rename "codecs_st" struct to just plain "codecs".
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30752 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-02-26 20:01:04 +00:00
diego
99c1bbca2a Add license header to all top-level files missing them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
2010-01-30 23:24:23 +00:00
compn
df9f82d41d change arbitrary CODECS_MAX_FOURCC limit to larger arbitrary limit
some camera generates different MPEG2 fourccs for each res and fps.
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-July/050348.html


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27366 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-07-30 03:27:17 +00:00
diego
8efb2fa21c Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-02-22 09:09:46 +00:00
reimar
d63fb8ba99 Replace the persistent CODECS_FLAG_SELECTED by a local "stringset" with
an almost-trivial implementation.
This allows making the builtin codec structs const, and it also makes
clearer that this "selected" status is not used outside the init functions.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25689 b3059339-0415-0410-9bf9-f77b7e298cf2
2008-01-12 14:05:46 +00:00
diego
1d7b9b5470 Names starting with underscores are reserved.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23890 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-07-28 14:23:18 +00:00
rtogni
8d62ac3446 qdrw changed output format in ffmpeg r8630, sync codecs.conf and require
newest codecs.conf version to avoid regression


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22933 b3059339-0415-0410-9bf9-f77b7e298cf2
2007-04-07 16:14:51 +00:00
rtogni
a13f6a13b5 Require latest version of codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20368 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-10-22 16:16:34 +00:00
reynaldo
4728357b58 Marks several string parameters as const when they are not modified in the function, Patch by Stefan Huehner, stefan AT huehner-org
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18985 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-07-09 17:45:36 +00:00
rtogni
63784accb5 Reject codecs.conf files older than 20060501
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18582 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-06-05 18:41:57 +00:00
rathann
e7db4ccf1a Patch by Stefan Huehner / stefan % huehner ! org \
patch replaces '()' for the correct '(void)' in function
declarations/prototypes which have no parameters. The '()' syntax tell
thats there is a variable list of arguments, so that the compiler cannot
check this. The extra CFLAG '-Wstrict-declarations' shows those cases.

Comments about a similar patch applied to ffmpeg:

That in C++ these mean the same, but in ANSI C the semantics are
different; function() is an (obsolete) K&R C style forward declaration,
it basically means that the function can have any number and any types
of parameters, effectively completely preventing the compiler from doing
any sort of type checking. -- Erik Slagter

Defining functions with unspecified arguments is allowed but bad.
With arguments unspecified the compiler can't report an error/warning
if the function is called with incorrect arguments. -- Måns Rullgård


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
2006-02-09 14:08:03 +00:00
reimar
0446e090b1 Allow forcing of demuxers and codecs by prepending '+'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-08-30 23:56:24 +00:00
alex
f4642f12da require some up to date codecs.conf
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16133 b3059339-0415-0410-9bf9-f77b7e298cf2
2005-07-28 12:55:01 +00:00
faust3
b4918b7bae Memory Free function Fix, based on patch by Wei Jiang <jiangw98@yahoo.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13808 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-30 10:09:52 +00:00
faust3
29884c2e38 fix compilation on mingw
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13592 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-10-09 07:38:45 +00:00
faust3
0af4151b05 Make it compile on mingw again. Now it is finally possible to include windows.h in mplayer.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12359 b3059339-0415-0410-9bf9-f77b7e298cf2
2004-04-30 16:56:00 +00:00
alex
3f0415488a bumped version number
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10468 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-07-24 19:32:59 +00:00
arpi
521e473e36 time to ++version
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9035 b3059339-0415-0410-9bf9-f77b7e298cf2
2003-01-19 19:18:12 +00:00
arpi
500362226a codecs.conf min. version bumped
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7773 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-10-17 00:24:58 +00:00
arpi
e8cc8584f1 new func: select_codec() - disables codec by name
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7506 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-26 01:28:32 +00:00
arpi
47902f3c88 version number bumped
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7358 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-09-10 20:07:34 +00:00
arpi
1b667f61ba -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and makes dlopen()'ing possible
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-30 21:44:20 +00:00
arpi
7ec13528e5 codecs.conf min. version bumped
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6936 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-05 21:02:23 +00:00
arpi
19704bb73a native DV audio/video decoders using libdv
based on patch by Alexander Neundorf <neundorf@kde.org>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6928 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-08-05 17:23:22 +00:00
albeu
5319a8118a Support for Xvid using their new api. If divx4 compatiblity is disabeled
in xvid it can be used along with divx4.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6702 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-07-10 20:56:57 +00:00
arpi
d7d187300d new global codec flag: align16
it means that width/height should be round up to n*16 (some buggy codec
needs it to avoid sig11 / image distortions)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6566 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-25 22:26:34 +00:00
arpi
8daaf27ef0 time to ++ timestamp
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6562 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-25 18:48:28 +00:00
arpi
f60b5944a4 SVQ1 added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6507 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-22 23:09:40 +00:00
arpi
cd356609ae realvideo support by Florian Schneider <flo-mplayer-dev@gmx.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6344 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-06-08 20:51:50 +00:00
arpi
a62a42f3f1 codecs.conf versioning - patch by Joey Parrish <joey@yunamusic.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6201 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-26 22:39:38 +00:00
arpi
b171ebd099 'static' outfmt-flag added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6104 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-05-16 21:50:38 +00:00
arpi
42db8b366c mpegpes added... thx Mw3
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5479 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-04-03 19:09:55 +00:00
arpi
fbf84aa57e use codec selection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5327 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-25 03:07:27 +00:00
arpi
43d70441a6 tagging selected codec to avoid trying the same codec several times
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5326 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-25 03:02:57 +00:00
alex
805e53ebb6 added zlib support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5264 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-22 22:12:09 +00:00
arpi
81778e13ee query flag added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5250 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-21 19:53:31 +00:00
melanson
154bf5a17a added HuffYUV support, courtesy of Roberto Togni <rtogni@bresciaonline.it>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5236 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-21 01:21:49 +00:00
melanson
4e994dd61a MPlayer now has a Microsoft RLE decoder to call its own...only supports
8-bit right now, but 4-bit is forthcoming


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5194 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-19 07:07:06 +00:00
atmos4
6e63d3573d Beta AAC decoding support, seeking totally broken yet, add philipps mpeg4 video in qt to ffmpeg4 although it's still buggy in decoding
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5191 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-18 23:30:04 +00:00
arpi
b09bb7d663 status numbers changed to fit our detection order
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5178 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-18 01:52:51 +00:00
pontscho
f9f6c9fd93 Add IJPG decoder.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5030 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-03-10 22:49:18 +00:00
melanson
ba4694f4bb fixed, strengthened, rewrote, and renamed a variety of the ADPCM decoders
(including MS, DK4 and DK3 ADPCM)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4855 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-25 02:48:37 +00:00
alex
dd984d5db5 added informat support (for encoding)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4676 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-12 17:33:27 +00:00
pontscho
97654ce7f3 add initial mPNG support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4657 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-11 09:15:59 +00:00
melanson
0b9cd29746 Added native codec support for QT RPZA data, courtesy of Roberto Togni
<rtogni@freemail.it>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4616 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-09 20:05:49 +00:00
melanson
6bd8125163 added skeleton decoders for RoQ audio and video format decoders
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4451 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-02-01 05:33:46 +00:00
melanson
361bd9c4f6 added skeleton for Duck Truemotion v1 decoder (doesn't do anything yet)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4302 b3059339-0415-0410-9bf9-f77b7e298cf2
2002-01-22 05:39:34 +00:00