From 0acebe223864e5bd229647db4c4e45946c7eff86 Mon Sep 17 00:00:00 2001 From: zhihuang Date: Thu, 11 May 2017 22:07:37 -0700 Subject: [PATCH] Reland of Make AudioSinkInterface::Data hold a const pointer to the audio buffer. (patchset #1 id:1 of https://codereview.webrtc.org/2877013002/ ) Reason for revert: Re-land the original CL because the reverting it didn't fix the problem. Original issue's description: > Revert of Make AudioSinkInterface::Data hold a const pointer to the audio buffer. (patchset #1 id:1 of https://codereview.webrtc.org/2873803002/ ) > > Reason for revert: > Reverted because it possibly breaks the internal project. > > Original issue's description: > > Make AudioSinkInterface::Data hold a const pointer to the audio buffer. > > > > This is in preparation for https://codereview.webrtc.org/2750783004/, where > > requiring a non-const pointer for AudioSinkInterface would force an unmuting > > and zeroing of every frame. > > > > BUG=webrtc:7343 > > > > Review-Url: https://codereview.webrtc.org/2873803002 > > Cr-Commit-Position: refs/heads/master@{#18107} > > Committed: https://chromium.googlesource.com/external/webrtc/+/38605965bd68ad1e376c530883041b9c12f26d3b > > TBR=solenberg@webrtc.org,henrik.lundin@webrtc.org,yujo@chromium.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7343 > > Review-Url: https://codereview.webrtc.org/2877013002 > Cr-Commit-Position: refs/heads/master@{#18112} > Committed: https://chromium.googlesource.com/external/webrtc/+/c904634823fe3021d24116de246c95a7d7a2fb91 TBR=solenberg@webrtc.org,henrik.lundin@webrtc.org,yujo@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:7343 Review-Url: https://codereview.webrtc.org/2880663003 Cr-Commit-Position: refs/heads/master@{#18113} --- webrtc/api/call/audio_sink.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/api/call/audio_sink.h b/webrtc/api/call/audio_sink.h index e865ead365..8d38763f94 100644 --- a/webrtc/api/call/audio_sink.h +++ b/webrtc/api/call/audio_sink.h @@ -27,7 +27,7 @@ class AudioSinkInterface { virtual ~AudioSinkInterface() {} struct Data { - Data(int16_t* data, + Data(const int16_t* data, size_t samples_per_channel, int sample_rate, size_t channels, @@ -38,7 +38,7 @@ class AudioSinkInterface { channels(channels), timestamp(timestamp) {} - int16_t* data; // The actual 16bit audio data. + const int16_t* data; // The actual 16bit audio data. size_t samples_per_channel; // Number of frames in the buffer. int sample_rate; // Sample rate in Hz. size_t channels; // Number of channels in the audio data.