fix naming conflict with audio_info

Author: oliviamiller

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

@@ -125,9 +125,9 @@ void SineWaveAudioIn::get_audio(std::string const& codec,
         std::memcpy(chunk.audio_data.data(), samples.data(), chunk.audio_data.size());
 
         // Set audio info
-        chunk.audio_info.codec = codec;
-        chunk.audio_info.sample_rate_hz = sample_rate;
-        chunk.audio_info.num_channels = 1;
+        chunk.info.codec = codec;
+        chunk.info.sample_rate_hz = sample_rate;
+        chunk.info.num_channels = 1;
 
         // Get current timestamp in nanoseconds
         auto now = std::chrono::system_clock::now();

src/viam/sdk/components/audio_in.hpp

@@ -43,7 +43,7 @@ class AudioIn : public Component {
     /// streams.
     struct audio_chunk {
         std::vector<uint8_t> audio_data;
-        audio_info audio_info;
+        audio_info info;
         int64_t start_timestamp_ns;
         int64_t end_timestamp_ns;
         int sequence;

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

@@ -53,9 +53,9 @@ void AudioInClient::get_audio(std::string const& codec,
             chunk.request_id = response.request_id();
 
             if (response.audio().has_audio_info()) {
-                chunk.audio_info.codec = response.audio().audio_info().codec();
-                chunk.audio_info.sample_rate_hz = response.audio().audio_info().sample_rate_hz();
-                chunk.audio_info.num_channels = response.audio().audio_info().num_channels();
+                chunk.info.codec = response.audio().audio_info().codec();
+                chunk.info.sample_rate_hz = response.audio().audio_info().sample_rate_hz();
+                chunk.info.num_channels = response.audio().audio_info().num_channels();
             }
             return chunk_handler(std::move(chunk));
         });

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

@@ -37,9 +37,9 @@ ::grpc::Status AudioInServer::GetAudio(
 
             // Set audio_info fields
             auto* audio_info = audio_chunk->mutable_audio_info();
-            audio_info->set_codec(std::move(chunk.audio_info.codec));
-            audio_info->set_sample_rate_hz(chunk.audio_info.sample_rate_hz);
-            audio_info->set_num_channels(chunk.audio_info.num_channels);
+            audio_info->set_codec(std::move(chunk.info.codec));
+            audio_info->set_sample_rate_hz(chunk.info.sample_rate_hz);
+            audio_info->set_num_channels(chunk.info.num_channels);
 
             audio_chunk->set_start_timestamp_nanoseconds(chunk.start_timestamp_ns);
             audio_chunk->set_end_timestamp_nanoseconds(chunk.end_timestamp_ns);

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

@@ -74,9 +74,9 @@ std::vector<AudioIn::audio_chunk> fake_audio_chunks() {
     for (int i = 0; i < 5; ++i) {
         AudioIn::audio_chunk chunk;
         chunk.audio_data = std::vector<uint8_t>(1024, static_cast<uint8_t>(i + 1));
-        chunk.audio_info.codec = "pcm16";
-        chunk.audio_info.sample_rate_hz = 48000;
-        chunk.audio_info.num_channels = 1;
+        chunk.info.codec = "pcm16";
+        chunk.info.sample_rate_hz = 48000;
+        chunk.info.num_channels = 1;
         chunk.start_timestamp_ns = i * 10000000;
         chunk.end_timestamp_ns = (i + 1) * 10000000;
         chunks.push_back(chunk);

src/viam/sdk/tests/test_audio_in.cpp

@@ -47,9 +47,9 @@ BOOST_AUTO_TEST_CASE(test_get_audio) {
         // Verify chunk properties
         for (const auto& chunk : received_chunks) {
             BOOST_CHECK_GT(chunk.audio_data.size(), 0);
-            BOOST_CHECK_EQUAL(chunk.audio_info.codec, "pcm16");
-            BOOST_CHECK_EQUAL(chunk.audio_info.sample_rate_hz, 48000);
-            BOOST_CHECK_EQUAL(chunk.audio_info.num_channels, 1);
+            BOOST_CHECK_EQUAL(chunk.info.codec, "pcm16");
+            BOOST_CHECK_EQUAL(chunk.info.sample_rate_hz, 48000);
+            BOOST_CHECK_EQUAL(chunk.info.num_channels, 1);
         }
     });
 }