Commit Graph

1218 Commits

Author SHA1 Message Date
Rodrigo Braz Monteiro f46200a3b6 A few more tweaks to progress dialog.
Originally committed to SVN as r2429.
2008-10-29 00:18:13 +00:00
Rodrigo Braz Monteiro acfb815484 Semi-fix for ffms2
Originally committed to SVN as r2428.
2008-10-28 04:39:10 +00:00
Rodrigo Braz Monteiro 453f3ad816 Originally committed to SVN as r2427. 2008-10-28 04:24:45 +00:00
Rodrigo Braz Monteiro 61dc57d0e1 Fixed progress dialog and ffmpegsource providers.
Originally committed to SVN as r2426.
2008-10-28 04:03:29 +00:00
Amar Takhar 2b13dfbb43 Add support for FFmpegSource2, it's enabled by default if libpostproc is there.
Originally committed to SVN as r2425.
2008-10-28 02:18:14 +00:00
Karl Blomster 94975c6869 ignore error if the ffms index file can't be written
Originally committed to SVN as r2424.
2008-10-28 01:39:42 +00:00
Rodrigo Braz Monteiro fdc7d2fd93 Updated about dialog and options.
Originally committed to SVN as r2420.
2008-10-28 00:08:52 +00:00
Rodrigo Braz Monteiro 4815c6fd34 Updated version number.
Originally committed to SVN as r2417.
2008-10-27 22:34:36 +00:00
Rodrigo Braz Monteiro 8ccb37d3db Removed distinction between normal and recommended video formats.
Originally committed to SVN as r2416.
2008-10-26 19:18:52 +00:00
Niels Martin Hansen d291871460 Revert r2210 and r2201 because those fixes to DSound player seemed to just make things more unstable.
A complete rewrite of the DSound player might follow later.

