summaryrefslogtreecommitdiff
path: root/src/audio_core/codec.h
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-21 11:29:48 -0700
committerGravatar GitHub2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/audio_core/codec.h
parentREADME: Specify master branch for Travis CI badge (diff)
parentFix Travis clang-format check (diff)
downloadyuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/audio_core/codec.h')
-rw-r--r--src/audio_core/codec.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h
index e695f2edc..2b0c395e6 100644
--- a/src/audio_core/codec.h
+++ b/src/audio_core/codec.h
@@ -6,7 +6,6 @@
6 6
7#include <array> 7#include <array>
8#include <vector> 8#include <vector>
9
10#include "common/common_types.h" 9#include "common/common_types.h"
11 10
12namespace Codec { 11namespace Codec {
@@ -29,7 +28,8 @@ struct ADPCMState {
29 * @param state ADPCM state, this is updated with new state 28 * @param state ADPCM state, this is updated with new state
30 * @return Decoded stereo signed PCM16 data, sample_count in length 29 * @return Decoded stereo signed PCM16 data, sample_count in length
31 */ 30 */
32StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count, const std::array<s16, 16>& adpcm_coeff, ADPCMState& state); 31StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count,
32 const std::array<s16, 16>& adpcm_coeff, ADPCMState& state);
33 33
34/** 34/**
35 * @param num_channels Number of channels 35 * @param num_channels Number of channels
@@ -37,7 +37,8 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const size_t sample_count, cons
37 * @param sample_count Length of buffer in terms of number of samples 37 * @param sample_count Length of buffer in terms of number of samples
38 * @return Decoded stereo signed PCM16 data, sample_count in length 38 * @return Decoded stereo signed PCM16 data, sample_count in length
39 */ 39 */
40StereoBuffer16 DecodePCM8(const unsigned num_channels, const u8* const data, const size_t sample_count); 40StereoBuffer16 DecodePCM8(const unsigned num_channels, const u8* const data,
41 const size_t sample_count);
41 42
42/** 43/**
43 * @param num_channels Number of channels 44 * @param num_channels Number of channels
@@ -45,6 +46,6 @@ StereoBuffer16 DecodePCM8(const unsigned num_channels, const u8* const data, con
45 * @param sample_count Length of buffer in terms of number of samples 46 * @param sample_count Length of buffer in terms of number of samples
46 * @return Decoded stereo signed PCM16 data, sample_count in length 47 * @return Decoded stereo signed PCM16 data, sample_count in length
47 */ 48 */
48StereoBuffer16 DecodePCM16(const unsigned num_channels, const u8* const data, const size_t sample_count); 49StereoBuffer16 DecodePCM16(const unsigned num_channels, const u8* const data,
49 50 const size_t sample_count);
50}; 51};