aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* matroska: add new parsing codeGravatar Uoti Urpala2010-01-27
| | | | | | | | | | | | | | | Add a new EBML parser implementation that should allow significant improvements to the Matroska demuxer. The new parsing code is not actually used yet by the demuxer. The only changes to existing code in this commit are to generate the MATROSKA_ID_* / EBML_ID_* macro definitions from the new implementation and to rename some of them (the new implementation uses names matching the official Matroska spec). The main parser implementation is added in ebml.c. There are two new generated files, ebml_defs.c and ebml_types.h, that contain definitions of EBML elements. Those are generated by the new script TOOLS/matroska.py. There's a new Makefile target "generated_ebml" that run the script to refresh the content of the generated files.
* vd_ffmpeg: fix compilation with neither VDPAU nor XvMC enabledGravatar Uoti Urpala2010-01-21
| | | | | | | | | The get_format() function was defined under #if CONFIG_XVMC || CONFIG_VDPAU but recent commit ca217f4557c3cff4f2bf33e605ce13e662e84a92 added an unconditional reference to it, causing linking to fail with an undefined reference if neither feature was enabled. Fix by removing the #if, there's no reason reason why it would be needed.
* vd_ffmpeg: FFmpeg-mt changed has_b_frames API, updateGravatar Uoti Urpala2010-01-20
|
* vd_ffmpeg: move redundant info messages to MSGL_V levelGravatar Uoti Urpala2010-01-20
| | | | | | | | | | | | Move two messages printed when using VDPAU/XvMC to MSGL_V level: "[VD_FFMPEG] XVMC-accelerated MPEG-2.\n" "[VD_FFMPEG] Trying pixfmt=%d.\n" The first is redundant because this info is normally visible from the decoder name, and it was also incorrectly printed in the VDPAU case too. Add a different MSGL_V message for VDPAU. Also make all these messages not translatable.
* vd_ffmpeg: disable callbacks for threaded decodingGravatar Uoti Urpala2010-01-20
| | | | | | | | | | | | | | | | | | | | MPlayer's slice and direct rendering related callbacks are not safe to call from other threads, so disable those features if more than one decoding thread is specified. This should fix some issues when using threaded decoding with formats other than h264 (in the h264 case the callbacks were already disabled for other reasons). This commit moves most of the code that sets special avctx parameters for VDPAU and XvMC. Before that was done after avcodec_open() based on the selected output image format; now it's done before avcodec_open() based on the capabilities of the selected decoder. At least the code selecting the thread count must be before avcodec_open(), and I think there is no reason to try to keep the previous structure otherwise either. The image format-based approach was implemented by Reimar with the intended goal of eventually selecting between software and VDPAU decoders under one FFmpeg decoder type. I consider that goal to be questionable, and the approach certainly made the existing code significantly messier for no functionality benefit.
* stream: improve EOF handling in seeksGravatar Uoti Urpala2010-01-18
| | | | | | | | | | | | | | Reset stream 'eof' flag when a seek succeeds, and allow seeking to a position at or past EOF (in the sense that the seek succeeds and stream_tell() then returns that position). This fixes at least some demuxer problems where an attempt to read the index from the end of an incomplete file would set the 'eof' flag and cause subsequent reads to fail, even if failure to read the index would otherwise be nonfatal and demuxing could continue after seeking back. Partially based on a patch from Laurent <laurent.aml@gmail.com>.
* Avoid misleading error "ASS: cannot add video filter"Gravatar Uoti Urpala2010-01-16
| | | | | | | | | | | | | | | | | | When using libass with a VO that has direct EOSD support the vf_ass video filter is unnecessary and is not added automatically, but the code that adds the filter when it is needed produced misleading output messages in this case. The following two messages were printed at MSGL_ERR level, making it look like an error condition: Couldn't open video filter 'ass'. ASS: cannot add video filter Add a version of vf_open_plugin() called vf_open_plugin_noerr() that does not itself print an error message if opening a vf fails and that returns the exact status code returned by the vf open() function. Make vf_ass return a different status code depending on whether there was an actual error or if it determined a filter would be redundant. Use the _noerr function in the code adding the filter to avoid the first message and check the status code to avoid the second.
* subtitles: avoid running subreader.c parser when using libassGravatar Uoti Urpala2010-01-16
| | | | | | | | | When loading external subtitle files, the code always tried parsing the file with subreader.c sub_read_file() first, even if libass was then used to parse and render the file (the results of the first parsing would be ignored in that case). This could cause problems like unnecessary error messages. Change the code to try libass parsing first if enabled, and skip subreader.c parsing if that succeeds.
* subreader.c: fix excessive memory use with some external subtitlesGravatar Uoti Urpala2010-01-16
| | | | | | | | | | | | For each sequence of consecutive partially overlapping subtitles, the algorithm calculating screen positions for the subtitles allocated a 2*subtitle_count*subtitle_line_count array. With some karaoke subtitles that had lots of rapidly changing overlapping subtitles this became large enough to use gigabytes of memory. Make the behavior saner by limiting the line count to SUB_MAX_TEXT lines (the maximum number of lines to show on screen at once, currently 12). This shouldn't change the end result of the algorithm other than possibly printing different warnings.
* translations: corrently translate most OSD outputGravatar Uoti Urpala2010-01-12
| | | | | | Add various fixes needed to actually produce translated OSD output. About every OSD string that had a translation macro under the old system should be translatable now.
* translations: add infrastructure for translated OSD messagesGravatar Uoti Urpala2010-01-12
| | | | | | | Add function set_osd_tmsg() which is a version of set_osd_msg that translates its format argument. Pass OSD message strings in the command.c property_osd_display table through mp_gtext before they're used.
* taglists.c: update to match current libavformat riff.cGravatar Uoti Urpala2010-01-08
|
* Merge svn changes up to r30236Gravatar Uoti Urpala2010-01-08
|\
* \ Ignore svn changes r30217, r30218Gravatar Uoti Urpala2010-01-08
|\ \ | | | | | | | | | Already done better in git.
* \ \ Merge svn changes up to r30216Gravatar Uoti Urpala2010-01-08
|\ \ \
* \ \ \ Merge svn r30200 (reindent configure)Gravatar Uoti Urpala2010-01-08
|\ \ \ \
* \ \ \ \ Merge svn changes up to r30199Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \
* \ \ \ \ \ Ignore svn r30196Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge svn changes up to r30195Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \
* | | | | | | | vo_png: add missing "#include "fmt-conversion.h"Gravatar Uoti Urpala2010-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fmt-conversion.h is needed for imgfmt2pixfmt().
* | | | | | | | Merge svn changes up to r30187Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge svn changes up to r30185Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge svn r30174Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge svn changes up to r30173Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Ignore svn change r30166Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge svn changes up to r30165Gravatar Uoti Urpala2010-01-08
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * Implement sws_isSupportedInput() and sws_isSupportedOutput().Gravatar stefano2010-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30236 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Happy new year!Gravatar zuxy2010-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30235 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Remove const to avoid a bunch of GCC warnings against discarded qualifiers andGravatar zuxy2010-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incompatible pointer type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30234 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Avoid the error message "Unsupported PixelFormat -1" for ffh264 decodingGravatar zuxy2010-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30233 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://Gravatar reimar2010-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Simplify ffmpeg stream support, we (so far) do not need any special option ↵Gravatar reimar2010-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * add MVLZ and MVDV binary decoders to codecs.confGravatar compn2010-01-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30230 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * map zjpeg to ffmjpeg in codecs.confGravatar compn2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30229 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * add blox binary codec to codecs.confGravatar compn2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30228 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * add three ADV1 binary codecs to codecs.confGravatar compn2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30227 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Move MatrixView video output check below OpenGL check, it depends on OpenGL.Gravatar diego2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Francesco Lavra, francescolavra interfree it git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30226 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * vo_png now depends on libavcodec, not libpng.Gravatar diego2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patch by Emanuele Giaquinta, emanuele.giaquinta gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30225 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Change license terms for matrixview to GPLv2 "or later", all knownGravatar reimar2010-01-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authors have agreed to it, and current upstream (matrixgl.sourceforge.net) was already relicensed as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30224 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Remove pointless variable declaration from DirectFB check.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30223 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Add missing stdlib.h #include to fribidi check.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30222 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Remove pointless printf call in libmp3lame test.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30221 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Pass proper parameters to dlopen/dlsym/vsscanf to avoid configure test warnings.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30220 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | | * Pass a proper va_list type to vsscanf() test in configure.Gravatar diego2010-01-04
| | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the check on SuperH with CodeSourcery compilers. patch by Bill Traynor, wmat naoi ca git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30219 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | * At startup and while seeking avoid to introduce pointless sleeps and possiblyGravatar reimar2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | desync due to codec delay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30218 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | | * Also reset time_frame and next_frame_time on reset, it makes no sense toGravatar reimar2010-01-04
| | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process the sleep before playing the frame seeked to and can be annoying when the user tries to escape a series of "stuck" frames with a huge duration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30217 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | * Invoke pci_db2c.awk as an argument to awk instead of letting the shell run it.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The shell looks for awk in /usr/bin, the path from the shebang line. However, there exist systems with awk in /bin, namely archlinux. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30216 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | * cosmetics: Break multiple statements on one line apart.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30215 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | * Remove previous failed attempt at disabling that auto-generation of some C code.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts the previous buggy commit, r30094. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30214 b3059339-0415-0410-9bf9-f77b7e298cf2
| | | | | | | | | | | * Add required header #includes to satisfy 'make checkheaders'.Gravatar diego2010-01-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30213 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 12:07:19 +0000