Commit Graph

357 Commits (loadfix)

Author SHA1 Message Date
Marc Zinnschlag 29c9b6bd01 Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 10 years ago
scrawl efa4d09c48 Fix crash when avcodec_decode_audio4 doesn't return a full frame (Fixes #2088) 10 years ago
Marc Zinnschlag 8b3d876534 Merge remote-tracking branch 'lgro/ffmpeg_decoder' 10 years ago
scrawl ac067564ea Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware. 10 years ago
scrawl 55c9c0a266 Audio resampling fixes
- Don't try to use float audio or extended channel layouts if the hardware does not support them
- Add channel layout resampling support to ffmpeg_decoder
10 years ago
scrawl b39d69e98c Videoplayer fixes, play/pause & seeking
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
10 years ago
scrawl eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
Marc Zinnschlag eb45793eab Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage' 10 years ago
Thoronador 4d62541b62 fix usage of numeric_limits static functions min() and max()
Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator.
10 years ago
scrawl 9edcc332ec Don't remove player's sounds when unloading a cell 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
Lukasz Gromanowski c72369fafe Simplified casting when comparing to AV_NOPTS_VALUE.
AV_NOPTS_VALUE is casted to int64_t when compared with pts,
so with libavc >= 56.1 it should be no-op because in that version
it's already signed int.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
Lukasz Gromanowski 7ad6a94523 Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
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>
10 years ago
Lukasz Gromanowski 6987dd768a Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
10 years ago
cc9cii 1107156334 Workaround incorrectly reported channel_layout 10 years ago
cc9cii 675d11c0e5 Mental note: need to get a linux box 10 years ago
cc9cii 8fe6877cb2 More include madness b/w different systems & compilers 10 years ago
cc9cii de41dfc314 Add includes. 10 years ago
cc9cii 0121fdca2c Don't use C99 in printf. 10 years ago
cc9cii be74db8b24 Don't use to_string() 10 years ago
cc9cii ecd9dd81ea Moved debug statements before exception.. 10 years ago
cc9cii ce3077c970 Test version with debug statements. Also moved some common code out to a separate file. 10 years ago
cc9cii 48a36442c6 Add libswresample and libavresample support for sounds. 10 years ago
scrawl 45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
scrawl a59620f643 Cache loudness vector in the buffer cache 11 years ago
scrawl 0943ff0886 Fix normalizing sample values 11 years ago
scrawl 598c0c4ae7 Implement mouth animation for NPCs based on say sound (Fixes #642) 11 years ago
bogglez b56cb7e5ee Remove defunct option for building without FFmpeg
- Added REQUIRED to find_package(FFmpeg)
- Removed USE_FFMPEG option from CMakeLists.txt
- Always use FFmpeg for sound input
- Removed SOUND_DEFINE from CMakeLists.txt
- Removed #else branch from videoplayer.cpp with dummy VideoState code
  (FFmpeg is now guaranteed to exist and the code was incomplete)
- Remove #ifdef OPENMW_USE_FFMPEG in ffmpeg_decoder.cpp, it is guaranteed to be used
- Remove #ifdef OPENMW_USE_FFMPEG from soundmanagerimp.cpp, it is guaranteed to be used
11 years ago
scrawl 7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/sky.hpp
11 years ago
scrawl 09926a86cb Fix comparing outdated listener position with up-to-date cell (Fixes #1499) 11 years ago
slothlife 9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
scrawl 80f66e2157 Fix crash when avformat_open_input fails (Fixes #1522) 11 years ago
scrawl be6f1fe4fe Fix a sign error 11 years ago
scrawl d970cc06d7 Don't play the same music track twice in a row (Fixes #746) 11 years ago
Marc Zinnschlag f7c89015f9 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl e5a21aca53 Refactor projectiles to no longer use MW-objects 11 years ago
slothlife f33559fead Fixes for MSVC warnings, less overall changes
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
slothlife c160a04ede Revert "Fixes for warnings when building with MSVC"
This reverts commit 46eb20b98c.
11 years ago
slothlife 46eb20b98c Fixes for warnings when building with MSVC
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
Thoronador 620a8ccaf3 remove Audiere and MPG123+Sndfile decoder sources 11 years ago
Thoronador 1b8c975d5b minor performance improvements in apps/openmw
Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
Marc Zinnschlag 367919200f moved CellRefList into a separate file 11 years ago
Marc Zinnschlag 7693f712bc started making CellStore into a proper class; encapsulated mCell member 11 years ago
Marc Zinnschlag 736644de05 Revert "#1041 in progress: decode first sample batch right in OpenAL_SoundStream::play()"
This reverts commit 51fb9f65ea.
11 years ago
Nikolay Kasyanov 51fb9f65ea #1041 in progress: decode first sample batch right in OpenAL_SoundStream::play() 11 years ago
Nikolay Kasyanov 5e8cb2e466 Another attempt to fix #1041. This time I'm sending real data from decoder
once after playback started.
11 years ago