summaryrefslogtreecommitdiffstats
path: root/mpvcore
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | osc: Don't create a config if none exists.ChrisK22013-10-151-19/+14
| | | | | | | | A documentation explaing where and how to create one instead will follow.
* | osc: use "info" instead of "warn" for config file creation messagewm42013-10-141-1/+1
| | | | | | | | | | When the main mpv config file, "info" is used, so this makes things consistent.
* | parser-cfg: allow putting options with leading "--"wm42013-10-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | Now you can pretend the config file is quite literally command line values dumped into a file, e.g. --option1=value --option2=value ... although the underlying mechanisms are quite different.
* | parser-cfg: use bstr everywhere after parsing stagewm42013-10-143-7/+8
| | | | | | | | | | | | Until now it used both char[] and bstr variants in the same code, which was nasty. For example, the next commit would have additionally required using memmove() to remove the prefix from the char[] string.
* | options: enable OSC by defaultwm42013-10-141-0/+1
| | | | | | | | Can can disable it with --osc=no.
* | mplayer: escape strings if needed when writing watch_later configwm42013-10-141-2/+19
| | | | | | | | | | | | | | | | | | This fixes handling of e.g. "--vf=lavfi=[ noise ]" when used with playback resume functionality. The spaces made it bug out, and there are more cases where it could potentially break. We could always escape for simplicity, but for now make old and new mpv builds somewhat interoperable and use this new escaping only if needed.
* | parser-cfg: parse % escapeswm42013-10-141-7/+31
| | | | | | | | | | | | | | | | | | | | This parses "%len%string" escapes, where string can contain any characters. This method of escaping has also been used in other parts of mplayer and mpv, so it's not a new idea. (Also, don't confuse with URL encoding.) Needed by the following commit.
* | mplayer: print ffmpeg library versions along with mpv version infowm42013-10-143-16/+33
| | | | | | | | | | | | | | | | | | | | Also change what the FFmpeg version info looks like, and additionally dump lavfi/lavr/lswr versions. (Don't bother with libavdevice and libpostproc, they're not important enough.) Unfortunately, there's no "single" FFmpeg/Libav version due to fatal braindeath on the FFmpeg/Libav side. We can't map the versions to releases either (it simply isn't accessible anywhere).
* | osc: raise minmousemove default setting to 3 and disable input mouse area ↵ChrisK22013-10-141-6/+11
| | | | | | | | | | | | when OSC not visible The mouse area that covers the OSC is now only activated when the OSC is actually visible, to make sure the mouse still hides if it happens to be parked in the OSC area without making the OSC show up.
* | mplayer, vo_image: simplify OSD redrawing, fix vo_image crashwm42013-10-131-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vo_image didn't handle OSD redrawing correctly anymore after OSD redrawing behavior was changed in commit ed9295c (or maybe it has been a problem for a longer time, and only showed up now). Basically, flip_page was called unexpectedly and when no image was stored, which made it crash trying to access the image. This could happen when for example provoking OSD redrawing by pausing while using --vo=image, or by using this command line: mpv --vo=image '-vf=lavfi="select=not(mod(n\,3))"' Fix by removing the code that pretends vo_image can redraw OSD, and by removing the framestepping fallback, which could make bad things happen if the VO didn't support OSD redrawing. By now, there aren't any real VOs that can't redraw the OSD properly, so this code is not needed and just complicates things like vo_image. This change likely will also be useful for vo_lavc (encoding).
* | mplayer: print a warning if libass is not compiledwm42013-10-131-0/+3
| | | | | | | | | | | | Libass is technically an optional dependency, but in practice users tend to disable libass accidentally or for the hell of it to get something "minimal", without being aware of the consequences.
* | osc: fix mouse hidingChrisK22013-10-131-2/+2
| |
* | osc: Once again new Show/Hide handlingChrisK22013-10-131-7/+34
| | | | | | | | | | | | | | The deadzone-size is now by default zero, so movement on the entire window will make the OSC show up. To avoid it showing up by randomly moving mice, the option 'minmousemove' controls how many pixels movement (default: 1) between ticks (frames) are necessary to make the OSC show up. The deadzone can be reenabeled by setting the option 'deadzonesize' (default: 0 = no deadzone, 1 = entire area between OSC and opposite window border), to restore the old behavior, set it to ~0.92. The OSC will hide immediately when leaving the window or entering the deadzone (if existing) or after the time specified with 'hidetimeout' (default: 500ms) passed without any new movement. Set to negative value to disabling auto-hide (thus restoring old behavior). The OSC will never hide if hovered by the mouse.
* | talloc: change talloc destructor signaturewm42013-10-131-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Change talloc destructor so that they can never signal failure, and don't return a status code. This makes our talloc copy even more incompatible to upstream talloc, but on the other hand this is preparation for getting rid of talloc entirely. (The talloc replacement in the next commit won't allow the talloc_free equivalent to fail, and the destructor return value would be useless. But I don't want to change any mpv code either; the idea is that the talloc replacement commit can be reverted for some time in order to test whether the talloc replacement introduced a regression.)
* | command: preferably show "add"/"cycle"/"set" command errors on OSDwm42013-10-121-10/+10
| | | | | | | | | | | | Before this, they were shown on terminal only. Now they use the OSD mechanism, which shows them on the video window or the terminal, depending on settings and what's available.
* | command: don't allow changing volume if no audio initializedwm42013-10-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing volume when audio is disabled was a feature request (github issue #215), and was introduced with commit 327a779. But trying to fix github issue #280 (volume is not correct in no-audio mode, and if audio is re-enabled, the volume set in no-audio mode isn't set), I concluded that it's not worth the trouble and the current implementation is questionable all around. (For example, you can't change the real volume in no-audio mode, even if the AO is open - this could happen with gapless audio.) It's hard to get right, and the current mixer code is already hilariously overcomplicated. (Virtually all of mixer.c is an amalgamation of various obscure corner cases.) So just remove this feature again. Note that "options/volume" and "options/mute" still can be used in idle mode to adjust the volume used next time, though these properties can't be used during playback and thus not in audio-only mode. Querying the volume still "works" in audio-only mode, though it can return bogus values.
* | playlist: check for NULL on caller sitewm42013-10-122-2/+3
| | | | | | | | | | Letting some playlist functions randomly accept NULL, while others do not isn't such a good idea.
* | options: --loop=N means playback N times, not N+1 timesPhilip Sequeira2013-10-122-4/+4
| | | | | | | | | | | | | | | | | | | | The argument or this change is that --loop should set how often the file is played, not the number of additional repeats. Based on pull request 277, with additions to the manpage and removal of "--loop=0". Signed-off-by: wm4 <wm4@nowhere>
* | libquvi9: work around insane interaction between libquvi and libkdecorewm42013-10-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The primary effect of this commit is that it fixes playback resume if libquvi 0.9 and German locale are used, and libkdecore is on the system. (See github issue #279.) libquvi uses libproxy to determine system-wide proxy settings. libproxy in turn loads libkdecore (if present) to determine KDE proxy settings. libkdecore has a global constructor, which calls setlocale(LC_ALL, ""), switching the current locale from "C" to what the user's settings. This breaks some basic C string processing functions. Note that the locale won't be set on program start, but only when libproxy calls dlopen() on its config_kde module, which actually causes libkdecore to be loaded and initialized. In particular, with German locale, snprintf() would use "," instead of "." when formatting float values, which in combination with playback resume, would lead to parse errors the next time mpv was started, which is how this issue was found. I'd consider this a bug with libkdecore or at least libproxy. No library should ever even touch locale: it might break basic expectations on C string handling functions, might override program settings, and it's not thread-safe. But this is so nasty and severe, that a quick hack to fix it hurts less. See github issue #279 and KDE bug #325902.
* | mpvcore/playlist.c: Avoid NULL reference in playlist_add_base_path()Mohammad Alsaleh2013-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | Before this patch, those will cause a crash: mpv -playlist /dev/null mpv -playlist <(bla) # if the result of bla is empty Signed-off-by: Mohammad Alsaleh <CE.Mohammad.AlSaleh@gmail.com> Signed-off-by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
* | mp_ring: fix mp_ring_read_cb() when read wraps aroundWilliam Light2013-10-081-2/+10
| | | | | | | | | | | | previously, mp_ring_read_cb() would allow reading past the end of the ringbuffer when buffered > available. mp_ring_read() had logic for splitting the read into two, which I duplicated into mp_ring_read_cb().
* | command: sub_seek: avoid getting stuckwm42013-10-071-0/+5
|/ | | | | | | | | First, don't try to seek if the result is 0 (i.e. nothing found, or subtitle event happens to be exactly on spot). Second, since we never can make sure that we actually seek to the exact subtitle PTS (seeking "snaps" to video PTS), offset the seek by 10ms. Since most subtitle events are longer than 10ms, this should work fine.
* osc: Okay, don't multiply the cache valueChrisK22013-10-071-5/+1
| | | | As expected, this is not liked.
* osc: Display cache fill statusChrisK22013-10-071-1/+21
| | | | | | The OSC will now display cache fill status between the timecodes, but only if it's below 48% to not clutter the interface with erratically changing values. By default, the displayed value is multiplied by 2 to not confuse users who are unfamillar with the inner workings of the caching system. This can be disabled using the iAmAProgrammer=true setting.
* osc: Add another scale option for forced windows.ChrisK22013-10-061-3/+6
| | | | If the OSC is rendered on a forced window (by --force-window), the scale can be configured with scaleForcedWindow.
* mplayer: don't resume playlist if --no-resume-playback is usedwm42013-10-061-0/+2
|
* command: add commands for displaying overlayswm42013-10-055-4/+148
| | | | | | Requested by github issue #255. Does not work where mmap is not available (i.e. Windows).
* command: add properties for retrieving OSD dimensionswm42013-10-051-0/+23
|
* mplayer: fix some issues with playlist_prev commandwm42013-10-051-1/+9
| | | | | | | | | | | | | | | | You couldn't jump to the first entry in the playlist, if that entry was marked as "too short". But this is usually fine, because it doesn't get into the way of the user. (This feature is meant to allow being able to jump backwards through the playlist even if a file immediately stops playback right after initialization, not to prevent playing these files at all.) Also, apply the skip logic when wrapping around the playlist when going backwards. This happens with --loop, because looping pretends the playlist is infinitely repeated forwards and backwards (as long as the playlist_prev/next commands are concerned). Also add some comments.
* mplayer: fix cleanup if VO initialization failswm42013-10-051-0/+1
| | | | | Just specifying a VO that doesn't exist would make it crash. Regression caused by commit 6a0408b.
* mplayer: don't keep previous video frame with --force-windowwm42013-10-041-15/+14
| | | | | | | | | | When for example switching off the video stream, and --force-window is used, forcefully reconfigure the VO. This will reset the size, and will clear the window with black. Needed some effort, because you don't always want to clear the window on "discontinuity" points like going to a next file: this would introduce some flicker.
* command: add sub_seek input commandwm42013-10-023-6/+18
| | | | | | | Essentially reuses the sub_step command, and is subject to the same restrictions. Seems to behave a bit strange sometimes, but generally works.
* input: remove strange offset from commands enumwm