aboutsummaryrefslogtreecommitdiffhomepage
path: root/codec-cfg.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/master'Gravatar wm42012-07-28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore bstr.c cfg-mplayer.h defaultopts.c libvo/video_out.c The conflict in bstr.c is due to uau adding a bstr_getline function in commit 2ba8b91a97e7e8. This function already existed in this branch. While uau's function is obviously derived from mine, it's incompatible. His function preserves line breaks, while mine strips them. Add a bstr_strip_linebreaks function, fix all other uses of bstr_getline, and pick uau's implementation. In .gitignore, change vo_gl3_shaders.h to use an absolute path additional to resolving the merge conflict.
| * video, audio: use lavc decoders without codecs.conf entriesGravatar Uoti Urpala2012-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * build, codec-cfg.c: simplify builtin codecs.conf handlingGravatar Uoti Urpala2012-07-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The player can read codec mapping (codecs.conf) from an external file or use embedded defaults. Before, the defaults were stored in the player binary in the form of final already-parsed data structures. Simplify things by storing the text of the codecs.conf file instead, and parse that at runtime the same way an external file would be parsed. To create the previous parsed form, the build system first compiled a separate binary named "codec-cfg", which parsed etc/codecs.conf and then wrote the results as a C data structure that could be compiled into the program. The new simple conversion of codecs.conf into a C string is handled by the new script TOOLS/file2string.py. After removing the codec-cfg binary, HOST_CC is no longer used for anything. Remove the --host-cc configure option and associated logic. Also remove the codec2html and codec-cfg-test functionality. Building those was already broken and nobody cared. There was a broken 3-character-long "fourcc" entry in etc/codecs.conf. This happened to be accepted before but triggered a parse error after the changes. Remove the broken entry and make the parsing functions explicitly test for this error.
* | libmpcodecs: rename IMGFMT_GBR24P to IMGFMT_GBRPGravatar wm42012-03-25
| | | | | | | | This is more in line with the ffmpeg/libav names.
* | libmpcodecs: support planar GBR24 decodingGravatar cehoyos2012-03-25
|/ | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34245 b3059339-0415-0410-9bf9-f77b7e298cf2 Note: ffmpeg first introduced PIX_FMT_GBR24P, which was used in this commit. Later, it was renamed to PIX_FMT_GBRP in ffmpeg and libav. This was updated in revision 34492 in mplayer, but the mplayer specific names (such as IMGFMT_GBR24) were left unchanged.
* build: Revert "codec-cfg.c: avoid including aviheader.h"Gravatar Uoti Urpala2011-07-07
| | | | | | | | This reverts commit 1e544365bfd09e4649cb720716f86ec5b75d86ce. I was careless when cherry-picking the reverted commit - the only effect it had was add an unnecessary libavutil dependency to a HOST_CC compiled file.
* codec-cfg.c: avoid including aviheader.hGravatar reimar2011-07-06
| | | | | | | | | | Avoid including aviheader.h only for mmioFOURCC, it has too many dependencies, including even subreader.h and via that fribidi. This causes issues both when cross-compiling and for CODEC2HTML compilation, so instead use avutil.h/MKTAG. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@33649 b3059339-0415-0410-9bf9-f77b7e298cf2
* video/colorspaces: add new 9/10-bit formats from libavcodecGravatar Uoti Urpala2011-06-26
| | | | | | | Add new internal 9/10-bit IMGFMT values and mappings to the corresponding libav* PIX_FMT_* values. Partially based on a patch from Arne Bochem <arneb.mp@ccan.de>.
* cleanup: remove more warningsGravatar Clément Bœsch2011-05-02
|
* vo_zr2: drop Zoran supportGravatar Uoti Urpala2011-01-31
| | | | | | | There were multiple files specific to Zoran support, and they also depended on internal FFmpeg headers (so it would probably have been hard to get them to compile now even if you tried). It's obsolete now, so just drop the whole mess.
* cleanup: don't check for NULL before free()Gravatar diego2010-11-08
| | | | | | patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32598 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove #warning preprocessor directivesGravatar diego2010-11-02
| | | | | | | | The #warning preprocessor directive is non-standard and not available with all compilers. Furthermore, the warnings it causes are noisy and have not led to getting any of the underlying issues fixed in the space of a decade. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32480 b3059339-0415-0410-9bf9-f77b7e298cf2
* codec-cfg.c: Remove unused parsehtml parameters.Gravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31475 b3059339-0415-0410-9bf9-f77b7e298cf2
* codec-cfg.c: Add static to functions used only locally.Gravatar reimar2010-11-02
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31474 b3059339-0415-0410-9bf9-f77b7e298cf2
* codec-cfg: set CODEC_CFG_MIN to the release value in codecs.confGravatar reimar2010-11-02
| | | | | | | 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
* Merge svn change r31134Gravatar Uoti Urpala2010-05-07
|\ | | | | | | Fix some search/replace errors introduced in the svn commit.
| * the great MPlayer tab removal: part IIGravatar diego2010-05-03
| | | | | | | | | | | | | | 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
* | Delete things related to old translation systemGravatar Uoti Urpala2010-03-10
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30475Gravatar Uoti Urpala2010-03-09
|\|
| * Add license header to all top-level files missing them.Gravatar diego2010-01-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30471 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30165Gravatar Uoti Urpala2010-01-08
|\|
| * Add support for YUV format with alpha and fix the codecs.conf entry for vp6aGravatar reimar2009-12-31
| | | | | | | | | | | | | | | | to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/ git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30157 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 16-bit per component YUV formats.Gravatar reimar2009-12-31
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30152 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for 440p colorspace.Gravatar reimar2009-12-30
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30140 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Support VDPAU MPEG4 hardware decodingGravatar Uoti Urpala2009-11-16
| | | | | | | | Original patch by NVIDIA.
| * Support VDPAU hardware accelerated decoding of MPEG-4 ASP on capableGravatar cehoyos2009-11-10
| | | | | | | | | | | | | | | | | | hardware. Original patch by NVIDIA corporation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29885 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Gravatar Uoti Urpala2009-08-18
|\|
| * make codec-cfg reuse the proper defined constants for all RGB/BGR formatsGravatar reimar2009-08-12
| | | | | | | | | | | | | | instead of re-constructing them itself. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29501 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 100l, fix compilation again and make codec-cfg.c use the predefined constantsGravatar reimar2009-08-12
| | | | | | | | | | | | | | instead of reimplementing the IMGFMT_RGB|bit_depth logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * s/RG48xE/RGB48xEGravatar cehoyos2009-08-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29496 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Explain how formats must be ordered in fmt_list so the parser can handleGravatar reimar2009-08-11
| | | | | | | | | | | | | | names where one matches the beginning of another. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29492 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fmt_table should be const as well.Gravatar reimar2009-08-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29491 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Allow out-formats for IMGFMT_RGB48* in codecs.conf.Gravatar cehoyos2009-08-11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29488 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesGravatar Uoti Urpala2009-07-07
| |
* | Translation system changes part 2: replace macros by stringsGravatar Amar Takhar2009-07-07
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsGravatar Amar Takhar2009-07-07
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Add temporary no-op translation function stubsGravatar Uoti Urpala2009-07-06
| |
| * whitespace cosmetics: Remove all trailing whitespace.Gravatar diego2009-05-13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29277Gravatar Uoti Urpala2009-05-08
|\|
| * Change type of first argument of the print_int_array function from int toGravatar diego2009-04-09
| | | | | | | | | | | | | | | | unsigned int, fixes warnings of the type: codec-cfg.c:1031: warning: pointer targets in passing argument 1 of 'print_int_array' differ in signedness git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29155 b3059339-0415-0410-9bf9-f77b7e298cf2
* | codec-cfg.c: Remove bogus printf argumentGravatar Uoti Urpala2009-03-07
| | | | | | | | | | Two printf calls had a bogus argument that did not match the format string. Remove.
* | Merge svn changes up to r28862Gravatar Uoti Urpala2009-03-07
|\|
| * Remove unnecessary linking hack, compilation works fine without.Gravatar diego2009-03-01
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28782 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28610Gravatar Uoti Urpala2009-02-16
|\|
| * Add support for image formats and codecs used by VDPAUGravatar reimar2009-02-14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28551 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Makefile, codec-cfg.c: Don't use EXTRA_INC flags for codec-cfg compileGravatar Uoti Urpala2008-12-02
|/ | | | | | | | codec-cfg runs on the host system but EXTRA_INC can have target system paths. The EXTRA_INC was added there for shared libavutil support. Copy the one #define codec-cfg.c needs from libmpdemux/aviheader.h (which in turn needed libavutil) instead of including the header, and drop the EXTRA_INC flags.
* Rename two GUI-related preprocessor directives:Gravatar diego2008-07-30
| | | | | | | HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27375 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix codec-cfg-test compilation.Gravatar diego2008-05-27
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26880 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add missing #includes to pass 'make checkheaders' to codecs.conf.h.Gravatar diego2008-04-09
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26364 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l, free strdup'd stringsGravatar reimar2008-01-12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25691 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 07:36:33 +0000