mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-21 17:03:25 +02:00
Merge pull request #4721 from lioncash/genfn
codec: Make lookup table static constexpr
This commit is contained in:
commit
09609dd50e
@ -16,8 +16,9 @@ std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM
|
|||||||
|
|
||||||
constexpr std::size_t FRAME_LEN = 8;
|
constexpr std::size_t FRAME_LEN = 8;
|
||||||
constexpr std::size_t SAMPLES_PER_FRAME = 14;
|
constexpr std::size_t SAMPLES_PER_FRAME = 14;
|
||||||
constexpr std::array<int, 16> SIGNED_NIBBLES = {
|
static constexpr std::array<int, 16> SIGNED_NIBBLES{
|
||||||
{0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}};
|
0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1,
|
||||||
|
};
|
||||||
|
|
||||||
const std::size_t sample_count = (size / FRAME_LEN) * SAMPLES_PER_FRAME;
|
const std::size_t sample_count = (size / FRAME_LEN) * SAMPLES_PER_FRAME;
|
||||||
const std::size_t ret_size =
|
const std::size_t ret_size =
|
||||||
|
@ -38,7 +38,7 @@ using ADPCM_Coeff = std::array<s16, 16>;
|
|||||||
* @param state ADPCM state, this is updated with new state
|
* @param state ADPCM state, this is updated with new state
|
||||||
* @return Decoded stereo signed PCM16 data, sample_count in length
|
* @return Decoded stereo signed PCM16 data, sample_count in length
|
||||||
*/
|
*/
|
||||||
std::vector<s16> DecodeADPCM(const u8* const data, std::size_t size, const ADPCM_Coeff& coeff,
|
std::vector<s16> DecodeADPCM(const u8* data, std::size_t size, const ADPCM_Coeff& coeff,
|
||||||
ADPCMState& state);
|
ADPCMState& state);
|
||||||
|
|
||||||
}; // namespace AudioCore::Codec
|
}; // namespace AudioCore::Codec
|
||||||
|
@ -727,8 +727,9 @@ s32 CommandGenerator::DecodeAdpcm(ServerVoiceInfo& voice_info, VoiceState& dsp_s
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr std::array<int, 16> SIGNED_NIBBLES = {
|
static constexpr std::array<int, 16> SIGNED_NIBBLES{
|
||||||
{0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1}};
|
0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1,
|
||||||
|
};
|
||||||
|
|
||||||
constexpr std::size_t FRAME_LEN = 8;
|
constexpr std::size_t FRAME_LEN = 8;
|
||||||
constexpr std::size_t NIBBLES_PER_SAMPLE = 16;
|
constexpr std::size_t NIBBLES_PER_SAMPLE = 16;
|
||||||
|
Loading…
Reference in New Issue
Block a user