Originally committed to SVN as r2415.
2008-10-22 22:31:43 +00:00
Karl Blomster 6dd79d7441 fix an oddness with the "insert before" function. patch by Harukalover.
Originally committed to SVN as r2413.
2008-10-11 13:28:29 +00:00
Karl Blomster 2d49a1e833 we don't need to #include lavc_file.h twice
Originally committed to SVN as r2412.
2008-10-10 15:30:28 +00:00
Karl Blomster fd8a7750c7 Update ffms2 providers to work with latest ffms2 API. Also fixes a few error messages.
Originally committed to SVN as r2408.
2008-10-01 22:08:28 +00:00
Karl Blomster 00265d6ec4 change the ffmpeg includes to libav*/*.h for good this time, but you can still define WITH_OLD_FFMPEG to get the old includes.
Originally committed to SVN as r2398.
2008-09-28 13:02:25 +00:00
Karl Blomster dde0214246 change __stdcall to FFMS_CC, should improve portability
Originally committed to SVN as r2397.
2008-09-28 00:52:19 +00:00
Karl Blomster e247cc290e update ffms2 providers to account for latest API breakage and rename ffmpegsource2.lib to ffms2.lib in setup.cpp
Originally committed to SVN as r2395.
2008-09-28 00:40:37 +00:00
Karl Blomster a2c5b5778c eol-style native on new files, also add said new files to Makefile.am
Originally committed to SVN as r2388.
2008-09-24 11:27:42 +00:00
Karl Blomster 8ecedcbc2d Update ffms providers to use new and improved FFMS API functionality.
Also moved the indexing function to ffmpegsource_common.cpp.

Originally committed to SVN as r2387.
2008-09-23 23:30:27 +00:00
Karl Blomster fabcd033b0 ffms2 providers: better error messages
Originally committed to SVN as r2382.
2008-09-23 21:06:11 +00:00
Karl Blomster 4a94fa334d use wxConvFile for filenames in the ffms providers
Originally committed to SVN as r2380.
2008-09-23 20:28:57 +00:00
Karl Blomster 8107d0c1a9 Add new ffms2 audio provider. Only works with matroska so far, also probably buggy.
Originally committed to SVN as r2379.
2008-09-23 20:02:21 +00:00
Karl Blomster eab0784d77 A few bugfixes to the FFMS2 video provider, also moved some common functions to ffmpegsource_common.cpp/.h in preparation for the FFMS2 audio provider.
Originally committed to SVN as r2378.
2008-09-23 20:01:11 +00:00
Karl Blomster 9b4f389fb2 ffmpegsource video provider now cleans up after itself properly even if loading the video file failed
Originally committed to SVN as r2373.
2008-09-23 01:19:31 +00:00
Karl Blomster 743527eeb8 fix a bug in the OpenAL audio player where it would crash if you tried to stop playback by moving the line end marker to before the playback cursor. credits to jfs.
Originally committed to SVN as r2364.
2008-09-18 23:14:12 +00:00
Rodrigo Braz Monteiro 14037b8a64 Fixed last patch and updated project.
Originally committed to SVN as r2353.
2008-09-14 15:20:15 +00:00
Rodrigo Braz Monteiro d8c5da67d8 Added support for drawing of \iclip on visual tools, but no button to invert it yet.
Originally committed to SVN as r2352.
2008-09-14 15:17:14 +00:00
Niels Martin Hansen e7ed19e55a Add some basic support for Sony's Wave64 format.
Originally committed to SVN as r2342.
2008-09-10 23:02:40 +00:00
Rodrigo Braz Monteiro df3a25129e Fixed project and other stuff for ffmpegsource support.
Originally committed to SVN as r2341.
2008-09-10 22:01:35 +00:00
Karl Blomster 0026ba38ec Fix ffmpegsource video provider to no longer depend on ffmpeg directly, everything is now done by API calls to the ffmpegsource DLL.
Originally committed to SVN as r2340.
2008-09-10 21:05:54 +00:00
Niels Martin Hansen d92efd1f54 Work around bug #772, v1 timecodes files with overlapping or out of order ranges caused weird behaviour. Now those files are simply rejected.
Originally committed to SVN as r2339.
2008-09-10 20:52:51 +00:00
Niels Martin Hansen e737471043 Implement aegisub.video_size() function in Automation 4 Lua. Returns nil if no video is loaded, otherwise returns xres,yres,ar,artype.
Originally committed to SVN as r2337.
2008-09-10 16:53:23 +00:00
Niels Martin Hansen 30a0b7e82b Add support for new override tags: \iclip \fax \fay \xshad \yshad \xbord \ybord \blur
Support redefined override tags: \move (float-pos) \pos (float-pos) \be (variable)
Make visual typesetting understand inverse clips and edit them correctly.
Make vector clip visual tool able to convert a rectangular clip to a vector clip.
What's missing: Proper rendering of inverse vector clips in visual tool overlay.

Originally committed to SVN as r2336.
2008-09-10 16:13:54 +00:00
Niels Martin Hansen aca234ebcc Fix bugs #775 and #776, missing initialisation of controls in Auto4 Lua dialogues. (Untested.)
Originally committed to SVN as r2335.
2008-09-10 14:56:29 +00:00
Niels Martin Hansen f89b9d6c43 Fix incorrect type for Windows x64 builds.
Originally committed to SVN as r2334.
2008-09-10 14:45:46 +00:00
Karl Blomster e702d9edca fixed the ffmpegsource indexing progress dialog to work with files larger than 4gb.
Originally committed to SVN as r2330.
2008-09-07 19:15:12 +00:00
Karl Blomster ff6876b412 Fix a crash when using detached video and pressing the up/down arrows with the video slider selected. Patch by ai-chan.
Originally committed to SVN as r2329.
2008-09-07 03:22:35 +00:00
Karl Blomster 91e1fb7f06 Fix a crash when importing styles with names identical to ones existing on the script but with different case (they are now overwritten properly). Special thanks to ai-chan.
Originally committed to SVN as r2327.
2008-09-06 11:35:36 +00:00
Karl Blomster dafc9dfe73 fix a crash when saving screenshots with a non-english locale set. patch by Manta.
Originally committed to SVN as r2326.
2008-09-06 09:33:14 +00:00
Karl Blomster 02ce1e72df missed one line when removing the useless stuff
Originally committed to SVN as r2325.
2008-09-06 02:57:09 +00:00
Karl Blomster c72cb5f505 kill another useless cast
Originally committed to SVN as r2324.
2008-09-06 02:54:22 +00:00
Karl Blomster 0add56bfa0 remove some useless casts
Originally committed to SVN as r2323.
2008-09-06 02:50:20 +00:00
Karl Blomster 728b0d0a93 cleanup of unused and useless code in video_provider_lavc.cpp
Originally committed to SVN as r2322.
2008-09-06 02:49:58 +00:00
Karl Blomster df3512e8eb add video_provider_ffmpegsource.cpp to Makefile.am
Originally committed to SVN as r2321.
2008-09-05 19:07:31 +00:00
Karl Blomster 82059cbfe2 add some support for sample formats other than 16-bit int to the lavc audio provider. untested and will probably break spectacularly.
Originally committed to SVN as r2320.
2008-09-05 12:55:45 +00:00
Karl Blomster c28b96b502 add decoding threads option for the ffmpegsource video provider
Originally committed to SVN as r2319.
2008-09-05 12:53:57 +00:00
Karl Blomster 1655f97a59 add a progress dialog to the ffmpegsource video provider's indexing process
Originally committed to SVN as r2318.
2008-09-04 22:17:34 +00:00
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
Karl Blomster 075bc5ec75 revert r2216 (changes to the libav* includes)
Originally committed to SVN as r2228.
2008-07-04 00:20:14 +00:00
Niels Martin Hansen 5c2e749421 Forgot to inline the dynamic endian code.
Originally committed to SVN as r2227.
2008-07-03 23:38:44 +00:00
Karl Blomster 910ff2e34e the "impossible" audio error is now really impossible
Originally committed to SVN as r2226.
2008-07-03 23:27:06 +00:00
Niels Martin Hansen 0fbe0a001f Don't use uint32_t in functions working on uint64_t, shifting uint32_t by 56 bits causes evil compiler warnings. On some compilers!
Originally committed to SVN as r2225.
2008-07-03 23:24:47 +00:00