Marc Zinnschlag
3cd717cd47
Merge remote-tracking branch 'lgro/videoplayer'
2014-09-21 19:04:15 +02:00
Lukasz Gromanowski
b40c1ff26c
Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
...
Corrected ifdef from previous commit around codecCtx->refcounted_frames = 1;
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:23:05 +02:00
Lukasz Gromanowski
f5589b42ea
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Added ifdefs because changes in API were introduced in libavc 56.1
and this code doesn't compile with older versions (ie. on Ubuntu, or Debian).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 16:09:16 +02:00
Lukasz Gromanowski
d77546b7dc
Fix for compiler warnings and deprecated functions usage in videoplayer.
...
Deprecated functions were:
- AVCodecContext::get_buffer
- AVCodecContext::release_buffer
Changed to:
AVCodecContext::get_buffer2 and setting AVCodecContext::refcounted_frames to 1
before call to avcodec_open2().
release_buffer usage was removed.
Also changed places when some fileds were compared to AV_NOPTS_VALUE
- it's signed, so removed unsigned int casting, or changed casting
to signed int.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2014-09-21 12:58:11 +02:00
scrawl
b1e74e2a85
Remove support for Ogre 1.8 versions
2014-09-21 10:41:13 +02:00
scrawl
e42cb8020e
Change all skins to get font colors from fallback settings ( Fixes #704 )
2014-09-20 10:40:09 +02:00
scrawl
447e93bdb4
Use SpellCast animation for creatures that have it (flame atronach)
2014-09-18 03:24:47 +02:00
scrawl
3ce3f31452
Adjust turning animation speed multiplier based on turning speed
2014-09-17 07:02:19 +02:00
Marc Zinnschlag
3f671c86a8
Merge remote-tracking branch 'cc9cii/ffmpeg-swresample'
2014-09-15 12:44:38 +02:00
cc9cii
1107156334
Workaround incorrectly reported channel_layout
2014-09-12 21:18:54 +10:00
cc9cii
ce3077c970
Test version with debug statements. Also moved some common code out to a separate file.
2014-09-12 08:27:25 +10:00
cc9cii
48a36442c6
Add libswresample and libavresample support for sounds.
2014-09-11 21:15:18 +10:00
cc9cii
862c5fc8f6
Add libavresample support. Tested on windows x64 only.
2014-09-11 16:47:00 +10:00
scrawl
8b0cb239a9
Ignore text keys for zero-length animations ( Fixes #1876 )
...
This fixes an issue where the Riekling's attack animation would trigger *two* hits on each swing. It has the "min hit" and "hit" keys at the same time, so the MinHitToHit segment a zero-length animation. This caused problems as the "hit" text key will be encountered twice; once when playing the "max attack to min hit" segment and once when playing the "min hit to hit" segment.
2014-09-08 15:23:35 +02:00
cc9cii
785d2c7cc9
Remove incomplete implementation to support planar formats. Make libswresample a prerequisite.
2014-09-08 15:24:39 +10:00
cc9cii
f616000afb
More fix based on code review.
2014-09-07 21:17:34 +10:00
cc9cii
c396149f23
Code review fix.
2014-09-07 20:35:32 +10:00
Rohit Nirmal
e315a72582
Remove extra semicolons at the end of some lines.
2014-09-06 13:04:52 -05:00
cc9cii
7ae8d04c47
Arrgh... silly typo
2014-09-04 19:07:19 +10:00
cc9cii
c6cad5adc5
Make cmake more reliably detect libswresample
2014-09-04 18:55:10 +10:00
cc9cii
801b9446b7
Support for ubuntu/debian. Can easily be reverted if not required.
2014-09-04 07:58:46 +10:00
cc9cii
093c7f8882
Moved format conversion to audio_decode_frame()
2014-09-03 22:52:03 +10:00
cc9cii
1e72cf4cdc
More refactoring, remove more #ifdef guards and fix repeat samples for planar formats.
2014-09-03 18:13:43 +10:00
cc9cii
5095f729b0
Make travis happy again.
2014-09-02 22:05:54 +10:00
cc9cii
2d6b532ea5
Minimize the use of #ifdef guards for better code legibility.
2014-09-02 21:52:19 +10:00
scrawl
0eb949c8a7
Don't update ripples when they are not used
2014-09-02 04:29:37 +02:00
cc9cii
f4dd281393
Simplify the use of swr_convert and add #ifdef guards around code that require libswresample.
2014-09-01 21:49:37 +10:00
cc9cii
0b9d17a81d
More cleanup.
2014-09-01 08:04:28 +10:00
cc9cii
fdee660ffb
Implemented feedback review comments, removing hard coded values and adding error handling.
2014-09-01 08:02:25 +10:00
cc9cii
68cbb8989e
Cleanup comments.
2014-08-31 23:39:17 +10:00
cc9cii
a7371eda4d
Now works for both FLT and S16 formats. The output format is hard coded in the MovieAudioDecoder constructor (default S16).
2014-08-31 23:35:05 +10:00
cc9cii
8429dab271
Working version - converts FLTP to FLT. Does not work when converting to S16.
2014-08-31 22:01:08 +10:00
cc9cii
16c165185b
Minor cleanup. Tested successfully on windows x64 using ffmpeg-20140823-git-7444cf9-win64-dev which is on libavcodec version 56.0.101.
2014-08-31 13:40:29 +10:00
cc9cii
944f99b23a
Initial commit of FLTP format binkaudio support. Converts to FLT format by manually interleaving decoded samples. swresample library is included with a view to use swr_convert() in future versions, but not used in this commit.
2014-08-31 13:20:33 +10:00
Marc Zinnschlag
ce3d75bba2
Merge remote-tracking branch 'scrawl/master'
2014-08-28 12:34:08 +02:00
scrawl
0fe9612afb
Implement basic spellcasting AI ( Fixes #961 )
...
Select a weapon to attack with in AiCombat and equip it (Fixes #1609 , Fixes #1772 )
2014-08-28 00:55:37 +02:00
scrawl
4f92044d71
Allow user-created markers on local map ( Fixes #1571 )
2014-08-26 17:45:23 +02:00
scrawl
e0e4cbbb41
Implement Light magic effect ( Fixes #1122 )
2014-08-24 02:37:59 +02:00
scrawl
714c927fda
Fix being able to change camera during death via mouse wheel
2014-08-24 02:37:59 +02:00
scrawl
83037a1a91
Move fast-forward of particle systems outside of OgreNifLoader ( Fixes #1830 )
...
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
2014-08-18 16:37:47 +02:00
scrawl
d8943aef2f
Encapsulate magic effect magnitude (Feature #1489 )
2014-08-17 03:58:04 +02:00
scrawl
7432771ac7
For non-active torches set the particle system speed factor to zero instead of destroying it ( Fixes #1811 )
2014-08-16 00:51:02 +02:00
scrawl
c62d53ae84
Remove no longer needed comments about coordinate system
2014-08-14 19:09:33 +02:00
scrawl
c065a4b203
Add ManualResourceLoader for global map overlay ( Fixes #1736 )
2014-08-14 19:01:03 +02:00
scrawl
94c2517d67
Fix race preview crash ( Fixes #1808 )
2014-08-13 19:30:46 +02:00
scrawl
e2ee3b2497
Merge branch 'master' of https://github.com/OpenMW/openmw
...
Conflicts:
apps/openmw/mwrender/terrainstorage.cpp
2014-08-12 19:53:37 +02:00
scrawl
025f50a2df
Improve performance of inventory window resize (don't update selection buffer unnecessarily)
2014-08-12 17:07:06 +02:00
MiroslavR
baa14511cf
Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision
2014-08-12 12:18:38 +02:00
scrawl
28fe81df90
Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes #1796 )
2014-08-11 20:39:56 +02:00
scrawl
fc1687906b
Use the last Loop Stop key for calculating animation velocity ( Fixes #1776 )
2014-08-11 05:29:36 +02:00
