summaryrefslogtreecommitdiffstats
path: root/mpvcore
Commit message (Collapse)AuthorAgeFilesLines
* configure: uniform the defines to #define HAVE_xxx (0|1)Stefano Pigozzi2013-11-0314-132/+132
| | | | | | | | | | | | | | | | | | | | | The configure followed 5 different convetions of defines because the next guy always wanted to introduce a new better way to uniform it[1]. For an hypothetic feature 'hurr' you could have had: * #define HAVE_HURR 1 / #undef HAVE_DURR * #define HAVE_HURR / #undef HAVE_DURR * #define CONFIG_HURR 1 / #undef CONFIG_DURR * #define HAVE_HURR 1 / #define HAVE_DURR 0 * #define CONFIG_HURR 1 / #define CONFIG_DURR 0 All is now uniform and uses: * #define HAVE_HURR 1 * #define HAVE_DURR 0 We like definining to 0 as opposed to `undef` bcause it can help spot typos and is very helpful when doing big reorganizations in the code. [1]: http://xkcd.com/927/ related
* Fix some more -Wshadow warningswm42013-11-012-13/+13
| | | | | | These aren't printed with newer gcc or clang versions for some reason. All of them seem to be about local variables shadowing global functions.
* tl_matroska: initialize segment related arrays with 0wm42013-11-011-4/+6
| | | | | | | | | | | | | mpv crashed when linked files were not found. The reason was that the chapters array contained some uninitialized data. I have no idea how this code works (after the merge). The old code actually seems to remove missing chapters, while the new code just leaves them unintiialized. Work around the crash by initializing the chapters array (and a bunch of other things) with 0, which means the missing chapter will be located at 00:00:00 and have no name. There is a regression since commit af0306d.
* video: check profiles with hardware decodingwm42013-11-012-0/+4
| | | | | | | | | | | | | | | We had some code for checking profiles earlier, which was removed in commits 2508f38 and adfb71b. These commits mentioned that (working) hw decoding was sometimes prevented due to profile checking, but I can't find the samples anymore that showed this behavior. Also, I changed my opinion, and I think checking the profiles is something that should be done for better fallback to software decoding behavior. The checks roughly follow VLC's vdpau profile checks, although we do not check codec levels. (VLC's profile checks aren't necessarily completely correct, but they're a welcome help anyway.) Add a --vd-lavc-check-hw-profile option, which skips the profile check.
* Enable -Wshadowwm42013-11-011-2/+2
| | | | | | | | | This one really did bite me hard (see previous commit), so enable it by default. Fix some cases of shadowing throughout the codebase. None of these change behavior, and all of these were correct code, and just tripped up the warning.
* options: fix positional suboption asrgumentswm42013-11-011-2/+2
| | | | | | | | | E.g. "-vf scale=848:480" set the w argument twice, instead of setting w and then h. This was caused by accidental shadowing of a local variable. Regression since probably 4cd143e.
* input: show deprecation warnings for some recently replaced commandswm42013-11-011-4/+4
| | | | Let's see if I get annoyed reactions...
* command: replace speed_mult with multiply commandwm42013-10-313-10/+1
| | | | The compatibility layer still takes care of the old speed_mult command.
* command: add generic "multiply" commandwm42013-10-315-0/+82
| | | | Essentially works like "add".
* command: add property to scale window sizewm42013-10-311-0/+35
|
* main: improve a terminal messagewm42013-10-301-1/+1
| | | | Better prefer real English...
* player: merge mp_osd.h into mp_core.hwm42013-10-307-59/+33
| | | | | | | | Just doing this because mp_osd.h and osd.c is not consistent. There are some other header files (command.h and screenshot.h), but since I don't feel too good about inflating mp_core.h, I'm not merging them, at least not yet.
* mp_core: sort function prototypes by source filewm42013-10-301-58/+68
| | | | | | | I considered making a header file for each .c file, but decided against it. Asking around, not making separate headers was deemed acceptable. In the end, all of these depend on MPContext and store state inside of it, so separate headers aren't all that useful anyway.
* Split mplayer.cwm42013-10-3016-5083/+5391
| | | | | | | | | | | | | | | | | | | | mplayer.c was a bit too big. Split it into multiple files. I hope the way it's split makes sense. Maybe some things don't make too much sense, or go against intuition. These will fixed as soon as I notice them. Some files are a bit questionable (misc.c, osd.c, configfiles.c), and suggestions how to organize this better are welcome. Regressions are possible due to reorganized include statements. Obviously I didn't just copy mplayer.c's orgy of include statements, but recreated them for each file. It's easily possible that there are oversights and mistakes, which will show up on other platforms. There is one actual change: the public avutil.h include is removed from encode.h, and I tried to replace most FFMIN/FFMAX/av_clip uses. I consider using libavutil too much as dangerous, because the set of include files they recursively pull in is rather arbitrary and is different between FFmpeg and Libav.
* Move files part of the playback core to player sub-directorywm42013-10-3016-33/+31
| | | | | | | | All these files access mp_core.h and MPContext, and form the actual player application. They should be all in one place, and separate from the other sources that are mere utility helpers. Preparation for splitting mplayer.c into multiple smaller parts.
* mplayer: handle subtitle renderer cleanup via uninit_playerwm42013-10-282-10/+24
| | | | | | | | | This might actually fix an issue with DVB channel switching, because that uses some sort of hack to reinitialize the demuxer, which causes the subtitle renderer to initialize twice. As consequence, the assert in add_subtitle_fonts_from_sources() would trigger. I didn't actually test the DVB case, because I don't have the hardware.
* command: disable autorepeat for some commands (actually properties)wm42013-10-283-5/+29
| | | | | | | | | | | | Disable autorepeat for the "add"/"cycle" commands when changing properties that are choices (such as fullscreen, pause, and more). In these cases, autorepeat is not very useful, and can rather harmful effects (like triggering too many repeated commands if command execution is slow). (Actually, the commands are just dropped _after_ being repeated, since input.c itself does not know enough about the commands to decide whether or not they should be repeated.)
* command: don't include stream_dvd.hwm42013-10-271-3/+0
|
* af: replace macros with too generic nameswm42013-10-262-1/+2
| | | | | | | | Defining names like min, max etc. in an often used header is not really a good idea. Somewhat similar to MPlayer svn commit 36491, but don't use libavutil, because that typically causes us sorrow.
* mpvcore: add a note about desync on track switchesBen Boeckel2013-10-261-0/+1
|
* osc: display cache status only below 45%ChrisK22013-10-261-1/+1
| | | | | Turnes out, when playing stuff over WiFi, the cache may go below 48% quite frequently.
* osc: fix bug for no-duration casesChrisK22013-10-261-1/+1
|
* osc: add experimental seekbar tooltipChrisK22013-10-261-6/+46
| | | | | | Not up to my quality standards (need ASS boundingboxes), so disabled by default and undocumented for now. Can be enabled with seektooltip=yes in plugin_osc.conf
* osc: make sure the OSC actually fits into the videoChrisK22013-10-261-1/+7
|
* options: don't let watch_later etc. overwite command line optionswm42013-10-254-24/+46
| | | | | | | | | | | | | | | There are certain cases where mpv will automatically set options, such as per-file configs, per protocol/VO/AO/extension profiles, and watch_later resume configs. All these were overwriting the user's options, even when they were specified on command line. Add something that explicitly preserves command line options. This means you can now actually use the command line to override any options that the playback resume functionality backups and restores. It still happily overrides options set at runtime (e.g. changed via properties while playing a file; then playing the next file might override them again), but maybe that's not a problem with typical use.
* mplayer: make --length relative to actual start of file, instead of 0wm42013-10-251-1/+2
| | | | | We always use the file's timestamps, so the start time can be easily something different from 0. Make the --length option respect this.
* m_config: slightly improve name handlingwm42013-10-252-16/+10
|
* m_config: remove unused fieldswm42013-10-252-9/+1
| | | | | We don't need that anymore, because the old way to get default values by recreating the m_config is gone.
* m_config: allow not allocating option struct, and use itwm42013-10-253-8/+23
| | | | | | | In cases we're just listing options or checking their values (as it happens with -vo/-vf etc. suboption parsing), we don't need to allocate abd initialize the actual option struct. All we're interested in is the list of options.
* m_config: refactor option defaults handlingwm42013-10-245-65/+53
| | | | | | | | | | | | | Keep track of the default values directly, instead of creating a new instance of the option struct just to get the defaults. Also get rid of the special handling of m_obj_desc.init_options. Instead, handle it purely by the option parser. Originally, I wanted to handle --vo=opengl-hq and --vo=direct3d_shaders with this (by making them aliases to the real VOs with a different preset), but since --vo =opengl-hq=help prints the wrong values (as consequence of the simplification), I'm not doing that, and instead use something different.
* options: fix bogus entrywm42013-10-241-1/+1
| | | | | This didn't make sense and caused issues with the following commit: if it's an option with a data pointer, it should be writable.
* m_config: don't require dragging along parent in initializationwm42013-10-241-14/+19
| | | | | | Instead, track the opstruct explicitly. It turns out we don't need the parent at all. Also, add something rudimentary to track the default values.
* m_config: minor simplificationwm42013-10-241-9/+7
| | | | I think in this case, having a separate function is confusing.
* m_config: store m_config_options in an array instead of a listwm42013-10-242-47/+39
| | | | | | | | Might reduce memory overhead, and is also less annoying. Since pointers to m_config_options are kept around, this assumes they're added only during initialization. Otherwise you'd get dangling pointers.
* m_config: refactor initialization, reduce amount of malloc'ed stringswm42013-10-242-48/+46
| | | | | Allocate strings only if needed (when we have to prefix sub-options). Prepare for storing m_config_options in an array instead of a list.
* m_config: slightly simplify dynamic option initializationwm42013-10-241-2/+1
| | | | | | We can assume memcpy is enough, because the source should be from static data. (It wouldn't work if the data could contain pointers back into itself.)
* m_config: don't allow aliasing with string optionswm42013-10-241-12/+7
| | | | | | Minor simplification. String options are now not allowed to use the same variable/field anymore. (Also affects other "dynamic" options which require memory allocation.)
* m_config: cosmetics: make code less verbosewm42013-10-241-7/+2
|
* audio/out: remove useless info struct and redundant fieldswm42013-10-231-7/+2
|
* audio/filter: split af_format into separate filters, rename af_forcewm42013-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af_format is the old audio conversion filter. It could do all possible conversions supported by the audio chain. However, ever since the addition of af_lavrresample, most conversions are done by libav/swresample, and af_format is used as fallback. Separate out the fallback cases and remove af_format. af_convert24 does 24 bit <-> 32 bit conversions, while af_convertsignendian does sign and endian conversions. Maybe the way the conversions are split sounds a bit odd. But the former changes the size of the audio data, while the latter is fully in-place, so there's at least different buffer management. This requires a quite complicated algorithm to make sure all these "partial" conversion filters can actually get from one format to another. E.g. s24le->s32be always requires convertsignendian and convert24, but af.c has no idea what the intermediate format should be. So I added a graph search (trying every possible format and filter) to determine required format and filter. When I wrote this, it seemed this was still better than messing everything into af_lavrresample, but maybe this is overkill and I'll change my opinion. For now, it seems nice to get rid of af_format though. The AC3->IEC61937 conversion isn't supported anymore, but I don't think this is needed anywhere. Most AOs test all formats explicitly, or use the AF_FORMAT_IS_IEC61937() macro (which includes AC3). One positive consequence of this change is that conversions always include dithering (done by libav/swresample), instead of possibly going through af_format, which doesn't do anything fancy. Rename af_force to af_format. It's essentially compatible with command line uses of af_format. We retain a compatibility alias for af_force.
* mplayer: don't call libquvi for local fileswm42013-10-201-0/+2
| | | | | | | | | | | This is obviously not needed, and just creates potential for bad breakages (e.g. what happens if libquvi tries to open a normal filename as http URL?). Note that for simplicity, we still pass file:// URIs to quvi, and we don't exclude other protocol prefixes either. In general, we don't know what protocols quvi might support, so we don't try to second-guess it. (Even though in practice, it's probably only "http" and "https".)
* input: fix --input-ar-rate=0wm42013-10-201-1/+1
| | | | Crashed, instead of disabling auto-repeat.
* tl_matroska: fix use-after-free with --cachewm42013-10-191-3/+3
| | | | | | | | | | If cache was enabled, using ordered chapters could easily crash. The reason is that enable_cache() reopens the demuxer and closes the old one. The code after that (reading m->ordered_chapters etc.) then accessed freed data. This commit also avoids enabling cache for files which are not used (which would make opening much slower).
* mp_talloc: simplify a bitwm42013-10-191-8/+6
| | | | | | | | | | | | | | Implement MP_GROW_ARRAY using MP_TARRAY_GROW. MP_GROW_ARRAY is basically the earlier version of MP_TARRAY_GROW, and had different semantics. When I added MP_TARRAY_GROW, I didn't dare to change it, but I think all code that relied on the exact semantics of MP_GROW_ARRAY is gone now, or the difference doesn't matter anyway. The semantic change is that now (n+1)*2 elements are preallocated instead of n*2. Also, implement MP_TARRAY_GROW using MP_RESIZE_ARRAY, which saves 1 line of code. In future, these macros should be part of TA.
* mp_msg: remove gettext() supportwm42013-10-182-86/+2
| | | | | | | | | Was disabled by default, was never used, internal support was inconsistent and poor, and there has been virtually no interest in creating translations. And I don't even think that a terminal program should be translated. This is something for (hypothetical) GUIs.
* mplayer: mp_msg replacementswm42013-10-181-95/+83
| | | | Not 100% complete; not touching the more complicated cases.
* osc: make transparency of background-box configurableChrisK22013-10-181-2/+3
| | | | see boxalpha option
* Merge Matroska ordered chapter changeswm42013-10-171-96/+295
|\ | | | | | | | | | | | | This adds support for ChapterSegmentEditionUID (pull request #258), and also fixes issue #278 (pull request #292). In fact, this is a straight merge of pr/292, which also contains pr/258.
| * matroska: don't add time for chapters without a sourceBen Boeckel2013-10-151-0/+3
| |
| * matroska: log about where missing time comes fromBen Boeckel2013-10-151-4/+21
| |
| * matroska: only error if at least a millisecond is missingBen Boeckel2013-10-151-1/+4
| |
| * matroska: account for missing information from short sourcesBen Boeckel2013-10-151-2/+31
| | | | | | | | | | If a source is shorter than the requested chapter length, account for the time missing.
| * matroska: modify chapter limits by join_diffBen Boeckel2013-10-151-9/+23
| | | | | | | | | | | | When adding or removing frames to avoid 1-frame seeks on chapter boundaries, the end of the chapter needs to be pushed or pulled by the same amount to keep the intended end frame the same.
| * matroska: use memmove when collapsing the source list downBen Boeckel2013-10-081-1/+1
| |
| * matroska: avoid requesting the same source multiple timesBen Boeckel2013-10-081-0/+18
| |
| * matroska: support chapter references to ordered editionsBen Boeckel2013-10-081-7/+51
| | | | | | | | | | | | Since ordered editions can reference external files, when an ordered chapter references another ordered edition, we have to go and figure out what is is referencing as well.
| * matroska: recursively search for referenced segmentsBen Boeckel2013-10-081-30/+50
| | | | | | | | | | | | | | When playing a Matroska file with ordered chapters, it may reference another file by edition uid. When this edition is also ordered, it may reference other files. When this occurs, the new segment/edition pair is added to the list of sources to search for.
| * matroska: refactor ordered chapter timeline buildingBen Boeckel2013-10-071-63/+103
| | | | | | | | | | This will need to be recursive to support chapters referencing ordered editions in other files.
| * matroska: select the edition using the requested edition uidBen Boeckel2013-10-071-3/+10
| |
| * matroska: store segment/edition uids in a single structureBen Boeckel2013-10-071-20/+24
| | | | | | | | | | | | To support edition references in matroska chapters, editions need to be remembered for each chapter and source. To facilitate easier management of these now-paired uids, a single structure is used.
* | spelling fixesAlessandro Ghedini2013-10-161-3/+3
| |
* | osc: fix borked optionsChrisK22013-10-151-13/+13
| |
* | osc docs: Add documentation for OSC and rename some optionsChrisK22013-10-151-6/+6
| | | | | | | | camelCase from some of the option names removed. If you were using those, you'll have to update them in your config.
* | osc: reset mouse position when leaving windowChrisK22013-10-151-4/+9
| | | | | | | | and store it freshly on first mouse_move event when entering again
*