aboutsummaryrefslogtreecommitdiffstats
path: root/src/media (follow)
Commit message (Collapse)AuthorAgeFilesLines
* minor code optimizationk-m_schindler2013-12-151-5/+2
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3027 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix PByteIOContext for ffmpeg-1.2. ffmpeg-0.8 works. ffmpeg-1.2 compiles but ↵k-m_schindler2013-12-141-0/+4
| | | | | | no audio and then crashes. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3026 b956fd51-792f-4845-bead-9b4dfca2ff2c
* add FF_API_AVCODEC_RESAMPLE and FFMPEG_VERSION_INTk-m_schindler2013-12-141-1/+13
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3025 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix version detection of libavformatk-m_schindler2013-07-183-15/+15
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3000 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Added compilation condition to new UMediaCore_FFmpeg functions to make ↵lotanrm2013-07-111-0/+6
| | | | | | earlier builds work again. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2999 b956fd51-792f-4845-bead-9b4dfca2ff2c
* In order to make ffmpeg-1.0 work:lotanrm2013-07-113-12/+92
| | | | | | | | Fixed avcodec FF_API flags (similar to r2996). Changed from old avformat_register_protocol2 to using AVIOContext. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2998 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix compilation on ubuntu and lart release engineers, who mix releases ;-)k-m_schindler2013-05-152-2/+2
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2984 b956fd51-792f-4845-bead-9b4dfca2ff2c
* add fade for medley mod.k-m_schindler2013-02-224-0/+28
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2945 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix version detection of libavformatk-m_schindler2012-10-201-1/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2930 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix pointer types.k-m_schindler2012-07-141-2/+3
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2920 b956fd51-792f-4845-bead-9b4dfca2ff2c
* cosmetics: long variable names. no code change.k-m_schindler2012-05-241-8/+8
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2890 b956fd51-792f-4845-bead-9b4dfca2ff2c
* some minor bugfixes.k-m_schindler2012-05-241-4/+4
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2889 b956fd51-792f-4845-bead-9b4dfca2ff2c
* cosmetics: long variable names. no code change.k-m_schindler2012-05-241-9/+9
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2888 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Corrected AVStream pointer arithmetic to work inconjuction with fpc 2.6 as ↵lotanrm2012-05-173-8/+4
| | | | | | well fpc 2.4. Removed unneeded code. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2884 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Added support for ffmpeg-0.10.lotanrm2012-05-173-19/+89
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2883 b956fd51-792f-4845-bead-9b4dfca2ff2c
* correct versions and prepare logic of file opening for ffmpeg-0.8k-m_schindler2012-05-113-7/+7
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2882 b956fd51-792f-4845-bead-9b4dfca2ff2c
* indentation. surely, no code change.k-m_schindler2012-05-101-1/+2
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2881 b956fd51-792f-4845-bead-9b4dfca2ff2c
* minimal type adjustments. This should make no difference.k-m_schindler2012-05-101-4/+4
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2879 b956fd51-792f-4845-bead-9b4dfca2ff2c
* untested proposal for replacement of av_find_stream_info by av_read_framek-m_schindler2012-05-081-0/+9
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2877 b956fd51-792f-4845-bead-9b4dfca2ff2c
* another fix of streams. USDX finally builds, but does not work.k-m_schindler2012-05-051-0/+4
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2876 b956fd51-792f-4845-bead-9b4dfca2ff2c
* update for ffmpeg-0.8k-m_schindler2012-05-052-0/+12
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2873 b956fd51-792f-4845-bead-9b4dfca2ff2c
* updates and extension for ffmpeg-0.8k-m_schindler2012-04-224-1/+33
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2867 b956fd51-792f-4845-bead-9b4dfca2ff2c
* new detection of ffmpeg version. API changes: SampleFormat -> ↵k-m_schindler2012-04-202-8/+7
| | | | | | AVSampleFormat. Configure still needs update. Special thanks to lotan. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2856 b956fd51-792f-4845-bead-9b4dfca2ff2c
* allow playback from audio streamtobigun2010-12-302-3/+132
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2783 b956fd51-792f-4845-bead-9b4dfca2ff2c
* stretch mic-input to avoid buffer underruns with voice playback (audible as ↵tobigun2010-12-271-1/+6
| | | | | | scratching) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2774 b956fd51-792f-4845-bead-9b4dfca2ff2c
* revert accidental previous commitk-m_schindler2010-10-142-3/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2665 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Mac OS X Readmek-m_schindler2010-10-142-1/+3
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2664 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Bugfix: do not call Inc() on PByteArray pointers. It will not increment by ↵tobigun2010-06-191-1/+1
| | | | | | one byte, but by SizeOf(ByteArray) bytes which is some KB. As a result the pointer will point to an illegal memory address. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2549 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fixed x-position of glScissor test in UVideo.Draw and UVideo.DrawReflection ↵brunzelchen2010-06-151-2/+2
| | | | | | (video was visible on the first screen only) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2527 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Fix for invalid song lengthstobigun2010-06-131-1/+1
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2511 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fTimeBase is NOT the time-base of the FFmpeg stream -> renamed to ↵tobigun2010-06-121-28/+21
| | | | | | fFrameDuration to avoid wrong usage git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2501 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix seeking in videostobigun2010-06-121-1/+4
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2500 b956fd51-792f-4845-bead-9b4dfca2ff2c
* merge of VideoPreview branch into trunkbrunzelchen2010-06-103-80/+642
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2475 b956fd51-792f-4845-bead-9b4dfca2ff2c
* Do not overwrite a devices MicSource if it is already set (Note: MicSource ↵tobigun2010-06-061-2/+5
| | | | | | is not used at the moment) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2447 b956fd51-792f-4845-bead-9b4dfca2ff2c
* compare FFmpeg header and DLL versions and log an error if both do not matchtobigun2010-06-051-0/+75
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2442 b956fd51-792f-4845-bead-9b4dfca2ff2c
* prefix class fields with 'f'tobigun2010-06-031-272/+272
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2439 b956fd51-792f-4845-bead-9b4dfca2ff2c
* better EOF handling for FFmpeg audio decoding (EOF handled like it is done ↵tobigun2010-06-031-3/+12
| | | | | | in UVideo) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2438 b956fd51-792f-4845-bead-9b4dfca2ff2c
* revert of last made changes (rev. 2409)brunzelchen2010-05-241-163/+46
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2410 b956fd51-792f-4845-bead-9b4dfca2ff2c
* added window-mode and reflection-mode to DrawGLbrunzelchen2010-05-231-46/+163
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2409 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fix No. 2 of ffmpeg update. Move from CodecType to AVMediaType.k-m_schindler2010-05-121-1/+21
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2364 b956fd51-792f-4845-bead-9b4dfca2ff2c
* portaudio playback (not used by default) segfault fixedtobigun2010-04-303-22/+71
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2321 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - device input latency is now configurable via config.initobigun2010-04-271-17/+48
| | | | | | | | - latency[i] determines the latency for device i in milliseconds or -1 for autodetection (default) - this is necessary as mic capturing with portaudio (on linux) gets stuck if latency is too low. Either because portaudio's latency autodetection does not work or because the mic capture callback takes too long before it returns. In both cases the user should set the latency to a value of 100 (ms). - better input device test, it should not remove working devices anymore. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2313 b956fd51-792f-4845-bead-9b4dfca2ff2c
* wrong usage of glTexEnvi fixedtobigun2010-04-251-2/+5
| | | | | | | | - the environment must be GL_TEXTURE_ENV and not GL_TEXTURE_2D - it must be set before a draw function (glBegin(), ...) and not before glTexImage2D() as the current texture will not store this setting (the setting is global for all textures). - the setting must be set to the default (GL_MODULATE) after usage, otherwise later opengl drawing calls will be unwantedly affected too. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2309 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - now it is possible to sync lyrics to audiotobigun2010-04-222-0/+2
| | | | | | | | - ini option SyncTo added - lyric to audio is default now (instead of sync audio to lyrics) - modified RelativeTimer (hopefully easier to use and more self-explanatory) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2273 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fixed choppy start of some songs when using ffmpegtobigun2010-04-211-24/+33
| | | | git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2270 b956fd51-792f-4845-bead-9b4dfca2ff2c
* fixed bug in SDL/Portaudio playback stream:tobigun2010-04-211-2/+4
| | | | | | - positioning was broken in revision 1661 (9.4.2009, a long time) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2269 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - fixed UAudioPlayback_SoftMixer.GetPosition():tobigun2010-04-211-6/+56
| | | | | | | | | - previously it returned the position that would have been reached after ALL data that was returned at ReadData() was processed by the engine - due to this the returned position did not change for about 40ms (with SDL, samples: 2048, 44.1kHz) and the position was too far ahead (40ms) - this has been fixed by guessing the amount that is still buffered by the engine (SDL or portaudio) - sync should work better now with SDL and portaudio (BASS is not affected by this patch) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2263 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - better lyric <-> video synctobigun2010-04-211-39/+139
| | | | | | | | - fixed glTexEnv() bug: GL_TEXTURE_2D is not valid here - pixel buffer test - some cleanup git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2261 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - add video loop optiontobigun2010-04-213-214/+378
| | | | | | - allow multiple instances of a video git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2260 b956fd51-792f-4845-bead-9b4dfca2ff2c
* - force a BASS version >= 2.4.2 as the BASS ABI is slightly different ↵tobigun2010-04-201-3/+20
| | | | | | | | (although we don't use the changed stuff) - IMPORTANT: if a version < 2.4.2 is present, usdx will log an error message but will start without sound. If you don't get sound anymore, update BASS git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2256 b956fd51-792f-4845-bead-9b4dfca2ff2c