87facaa2e2
Prevent out of memory errors when the game passes in an improper length value
...
HACK
In Luigi's Mansion Dark Moon in HLE audio, the game mysteriously passes
in an extremely large value for length, which without any checks, causes
HLE audio to allocate an extremely large buffer.
This value seemingly is caused by some other HLE audio feature is missing,
and Luigi's Mansion subtracts two values to get a length, without
checking for overflow first. This appears to be caused by an incorrect
HLE audio emulation, as its fixed entirely by only changing to LLE. As
such, further investigation is required, but in the meantime, completely
eating up our users RAM is unacceptable.
2019-12-14 18:18:59 -07:00
337ac73915
Improve aac decoder selection
2019-12-08 16:18:39 -07:00
b395efe804
Dynamically load Media Foundation
2019-12-08 13:54:27 -07:00
e1e136d72f
service/mic: actually use the specified device
2019-11-11 17:15:10 -05:00
f8b3950829
CMake: separate options for FFmpeg decoder/dumper
...
Separate options are now provided for FFmpeg AAC audio decoder and FFmpeg video dumper. This allows users to configure Citra with greater freedom.
Also, previously for Linux builds, AAC decoder is accidentally enabled along with the dumper, which could potentially cause patent issues (?). This commit fixes it by only enabling video dumper.
2019-08-20 14:45:39 +08:00
cf2c354fb9
CMake, CI: Add FFmpeg library dependency
2019-08-14 09:27:03 +08:00
fff570012f
audio_core: Dump audio frames and samples
...
This is tested to work with all three current methods - HLE, LLE and multithread LLE.
2019-08-13 19:28:03 +08:00
3dbd1fd4a8
audio_core/cubeb: silent signed/unsigned comparison warning
2019-07-14 14:30:24 -04:00
8021361bb4
audio_core: dsp_hle: use better f32 to s16...
...
... conversion by clamping and clipping sample to [-1,1] and use
different masks for negative and positive samples
2019-05-01 15:58:26 -06:00
f4d0bdd09a
Destroy the callback after the stream is destroyed
...
Prevents a crash on close if the callback was running on a different
thread.
2019-04-05 14:16:55 -06:00
aedf5a84b0
Merge pull request #4671 from jroweboy/mic4
...
Microphone support
2019-03-20 23:12:38 +05:30
b4d538468d
Change resampling s16 -> u8 to respect aliasing rules
2019-03-20 09:31:03 -06:00
9739e2b6fd
Support signed 8bit pcm in cubeb input. Address review
2019-03-17 22:52:03 -06:00
f5df13eb24
Remove global state and add mic hot swapping
2019-03-06 20:59:58 -07:00
182d672c15
Add ifdef around cubeb for android. Address a few review comments
2019-03-06 20:03:22 -07:00
5c61d53047
Fix compiler error
2019-03-06 11:30:23 -07:00
ba4dfe4217
Increase mic stream volume to max in case the users mic is set low for some reason
2019-03-06 11:17:32 -07:00
5f532c2560
Address review comments
2019-03-06 11:16:43 -07:00
c669aa8d55
Rest of the owl
2019-03-04 23:07:05 -07:00
5c9e327ff3
Fix
2019-03-04 23:07:05 -07:00
7fccc995ce
Initial Mic setup
2019-03-04 23:06:42 -07:00
d354a2ee3b
audio_core/codec: Resolve truncation warnings within DecodeADPCM
...
The assignments here were performing an implicit truncation from int to
s16. Make it explicit that this is desired behavior.
2019-03-02 14:06:30 +01:00
8f2bd97277
Merge pull request #4655 from tgsm/gcc-version
...
Remove GCC version checks
2019-02-22 16:21:21 -05:00
433ab35e7e
Remove GCC version checks
...
Citra can't be compiled using GCC <7 because of required C++17 support, so these version checks don't need to exist anymore.
2019-02-19 16:39:34 -05:00
a400e49338
audio_core: use nested namespaces
2019-02-17 23:41:48 -05:00
a4ba35fe3a
audio_core: hle: mf: lint
2019-02-13 15:15:11 -07:00
671ac441e9
audio_core: hle: mf: move transform initializer to ctor
2019-02-13 14:32:14 -07:00
6178cc08b7
audio_core: hle: mf: conform to RAII as possible
2019-02-13 14:08:34 -07:00
f0e041e27a
audio_core: hle: mf: correctly handle stream change
2019-02-09 16:49:48 -07:00
01e0902fa4
audio_core: hle: mf: fix a memory accessing issue
2019-02-09 13:55:54 -07:00
6281660844
audio_core: hle: mf: address yet another batch of reviews
2019-02-09 13:55:42 -07:00
ab1f47ed15
audio_core: hle: mf: make DetectMediaType return a struct
2019-02-09 11:57:36 +01:00
168f2ee79a
audio_core: mf: make initialize function return smart pointer
2019-02-09 11:57:36 +01:00
c91f5029ff
audio_core: hle: mf: fix a regression...
...
... where the sample copying logic is incorrect due to the wrong usage
of `std::array`
2019-02-09 11:57:36 +01:00
6332e57069
audio_core: hle: mf: return values as std::optional
2019-02-09 11:57:36 +01:00
25fa10327b
audio_core: hle: mf: use object proxy
2019-02-09 11:57:36 +01:00
26b3b41788
audio_core: hle: mf: wrap enum in class
2019-02-09 11:57:36 +01:00
633f02b9b2
audio_core: hle: mf: avoid name conflicts
2019-02-09 11:57:36 +01:00
452ac7b874
audio_core: hle: mf: use more enum
2019-02-09 11:57:36 +01:00
be764e4f88
audio_core: hle: mf: multiple fixes...
...
... more smart pointers and re-arrange code
2019-02-09 11:57:36 +01:00
4bc6bfd51f
audio_core: hle: mf: re-arrange comments
2019-02-09 11:57:36 +01:00
972b527374
audio_core: hle: mf: cleanup headers
2019-02-09 11:57:36 +01:00
2c40ef2a90
audio_core: hle: mf: rename functions
2019-02-09 11:57:36 +01:00
ea8a1f8754
Media Foundation Memory Fix
...
* audio_core: hle: mf: more smart pointers
* audio_core: hle: mf: fix memory leaks
* audio_core: hle: mf: even more smart pointers
2019-02-09 11:57:36 +01:00
10f876653d
audio_core: hle: mf: transition to use smart pointers
2019-02-09 11:56:51 +01:00
bee5ba3e33
audio_core: hle: mf: fix a regression...
...
... an introduction in 8f591d3b85714383196fd21e744a7eed5302ff0a
2019-02-09 11:56:51 +01:00
06316be8a7
audio_core: hle: mf: minor fix
2019-02-09 11:56:51 +01:00
c03861c2d9
audio_core: hle: mf: address another batch of reviews from @B3N30
2019-02-09 11:56:51 +01:00
7f5b54fda4
audio_core: hle: mf: address reviews from @B3N30
2019-02-09 11:56:51 +01:00
11e277149c
audio_core: hle: fix compile
2019-02-09 11:56:51 +01:00
80b4dd21d2
audio_core: dsp_hle: add Media Foundation decoder...
...
* appveyor: switch to Media Foundation API
* Travis CI MinGW build needs an update with the container image
2019-02-09 11:56:51 +01:00
1581dea6de
more reviews addressed
2019-02-09 11:55:12 +01:00
8fe3e37df5
audio_core: fix msvc include issue
2019-02-09 11:55:12 +01:00
bd9984b5f8
Addressed reviews
2019-02-09 11:55:12 +01:00
847003cc1c
FFmpegDL: Added external_dlls folder to user folder
...
AACDecoder: addressed reviews
2019-02-09 11:52:31 +01:00
45b5de7a18
Fixup: Merge conflict with dsp lle
2019-02-09 11:52:31 +01:00
c521f3b7d6
CoreAudio::HLE: Add FFmpeg aac decoder
2019-02-09 11:52:31 +01:00
f78512d6de
Merge pull request #4599 from wwylele/bitfield-endian
...
Common: make BitField endianness-aware
2019-02-01 10:48:56 -05:00
104829ae58
remove all occurance of specifying endianness inside BitField
...
This commit it automatically generated by command in zsh:
sed -i -- 's/BitField<\(.*\)_le>/BitField<\1>/g' **/*(D.)
BitField is now aware to endianness and default to little endian. It expects a value representation type without storage specification for its template parameter.
2019-01-28 22:09:43 -05:00
24f966481f
dsp_interface: fix sound being played while volume is 0
...
According to documentation, if the argument of std::exp is zero, one is returned.
However we want the return value to be also zero in this case so no audio is played.
2019-01-26 14:53:58 +01:00
6560fac5ff
audio_core: remove unnecessary spaces on comments
2019-01-19 21:28:52 +01:00
4f23d5d69e
Merge pull request #4490 from wwylele/teakra-new
...
audio: implement DSP LLE
2019-01-11 16:45:00 +01:00
443f4b964d
DSP/LLE: add multithread mode
2018-12-21 20:49:24 -05:00
969dc3b46f
Update teakra and address more comments
2018-12-21 20:49:23 -05:00
05c372bf6c
Update teakra to fix macos issue; address comment feedbacks
2018-12-21 20:49:23 -05:00
67213ca855
audio_core/lle: link ahbm and audio callback
2018-12-21 20:49:22 -05:00
483680a124
audio_core/lle: only process pipe signal after loading
2018-12-21 20:49:22 -05:00
6f6ffceec4
audio_core/hle,lle: implement UnloadComponent
2018-12-21 20:49:21 -05:00
9b41e6f85f
audio_core/lle: implement LoadComponent
2018-12-21 20:49:21 -05:00
4add509b20
audio_core/hle: move implementation of LoadComponent
2018-12-21 20:49:21 -05:00
9ab4e3c686
audio_core/lle: implement GetDspMemory and SetServiceToInterrupt
2018-12-21 20:49:21 -05:00
5c13eca700
audio_core/lle: implement PipeRead/GetPipeReadableSize
2018-12-21 20:49:20 -05:00
e40efbf37b
audio_core/lle: implement PipeWrite
2018-12-21 20:49:20 -05:00
c9736b3300
audio_core/hle,lle: implement SetSemaphore
2018-12-21 20:49:20 -05:00
4671ccf416
audio_core/lle: implement RecvDataIsReady
2018-12-21 20:49:19 -05:00
14eb3561de
audio_core/hle: move implementation of RecvDataIsReady
2018-12-21 20:49:19 -05:00
b609753fb6
audio_core/lle: implement RecvData
2018-12-21 20:49:19 -05:00
7f568a3c19
DSP/HLE: move implementation of RecvData to audio_core, behind common interface
2018-12-21 20:49:19 -05:00
6d51d95d44
audio_core: add teakra and lle interface
2018-12-21 20:49:18 -05:00
90082268dc
audio_core: Make g_sink_details internally linked
...
We can hide the direct array from external view and instead provide
functions to retrieve the necessary info. This has the benefit of
completely hiding the makeup of the SinkDetails structure from the rest
of the code.
Given that this makes the array hidden, we can also make the array
constexpr by altering the members slightly. This gets rid of several
static constructor calls related to std::vector and std::function.
Now we don't have heap allocations here that need to occur before the
program can even enter main(). It also has the benefit of saving a
little bit of heap space, but this doesn't matter too much, since the
savings in that regard are pretty tiny.
2018-12-16 02:44:04 +01:00
296c458e0e
Memory: move GetPhysicalPointer and IsValidPhysicalAddress into class
2018-12-05 20:21:14 -05:00
ec01975549
audio_core: pass in memory reference
...
Because HLE::Source is initialized as an array in the member initializer, it is hard to let it accept the reference on ctor, so it has a second init stage performed by DspHle::Impl::Impl
2018-12-05 20:16:42 -05:00
008ef1fd71
DSP: Add a comment about physical address masking
...
See @wwylele's comment on PR 4483 for more details on what causes this behavior.
2018-12-03 12:22:11 -07:00
3aff585f32
DSP: Add address mask for physical pointers to audio data buffers
...
Hardware testing indicated that FFFFFFFC is the correct mask for all audio formats (mono and stereo PCM8, mono and stereo PCM16, and ADPCM). This fixes broken audio in Luigi's Mansion: Dark Moon and a few other games.
2018-12-03 01:07:55 -07:00
9458e4d8ec
CoreTiming: wrap into class
2018-11-04 10:26:38 -05:00
b4062abc11
cubeb_sink: ignore null-name device when selecting
...
We already ignore them on listing devices. We should do the same when selecting devices. This fix a crash when opening a specific device while there is a null device in the list
2018-10-26 09:17:44 -04:00
1d59c8f792
Logging: Change the TimeStretch::Process log from debug to trace level.
...
This function is called too many times and makes the debug logging basically unusable due to the spam.
2018-10-06 16:55:05 +02:00
7db46da4fc
Merge pull request #4247 from FearlessTobi/port-1314
...
Port yuzu-emu/yuzu#1314 : "audio_core/time_stretch: Silence truncation warnings in Process()"
2018-09-22 12:02:51 -04:00
bcb1aaf05c
cubeb_sink: Get rid of variable shadowing within CubebSink's constructor
...
The parameter of the lambda was shadowing the variable that was being
assigned to.
2018-09-22 12:55:40 +02:00
553bdb2ae4
audio_core/time_stretch: Silence truncation warnings in Process()
...
The SoundTouch API only accepts uint amount of samples.
2018-09-22 12:52:13 +02:00
bb9e92c77c
Merge pull request #4194 from MerryMage/audiofifo
...
audio_core: Simplify sink interface
2018-09-21 13:30:51 +01:00
93bd630d40
audio_core/sink_details: Change std::string parameter into std::string_view
...
The given string is only ever used for lookup and comparison, so we can
just utilize a non-owning view to string data here
2018-09-15 15:48:24 +02:00
a6cf2e1f9d
cubeb_sink: Improve logging
2018-09-09 08:37:34 +01:00
675ffc1024
dsp_interface: Move volume control to audio thread
...
We also clamp the linear volume value to [0.0, 1.0].
Do nothing if linear volume is 1.0.
2018-09-08 22:24:51 +01:00
eed55a813e
time_stretch: Simplify audio stretcher
2018-09-08 22:09:26 +01:00
f34711219a
audio_core: Simplify sink interface
2018-09-08 22:09:26 +01:00
7d8f115185
Prefix all size_t with std::
...
done automatically by executing regex replace `([^:0-9a-zA-Z_])size_t([^0-9a-zA-Z_])` -> `$1std::size_t$2`
2018-09-06 16:03:28 -04:00
b130dd6842
Merge pull request #4161 from FearlessTobi/port-1139
...
Port #1139 from yuzu: "bit_field: Convert ToBool() into explicit operator bool"
2018-09-02 09:53:50 +01:00
488694d01f
Replace ToBool() with static_cast()
2018-09-01 15:50:57 +02:00
7daed185cb
cubeb_sink: Protect queue against multithreaded access
2018-08-31 18:44:19 +01:00
29e5dec986
sink_details: Deduplicate long std::function repetition
...
We can just use type aliases to avoid needing to write the same long
type twice
2018-08-23 17:03:09 +02:00
50b58da56c
sink_details: std::move std::function instances
...
Given std::function is allowed to potentially allocate, these should be
std::move'd to prevent potential reallocation (should that ever happen).
2018-08-23 17:03:00 +02:00
c35a251d86
Merge pull request #3985 from BreadFish64/fix-warnings
...
core: clean up warnings
2018-08-02 11:14:57 -06:00
14b0435df2
Merge pull request #3994 from FearlessTobi/replace-clamp-functions
...
Remove MathUtil::Clamp and replace it with its std:: counterpart
2018-08-02 11:08:07 -06:00
74cd98ecad
core: clean up warnings
2018-08-01 14:10:23 -05:00
8f70e9a318
service/dsp: Addressed comments about function name and pointer type
2018-07-29 15:18:30 -04:00
71e1d6e25d
Fix compile errors
2018-07-26 13:23:25 +02:00
b840c63386
service/dsp: Clean up global state
2018-07-24 16:15:37 -04:00
7a3e126a4f
Replace MathUtil::Clamp with its std counterpart
2018-07-24 19:08:17 +02:00
2f8c9c8126
Merge pull request #3831 from FearlessTobi/add-volume-slider
...
citra_qt: Add a volume slider
2018-07-18 09:56:47 -06:00
47d283a1e4
Merge pull request #3909 from MerryMage/rm-SetDevice
...
sink_details: Tidy-up device listing code
2018-07-12 20:49:29 +01:00
7d642b25e9
sink: Make auto device name a constant
2018-07-12 15:56:37 +01:00
c39daa3c01
service/dsp: Migrate to ServiceFramework ( #3915 )
...
* service/dsp: Migrate to ServiceFramework
* service/dsp: Removed redundant buffer copy
* service/dsp: Addressed comment about pushing u32 instead of bool
* service/dsp: Fix clang format
* service/dsp: Addressed comment about minimizing global state
* service/dsp: Addressed comments and fixed log call issue
* service/dsp: Fix missed clang format
2018-07-12 17:54:26 +03:00
a780f3821e
citra_qt: Add a volume slider
2018-07-03 17:26:50 +02:00
d269beab0d
sink_details: Listing available devices should be separate from sink construction
2018-07-02 14:09:17 +01:00
ce5a5412ae
sink_details: Remove unnecessary lambdas
2018-07-02 13:26:14 +01:00
05fc17b88a
sink: Remove unnecessary SetDevice method
...
Unused, doesn't do anything.
2018-07-02 13:23:40 +01:00
0eab948728
reformat all files with clang-format
2018-06-29 16:56:12 +03:00
7c5a76e58b
log: replace all NGLOG with LOG
2018-06-29 14:18:07 +03:00
04139e26bd
cubeb_sink: Skip devices without a name
...
Previously this would crash.
2018-05-31 21:01:48 -05:00
ce6d9e2e28
externals: Don't build cubeb with tests
2018-05-31 21:01:48 -05:00
35c43aa293
audio_core: Only include cubeb if it's available
2018-05-31 21:01:48 -05:00
af73dd45f0
audio_core: Implement a cubeb audio sink
2018-05-31 21:01:48 -05:00
38e2b6c8d8
Undo changes to unrelated files and fix formatting
2018-03-25 00:54:40 +08:00
df816b5eaf
Address review comments
...
* Convert %x to {:x}
* Convert {0:#010x} to {:#010x}
* Remove `? true : false` statement
* Remove `.c_str()` for strings
2018-03-24 22:25:50 +08:00
693b190274
audio_core: Migrate logging macros
...
Follow-up of #3533
Replace prefix of all logging macros from LOG to NGLOG
2018-03-24 21:45:58 +08:00
f61141e86a
Update the entire application to use the new clang format style
2018-03-09 10:54:43 -07:00
90b835758f
decode: Fix PCM8 decoding
...
Signal range is -32767 to 32768, not -127 to 128.
2018-02-25 12:42:21 +00:00
adf9a19095
fixup! audio_core: Remove global state
2018-02-04 22:23:51 +00:00
ab3d53131a
audio_core: Remove global state
2018-02-03 15:15:17 +00:00
80ed0f03ac
cmake: add missing ${...} for variables inside generator expressions
2017-12-23 03:00:15 +02:00
ab021d163e
CMakeLists: Derive the source directory grouping from targets themselves
...
Removes the need to store to separate SRC and HEADER variables,
and then construct the target in most cases.
2017-12-11 21:11:52 -05:00
16dcec05d1
Merge pull request #3151 from MerryMage/looping-bug
...
Audio/HLE/Source: Fix looped state not updating
2017-11-29 10:43:06 -05:00
e9a95b2e7d
CoreTiming: Reworked CoreTiming ( #3119 )
...
* CoreTiming: New CoreTiming; Add Test for CoreTiming
2017-11-25 14:56:57 +01:00
8a5cc14ba4
Audio/HLE/Source: Fix looped state not updating
...
Bugfix for ff280800
2017-11-25 11:10:10 +00:00
211cc5e28f
sdl2_sink: Disallow audio device from changing any parameter other than the frequency
...
We currently do not handle the cases when channel number or channel format differ from what we expect.
2017-10-24 14:03:34 +01:00
a13ab958cb
Fixed type conversion ambiguity
2017-09-30 09:34:35 +01:00
d7459354f5
Audio: Use std::deque instead of std::vector for the audio buffer type (StereoBuffer16).
...
The current code inserts and deletes elements from the beginning of the audio buffer, which is very inefficient in an std::vector.
Profiling was done using VisualStudio2017's Performance Analyzer in Super Mario 3D Land.
Before this change: AudioInterp::Linear had 14.14% of the runtime (inclusive) and most of that time was spent in std::vector's insert implementation.
After this change: AudioInterp::Linear has 0.36% of the runtime (inclusive)
2017-09-25 18:31:37 -05:00
933508e2a2
interpolate: Interpolate on a frame-by-frame basis
2017-08-28 10:54:41 +01:00
74afcd5328
CMake: Add SoundTouch include path to target property
2017-05-27 22:09:28 -07:00
776cb91785
CMake: Define an interface target for SDL2 definitions
2017-05-27 21:38:49 -07:00
7b81903756
CMake: Correct inter-module dependencies and library visibility
...
Modules didn't correctly define their dependencies before, which relied
on the frontends implicitly including every module for linking to
succeed.
Also changed every target_link_libraries call to specify visibility of
dependencies to avoid leaking definitions to dependents when not
necessary.
2017-05-27 18:41:24 -07:00
b4a93cfdde
DSP: Create backing memory for entire DSP RAM
...
Also move address space mapping out of video_core.
2017-05-09 21:44:00 -07:00
0cb52ee74a
Doxygen: Amend minor issues ( #2593 )
...
Corrects a few issues with regards to Doxygen documentation, for example:
- Incorrect parameter referencing.
- Missing @param tags.
- Typos in @param tags.
and a few minor other issues.
2017-02-26 17:58:51 -08:00
ff28080091
Support looping HLE audio ( #2422 )
...
* Support looping HLE audio
* DSP: Fix dirty bit clears, handle nonmonotonically incrementing IDs
* DSP: Add start offset support
2017-01-29 23:52:25 -08:00
3545b144f1
fixed the override warning
...
```
In file included from citra/src/audio_core/sink_details.cpp:11:
citra/src/./audio_core/sdl2_sink.h:25:10: warning: 'SetDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
void SetDevice(int device_id);
^
citra/src/./audio_core/sink.h:39:18: note: overridden virtual function is here
virtual void SetDevice(int device_id) = 0;
^
```
2017-01-27 14:24:14 -06:00
f852369986
SDL: Select audio device ( #2403 )
...
* Initial Commit
Added Device logic to Sinks
Started on UI for selecting devices
Removed redundant import
* Audio Core: Complete Device Switching
Complete the device switching implementation by allowing the output
device to be loaded, changed and saved through the configurations menu.
Worked with the Sink abstraction and tuned the "Device Selection"
configuration so that the Device List is automatically populated when
the Sink is changed.
This hopefully addresses the concerns and recommendations mentioned in
the comments of the PR.
* Clean original implementation.
* Refactor GetSinkDetails
2017-01-25 22:33:26 -05:00
efcab1e918
time_stretch: Add missing #pragma once directive
2016-12-12 19:16:46 -05:00
963aedd8cc
Add all services to the Service namespace
...
Previously there was a split where some of the services were in the
Service namespace and others were not.
2016-12-11 00:07:27 +00:00
cef0f5b5a7
audio_core: SelectSink should default to auto if sink_id is invalid
2016-12-10 01:26:22 +00:00
James Rowe
vvanelslande
zhupengfei
Weiyi Wang
liushuyu
Vamsi Krishna
fearlessTobi
Lioncash
tgsm
B3N30
Otávio Pace
Ben
RoadrunnerWMC
Subv
Merry
BreadFish64
NarcolepticK
darkf
Daniel Lim Wee Soong
bunnei
Huw Pascoe
Yuri Kunde Schlesner
Jake Merdich
noah the goodra
Kloen Lansfiel