GitHub PushEvent at 2014-06-09 16:08:31
Repository: vlc
Actor: pthom
Payload: {"shas":[["0f3515517490296ae4d381b08180d73e70877f56","15ba34d65607b85e5833f672665ef1687947d0bd@gmail.com","Subtitle delay : fixed sync problem that breaks audio under linux\n\n    This is a follow-up to a patch I made last year\n    (f7211d5efa4cd9ef392230d85fdf3470edefab39)\n    When developping it I stumbled upon a prexisting bug that I could\n    not correct at that time.\n\n     Bug reproduction steps :\n     ************************\n     *under linux* (will not happen under OSX)\n    - launch a video together with an *external* subtitle file\n      (.srt file for example),\n    - press Shift-H (\"bookmark audio time\"),\n    - wait 5 seconds\n    - press Shift-J (\"bookmark subtitle time\")\n    - press Shift-K (\"sync bookmarks\")\n    ==> the audio is broken...\n    (AFAIK this bug seems not to be mentioned on trac.videolan.org)\n\n    Correction details :\n    ********************\n    * Beware, there were two preexisting ways of dealing with subtitles :\n\t- File subtitles are handled by vlc/modules/demux/subtitle.c\n        - Other subtitles are handled by vlc/modules/codec/avcodec/subtitle.c\n    * A new variable was added : \"sub-isfilesub\".\n         - equal to 1 when the subtitle is read from a file\n           (for example a .srt file),\n         - equal to 0 otherwise (for example dvd subtitles)\n    * The subtitle delay is still stored inside \"spu-delay\".\n\n    * In the case of non file subtitles, the subtitle delay\n      is implemented as before: a change of \"spu-delay\"\n      will ultimately lead to a call to UpdatePtsDelay().\n    * In the case of file subtitles, the subtitle delay is implemented\n      inside vlc/modules/demux/subtitles.c by the function\n      adjust_subtitle_time()\n      For file subtitles, the situation is different : all subtitles\n      are already in memory, so that applying a delay is simpler.\n    * no more delay calculations inside hotkeys.c, everything is\n      handled inside vlc/modules/demux/subtitle.c through callbacks.\n     This provides a better encapsulation a prepares the addition of a\n     gui in the track synchronization window (patch to come later)\n\nNote :\n* this patch corrects the aforementioned bug\n* however the subtitles sync hotkeys which I introduced one year ago\n(Shift-H, Shift-J and Shift-K) now only work with *file subtitles*.\nThis should not be a problem, as I do not think this feature is of any use for DVD / DVB subtitles.\nIn the case of non file subtitles, they will simply not be linked to any callback.","Pascal Thomet",true],["dae9add4cc536b6e253c8585d69184847651784c","15ba34d65607b85e5833f672665ef1687947d0bd@gmail.com","Added GUI for subtitle sync in the \"Track synchronization\" window\n- 4 buttons were addd : \"bookmark audio\" / \"bookmark subtitle\" /\n                        \"sync subtitle\" / \"reset sync\"\nAdded tooltips that explain subtitle sync","Pascal Thomet",true],["ce58904112428795d7a964137800f486512449e9","15ba34d65607b85e5833f672665ef1687947d0bd@ivsweb.com","GUI for subtitle sync in the \"Track synchronization\" /  OSX : *not* done\n\nAs this file depends on Interface Builder 3, I could not update it\nin order to add the subtitle sync feature which I added in the\nQt \"Track Synchronization window\".\n\nI prefer not to mess around it, as I am not specialist enough\nwith interface builder...\n\nInstead, I added comments that explain which buttons should be added and\nwhat their behaviour should be.","Pascal Thomet",true],["006e4ca83a6fa7911a932f916c4240aed889c743","15ba34d65607b85e5833f672665ef1687947d0bd@gmail.com","Added subtitle speed","Pascal Thomet",true],["10f4590e5dcadbdf951da0c7c89b7138c902191c","15ba34d65607b85e5833f672665ef1687947d0bd@gmail.com","Added GUI in order to save adjusted subtitles\n(+ doc for Mac OSX port)","Pascal Thomet",true],["5ab0ba26d3e4967d0bfe1f1bfe1fa7dc3348b530","15ba34d65607b85e5833f672665ef1687947d0bd@gmail.com","speed osx gui correct","Pascal Thomet",true]],"size":6,"ref":"refs/heads/sync2","head":"5ab0ba26d3e4967d0bfe1f1bfe1fa7dc3348b530"}