Skip to content

Commit 7616ba3

Browse files
committed
lint
1 parent b997866 commit 7616ba3

File tree

8 files changed

+27
-24
lines changed

8 files changed

+27
-24
lines changed

src/viam/examples/modules/audioin/client.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ int main() {
7777
auto chunk_handler = [&](AudioIn::audio_chunk&& chunk) -> bool {
7878
chunk_count++;
7979
VIAM_SDK_LOG(info) << "Received chunk " << chunk_count
80-
<< " - length: " << chunk.audio_data.size()
81-
<< " bytes";
80+
<< " - length: " << chunk.audio_data.size() << " bytes";
8281

8382
for (const auto& byte : chunk.audio_data) {
8483
all_audio_data.push_back(static_cast<uint8_t>(byte));
@@ -95,7 +94,11 @@ int main() {
9594

9695
std::string filename = "sine_wave_audio.wav";
9796
try {
98-
write_wav_file(filename, all_audio_data, audio_codecs::PCM_16, props.sample_rate_hz, props.num_channels);
97+
write_wav_file(filename,
98+
all_audio_data,
99+
audio_codecs::PCM_16,
100+
props.sample_rate_hz,
101+
props.num_channels);
99102
VIAM_SDK_LOG(info) << "Audio saved to " << filename;
100103
VIAM_SDK_LOG(info) << "To play: open " << filename << " (or use any audio player)";
101104
} catch (const std::exception& e) {

src/viam/examples/modules/audioin/main.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ ProtoStruct SineWaveAudioIn::do_command(const ProtoStruct& command) {
8989
return command;
9090
}
9191

92-
// Generates a single audio sample representing a sine wave at the given frequency, amplitude, and time.
92+
// Generates a single audio sample representing a sine wave at the given frequency, amplitude, and
93+
// time.
9394
double SineWaveAudioIn::generate_sine_sample(double frequency,
9495
double amplitude,
9596
double time_seconds) {
@@ -101,8 +102,7 @@ int16_t SineWaveAudioIn::float_to_pcm16(double sample_value) {
101102
return static_cast<int16_t>(sample_value * 32767.0);
102103
}
103104

104-
std::vector<uint8_t> SineWaveAudioIn::pcm16_samples_to_bytes(
105-
const std::vector<int16_t>& samples) {
105+
std::vector<uint8_t> SineWaveAudioIn::pcm16_samples_to_bytes(const std::vector<int16_t>& samples) {
106106
std::vector<uint8_t> bytes(samples.size() * sizeof(int16_t));
107107
std::copy(reinterpret_cast<const uint8_t*>(samples.data()),
108108
reinterpret_cast<const uint8_t*>(samples.data()) + bytes.size(),
@@ -111,10 +111,10 @@ std::vector<uint8_t> SineWaveAudioIn::pcm16_samples_to_bytes(
111111
}
112112

113113
AudioIn::audio_chunk SineWaveAudioIn::create_audio_chunk(const std::vector<int16_t>& samples,
114-
const std::string& codec,
115-
int sample_rate_hz,
116-
int num_channels,
117-
int sequence_number) {
114+
const std::string& codec,
115+
int sample_rate_hz,
116+
int num_channels,
117+
int sequence_number) {
118118
audio_chunk chunk;
119119
chunk.audio_data = pcm16_samples_to_bytes(samples);
120120
chunk.info.codec = codec;

src/viam/sdk/common/audio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ void write_value(std::ofstream& out, const T& value) {
1515

1616
bool operator==(const properties& lhs, const properties& rhs) {
1717
return std::tie(lhs.supported_codecs, lhs.sample_rate_hz, lhs.num_channels) ==
18-
std::tie(rhs.supported_codecs, rhs.sample_rate_hz, rhs.num_channels);
18+
std::tie(rhs.supported_codecs, rhs.sample_rate_hz, rhs.num_channels);
1919
}
2020

2121
uint16_t get_bits_per_sample(const std::string& codec) {

src/viam/sdk/common/audio.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ namespace sdk {
1010

1111
/// @brief Common audio codecs
1212
namespace audio_codecs {
13-
constexpr const char* PCM_16 = "pcm16";
14-
constexpr const char* PCM_32 = "pcm32";
15-
constexpr const char* PCM_32_FLOAT = "pcm32_float";
16-
constexpr const char* MP3 = "mp3";
17-
constexpr const char* AAC = "aac";
18-
constexpr const char* OPUS = "opus";
19-
constexpr const char* FLAC = "flac";
20-
}
13+
constexpr const char* PCM_16 = "pcm16";
14+
constexpr const char* PCM_32 = "pcm32";
15+
constexpr const char* PCM_32_FLOAT = "pcm32_float";
16+
constexpr const char* MP3 = "mp3";
17+
constexpr const char* AAC = "aac";
18+
constexpr const char* OPUS = "opus";
19+
constexpr const char* FLAC = "flac";
20+
} // namespace audio_codecs
2121

2222
/// @struct properties
2323
/// @brief Properties of an audio component (input or output)

src/viam/sdk/components/audio_in.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
#include <string>
77

8+
#include <viam/sdk/common/audio.hpp>
89
#include <viam/sdk/common/proto_value.hpp>
910
#include <viam/sdk/common/utils.hpp>
10-
#include <viam/sdk/common/audio.hpp>
1111
#include <viam/sdk/config/resource.hpp>
1212

1313
namespace viam {

src/viam/sdk/components/private/audio_in_client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ void AudioInClient::get_audio(std::string const& codec,
4444

4545
// Convert audio_data from string to std::vector<uint8_t>
4646
const std::string& audio_data_str = response.audio().audio_data();
47-
chunk.audio_data.assign(
48-
audio_data_str.c_str(), audio_data_str.c_str() + audio_data_str.size());
47+
chunk.audio_data.assign(audio_data_str.c_str(),
48+
audio_data_str.c_str() + audio_data_str.size());
4949

5050
chunk.sequence_number = response.audio().sequence();
5151
chunk.request_id = response.request_id();

src/viam/sdk/tests/mocks/mock_audio_in.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include <viam/sdk/common/proto_value.hpp>
43
#include <viam/sdk/common/audio.hpp>
4+
#include <viam/sdk/common/proto_value.hpp>
55
#include <viam/sdk/components/audio_in.hpp>
66
#include <viam/sdk/resource/resource.hpp>
77

src/viam/sdk/tests/test_audio_in.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
#include <boost/optional/optional_io.hpp>
33
#include <boost/qvm/all.hpp>
44
#include <boost/test/included/unit_test.hpp>
5-
#include <viam/sdk/components/audio_in.hpp>
65
#include <viam/sdk/common/audio.hpp>
6+
#include <viam/sdk/components/audio_in.hpp>
77
#include <viam/sdk/spatialmath/geometry.hpp>
88
#include <viam/sdk/tests/mocks/mock_audio_in.hpp>
99
#include <viam/sdk/tests/test_utils.hpp>

0 commit comments

Comments
 (0)