Skip to content

Commit 41b598d

Browse files
committed
dont use std::byte
1 parent 75fde70 commit 41b598d

File tree

6 files changed

+7
-16
lines changed

6 files changed

+7
-16
lines changed

src/viam/examples/modules/audioin/CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ add_executable(audioin_module
1616
main.cpp
1717
)
1818

19-
set_target_properties(audioin_module PROPERTIES
20-
CXX_STANDARD 17
21-
CXX_STANDARD_REQUIRED ON
22-
)
23-
2419
target_link_libraries(audioin_module
2520
PRIVATE Threads::Threads
2621
viam-cpp-sdk::viamsdk
@@ -37,10 +32,6 @@ target_sources(audioin_client
3732
client.cpp
3833
)
3934

40-
set_target_properties(audioin_client PROPERTIES
41-
CXX_STANDARD 17
42-
CXX_STANDARD_REQUIRED ON
43-
)
4435

4536
target_link_libraries(audioin_client
4637
viam-cpp-sdk::viamsdk

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SineWaveAudioIn : public AudioIn, public Reconfigurable {
3232

3333
ProtoStruct do_command(const ProtoStruct&) override;
3434

35-
std::vector<GeometryConfig> get_geometries(const ProtoStruct&) {
35+
std::vector<GeometryConfig> get_geometries(const ProtoStruct&) override {
3636
throw Exception("method not supported");
3737
}
3838

@@ -120,7 +120,7 @@ void SineWaveAudioIn::get_audio(std::string const& codec,
120120

121121
audio_chunk chunk;
122122

123-
// Convert int16_t samples to std::byte
123+
// Convert int16_t samples to uint8_t bytes
124124
chunk.audio_data.resize(samples.size() * sizeof(int16_t));
125125
std::memcpy(chunk.audio_data.data(), samples.data(), chunk.audio_data.size());
126126

src/viam/sdk/components/audio_in.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AudioIn : public Component {
4242
/// @brief A sequential chunk of audio data with timing information for continuous audio
4343
/// streams.
4444
struct audio_chunk {
45-
std::vector<std::byte> audio_data;
45+
std::vector<uint8_t> audio_data;
4646
audio_info audio_info;
4747
int64_t start_timestamp_ns;
4848
int64_t end_timestamp_ns;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ void AudioInClient::get_audio(std::string const& codec,
4242
// Create audio_chunk struct from proto response
4343
audio_chunk chunk;
4444

45-
// Convert audio_data from string to std::vector<std::byte>
45+
// Convert audio_data from string to std::vector<uint8_t>
4646
const std::string& audio_data_str = response.audio().audio_data();
4747
chunk.audio_data.reserve(audio_data_str.size());
4848
for (char c : audio_data_str) {
49-
chunk.audio_data.push_back(static_cast<std::byte>(c));
49+
chunk.audio_data.push_back(static_cast<uint8_t>(c));
5050
}
5151

5252
chunk.sequence = response.audio().sequence();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ::grpc::Status AudioInServer::GetAudio(
2727
::viam::component::audioin::v1::GetAudioResponse response;
2828
auto* audio_chunk = response.mutable_audio();
2929

30-
// Convert audio_data from std::vector<std::byte> to string
30+
// Convert audio_data from std::vector<uint8_t> to string
3131
std::string audio_data_str;
3232
audio_data_str.reserve(chunk.audio_data.size());
3333
for (const auto& byte : chunk.audio_data) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ std::vector<AudioIn::audio_chunk> fake_audio_chunks() {
7373

7474
for (int i = 0; i < 5; ++i) {
7575
AudioIn::audio_chunk chunk;
76-
chunk.audio_data = std::vector<std::byte>(1024, static_cast<std::byte>(i + 1));
76+
chunk.audio_data = std::vector<uint8_t>(1024, static_cast<uint8_t>(i + 1));
7777
chunk.audio_info.codec = "pcm16";
7878
chunk.audio_info.sample_rate_hz = 48000;
7979
chunk.audio_info.num_channels = 1;

0 commit comments

Comments
 (0)