From f55babc29804f5b8b9dc2358b6dce9d8799a143f Mon Sep 17 00:00:00 2001 From: Alex Loiko Date: Mon, 14 May 2018 12:39:32 +0200 Subject: [PATCH] Add namespace 'webrtc' to AudioFrameView. Mini-change: add 'webrtc' namespace. The template class AudioFrameView got declared in the global namespace by mistake. (My fault). Now fixing. Bug: webrtc:9262. Change-Id: I6f2b4ab1ccdb223505e7181b8e6f12f5f23b3684 Reviewed-on: https://webrtc-review.googlesource.com/76140 Commit-Queue: Alex Loiko Reviewed-by: Sam Zackrisson Cr-Commit-Position: refs/heads/master@{#23215} --- modules/audio_processing/audio_frame_view_unittest.cc | 2 ++ modules/audio_processing/include/audio_frame_view.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/modules/audio_processing/audio_frame_view_unittest.cc b/modules/audio_processing/audio_frame_view_unittest.cc index cf3049688e..7a9d126103 100644 --- a/modules/audio_processing/audio_frame_view_unittest.cc +++ b/modules/audio_processing/audio_frame_view_unittest.cc @@ -13,6 +13,7 @@ #include "modules/audio_processing/audio_buffer.h" #include "test/gtest.h" +namespace webrtc { TEST(AudioFrameTest, ConstructFromAudioBuffer) { constexpr int kSampleRateHz = 48000; constexpr int kNumChannels = 2; @@ -47,3 +48,4 @@ TEST(AudioFrameTest, ConstructFromAudioBuffer) { non_const_int16_view.channel(0)[0] = kIntConstant; EXPECT_EQ(buffer.channels()[0][0], kIntConstant); } +} // namespace webrtc diff --git a/modules/audio_processing/include/audio_frame_view.h b/modules/audio_processing/include/audio_frame_view.h index 366fc32660..ab5779ad6b 100644 --- a/modules/audio_processing/include/audio_frame_view.h +++ b/modules/audio_processing/include/audio_frame_view.h @@ -13,6 +13,8 @@ #include "api/array_view.h" +namespace webrtc { + // Class to pass audio data in T** format, where T is a numeric type. template class AudioFrameView { @@ -60,5 +62,6 @@ class AudioFrameView { size_t num_channels_; size_t channel_size_; }; +} // namespace webrtc #endif // MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_FRAME_VIEW_H_