yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0

Merge pull request #2958 from Subv/audio_buffer_datatype

Audio: Use std::deque instead of std::vector for the audio buffer type (StereoBuffer16)
This commit is contained in:
Merry 2017-09-26 08:47:37 +01:00 committed by GitHub
commit 0c20da7fde
5 changed files with 9 additions and 7 deletions

View File

@ -117,7 +117,9 @@ StereoBuffer16 DecodePCM16(const unsigned num_channels, const u8* const data,
ret[i].fill(sample); ret[i].fill(sample);
} }
} else { } else {
std::memcpy(ret.data(), data, sample_count * 2 * sizeof(u16)); for (size_t i = 0; i < sample_count; ++i) {
std::memcpy(&ret[i], data + i * sizeof(s16) * 2, 2 * sizeof(s16));
}
} }
return ret; return ret;

View File

@ -5,13 +5,13 @@
#pragma once #pragma once
#include <array> #include <array>
#include <vector> #include <deque>
#include "common/common_types.h" #include "common/common_types.h"
namespace Codec { namespace Codec {
/// A variable length buffer of signed PCM16 stereo samples. /// A variable length buffer of signed PCM16 stereo samples.
using StereoBuffer16 = std::vector<std::array<s16, 2>>; using StereoBuffer16 = std::deque<std::array<s16, 2>>;
/// See: Codec::DecodeADPCM /// See: Codec::DecodeADPCM
struct ADPCMState { struct ADPCMState {

View File

@ -108,7 +108,7 @@ private:
u32 current_sample_number = 0; u32 current_sample_number = 0;
u32 next_sample_number = 0; u32 next_sample_number = 0;
std::vector<std::array<s16, 2>> current_buffer; AudioInterp::StereoBuffer16 current_buffer;
// buffer_id state // buffer_id state

View File

@ -47,7 +47,7 @@ static void StepOverSamples(State& state, StereoBuffer16& input, float rate,
state.xn1 = input[inputi + 1]; state.xn1 = input[inputi + 1];
state.fposition = fposition - inputi * scale_factor; state.fposition = fposition - inputi * scale_factor;
input.erase(input.begin(), input.begin() + inputi + 2); input.erase(input.begin(), std::next(input.begin(), inputi + 2));
} }
void None(State& state, StereoBuffer16& input, float rate, DSP::HLE::StereoFrame16& output, void None(State& state, StereoBuffer16& input, float rate, DSP::HLE::StereoFrame16& output,

View File

@ -5,14 +5,14 @@
#pragma once #pragma once
#include <array> #include <array>
#include <vector> #include <deque>
#include "audio_core/hle/common.h" #include "audio_core/hle/common.h"
#include "common/common_types.h" #include "common/common_types.h"
namespace AudioInterp { namespace AudioInterp {
/// A variable length buffer of signed PCM16 stereo samples. /// A variable length buffer of signed PCM16 stereo samples.
using StereoBuffer16 = std::vector<std::array<s16, 2>>; using StereoBuffer16 = std::deque<std::array<s16, 2>>;
struct State { struct State {
/// Two historical samples. /// Two historical samples.