Commit Graph

1122 Commits

Author SHA1 Message Date
Karl Blomster 5acd3b2534 revert back to including ffmpeg/libav*.h
Originally committed to SVN as r2316.
2008-09-04 18:26:15 +00:00
Karl Blomster b2153dd6cf add option for ffmpegsource thread count and seek mode
Originally committed to SVN as r2314.
2008-09-03 21:22:33 +00:00
Karl Blomster 3e13ef206f fix vfr handling for the ffmpegsource video provider, entire thing should be considered working now
Originally committed to SVN as r2313.
2008-09-03 21:03:18 +00:00
Karl Blomster 98341f62be add vfr handling (broken) and keyframe reading (works) to the ffmpegsource video provider
Originally committed to SVN as r2312.
2008-09-03 20:27:50 +00:00
Karl Blomster d8c8d47e4c new video provider: ffmpegsource
Originally committed to SVN as r2310.
2008-09-03 17:03:20 +00:00
Karl Blomster bf931df635 fix retarded breakage in previous commit.
Originally committed to SVN as r2304.
2008-08-14 23:49:11 +00:00
Karl Blomster d1c62c1324 Fix crash on playing video without audio loaded when using the ffmpeg providers. Patch by Manta with minor modifications by me.
Originally committed to SVN as r2303.
2008-08-14 16:10:31 +00:00
Karl Blomster 620cf44c46 sourced some error messages in the lavc video provider
Originally committed to SVN as r2302.
2008-08-14 16:06:04 +00:00
Niels Martin Hansen 8129285630 Fix #759, correctly merge lines with identical text when exporting to simple subtitle formats.
Originally committed to SVN as r2301.
2008-08-11 00:02:36 +00:00
Karl Blomster 5b38a17529 replace a bunch of magic numbers (2) with bytes_per_sample
Originally committed to SVN as r2297.
2008-08-04 08:17:35 +00:00
Karl Blomster 217c228738 misc small fixes in the ffmpeg audio provider, preparation for support of other sample formats than just 16-bit int
Originally committed to SVN as r2296.
2008-08-04 07:13:41 +00:00
Karl Blomster bc675ea7dd explicitly tell swscaler which scaling method to use (required by newer ffmpeg versions; no actual scaling is done, only colorspace conversion)
Originally committed to SVN as r2294.
2008-08-03 16:52:54 +00:00
Niels Martin Hansen 7342c2b617 Fix search/replace deleting part of line following the last match on that line. Also a minor optimisation.
Originally committed to SVN as r2280.
2008-07-23 16:09:27 +00:00
Niels Martin Hansen c3c29518d4 Untested patch: Remove all traces of the update checker from non-Windows builds, since it causes more problems than it solves on those.
Originally committed to SVN as r2277.
2008-07-22 20:55:24 +00:00
Niels Martin Hansen 741476c96d Correct spelling error
Originally committed to SVN as r2274.
2008-07-22 00:33:25 +00:00
Niels Martin Hansen 7b110725d1 Oops, r2270 broke the build, missing a backslash in a string.
Originally committed to SVN as r2271.
2008-07-20 13:45:10 +00:00
Niels Martin Hansen 30a9bdc17c Implement/fix #751 and update changelog a bit.
Originally committed to SVN as r2270.
2008-07-20 13:34:42 +00:00
Niels Martin Hansen eb5e8ea8a1 Corrections for TranStation export support. Format written was incorrect (a space placed on the wrong side of a bracket). Also added full support for alignments, and subtracting one frame from end times to avoid overlaps
Originally committed to SVN as r2269.
2008-07-18 21:10:48 +00:00
Niels Martin Hansen 94011adf93 Fix SMPTE timecode formatting, never round frame up to avoid things like frame 30 in a second in a 30 fps movie, where frame numbers go from 0 to 29.
Originally committed to SVN as r2268.
2008-07-18 20:43:07 +00:00
Niels Martin Hansen 270ca4f876 Rewrite recombining of overlapping lines for export to simple subtitle formats, and reorganisation of other functions also used in those exports
Originally committed to SVN as r2267.
2008-07-18 15:39:34 +00:00
Rodrigo Braz Monteiro 2d7b2527a7 OMFG AMZ IS ALIVE! Partial TranStation export support (SMPTE drop-frames seem to be broken, and line merging isn't working)
Originally committed to SVN as r2266.
2008-07-18 01:36:20 +00:00
Karl Blomster 0badb4059f Restructured audio providing a bit. If a provider cannot provide 16-bit mono audio with a sample rate higher than 32kHz, an intermediate converting provider will be inserted to fix it. Made the lavc audio provider rely on this for downmixing instead of doing it with libavcodec (used to fail on audio with >2 channels).
Originally committed to SVN as r2265.
2008-07-16 13:22:06 +00:00
Niels Martin Hansen 2bd33541c1 Fix #745 by explicitly setting the font name combo box value after filling it
Originally committed to SVN as r2264.
2008-07-16 12:10:00 +00:00
Niels Martin Hansen 624eb825a7 Fix #746, style editor now shows initial values in spin controls
Originally committed to SVN as r2263.
2008-07-16 11:30:53 +00:00
Niels Martin Hansen dfa3e548a0 Fix colour picker buttons in style editor by making AssColor::GetWXColor() aware that alpha has the opposite meaning in wxColour and ASS
Originally committed to SVN as r2262.
2008-07-16 01:41:33 +00:00
Niels Martin Hansen 27e35e9434 Fix current colour display in colour picker dialogue
Originally committed to SVN as r2261.
2008-07-16 01:36:38 +00:00
Niels Martin Hansen 9c51d15a99 Fix recent colours box in colour picker on Mac
Originally committed to SVN as r2260.
2008-07-16 01:29:36 +00:00
Karl Blomster e8dffb60ec add audio_provider_downmix.cpp to Makefile.am
Originally committed to SVN as r2259.
2008-07-15 22:49:02 +00:00
Karl Blomster 6bec0322e4 split out the downmixing audio provider into its own .h/.cpp, in preparation for using it in the ffmpeg audio provider.
Originally committed to SVN as r2257.
2008-07-15 21:31:09 +00:00
Niels Martin Hansen d120a4758b Fix bug #742 and possibly also #465. Needs testing on non-Mac platforms to see if there's visual glitches with video visual typesetting toolbar.
Originally committed to SVN as r2256.
2008-07-15 17:49:15 +00:00
Karl Blomster a836b89476 cosmetics and cleanup of unused code in video_provider_lavc.cpp
Originally committed to SVN as r2255.
2008-07-15 14:35:22 +00:00
Karl Blomster 904873f0d9 added option to allow potentially unsafe seeking with the ffmpeg video provider. named "ffmpeg allow unsafe seeking" and defaults to false.
Originally committed to SVN as r2254.
2008-07-15 14:24:00 +00:00
Karl Blomster cdb2227024 unbroke compilation of the directshow video provider, broke with last commit. Patch by Harukalover.
Originally committed to SVN as r2253.
2008-07-15 12:44:53 +00:00
Karl Blomster 893ff2f78a Major rewrite of the video providing system. Hilights:
- It is now the responsibility of each video provider to provide a list of keyframe positions and (if it can) timecodes.
- The ffmpeg video provider now indexes files before opening them and does no longer rely on stream->duration to determine the number of frames. Fixes opening of MKV files, but it does not (currently) open timecodes automatically and reported keyframe positions seem way off. Status of frame-accuracy with MKV files unknown but it may very well work.
- Modified the way the ffmpeg video provider seeks (inspired by code from Myrsloik's ffmpegsource). Should no longer lose the first frame and should also no longer be frame-inaccurate, at least not with AVI.
- DirectShow video provider may or may not be completely broken, not tested.

Originally committed to SVN as r2252.
2008-07-15 00:08:05 +00:00
Karl Blomster 7e2b6afdf1 typo fix (patch by Harukalover)
Originally committed to SVN as r2251.
2008-07-14 22:56:49 +00:00
Karl Blomster 11f316c180 cosmetics and minor adjustments to ffmpeg keyframe reader
Originally committed to SVN as r2249.
2008-07-14 00:07:21 +00:00
Karl Blomster 32f7a53a68 vastly improved keyframe reading with ffmpeg, should be much faster and more reliable.
Originally committed to SVN as r2248.
2008-07-13 23:45:42 +00:00
Niels Martin Hansen 32cc996ce6 Harukalover's patch for bug #740
Originally committed to SVN as r2246.
2008-07-13 15:06:29 +00:00
Karl Blomster 46a6924531 added support for DivX (6.x and possibly 5.x) and x264 2-pass stats file to keyframe reader.
patch by Harukalover, see bugtracker issue #736.

Originally committed to SVN as r2244.
2008-07-09 16:48:19 +00:00
Niels Martin Hansen 923b347356 Some more checking in PCM provider. Had apparently missed a way EnsureRangeAceesibleble() could fail. This means of failure should no longer be possible.
Originally committed to SVN as r2240.
2008-07-05 12:50:49 +00:00
Karl Blomster 51c9856160 clarified downmixing error in ffmpeg audio provider
Originally committed to SVN as r2239.
2008-07-05 11:29:42 +00:00
Niels Martin Hansen 484a179798 Forgot to change the include guard when renaming the file, so <endian.h> defined _ENDIAN_H on some systems and thus aegisub_endian.h had no effect.
Originally committed to SVN as r2238.
2008-07-04 12:36:10 +00:00
Niels Martin Hansen 3d13fcfe5f Fix some minor warnings when building on GCC.
Originally committed to SVN as r2237.
2008-07-04 12:34:02 +00:00
Karl Blomster e26b9fe0d5 overhaul of audio_provider_lavc.cpp. should fix the infamous skewing issue, tested and works on windows at least.
Originally committed to SVN as r2236.
2008-07-04 12:04:10 +00:00
Niels Martin Hansen d01b4ec3e9 Yet some more sanity/error checking, although it should never be triggered.
Originally committed to SVN as r2235.
2008-07-04 11:59:28 +00:00
Niels Martin Hansen 0d56463aa4 A bit additional commenting and sanity checking in PCM provider.
Originally committed to SVN as r2234.
2008-07-04 11:37:45 +00:00
Karl Blomster a1574d0a5f milisecond -> millisecond (patch by harukalover)
Originally committed to SVN as r2233.
2008-07-04 03:40:57 +00:00
Niels Martin Hansen 155388b456 Add secret option to disable use of the PCM provider, mainly intended for debugging: "Audio Disable PCM Provider" (default is false ie. PCM provider enabled)
Originally committed to SVN as r2232.
2008-07-04 03:24:25 +00:00
Niels Martin Hansen 2c7da25e91 Avoid strncmp() for checking fourCC codes and use a handcrafted function for it instead. Also add some assertions for null pointer checks.
Originally committed to SVN as r2231.
2008-07-04 03:06:55 +00:00
Niels Martin Hansen a4fc3e8b13 Use compiler-specific defines when building universal for OS X to detect correct endianness and avoid using dynamic endian code for no reason.
Originally committed to SVN as r2230.
2008-07-04 01:05:16 +00:00