generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AudioFrame payload shouldn't be mutable.

Browse Source 
This requires making Mute() non-const, which is correct anyway.

BUG=
TEST=voe_auto_test on Linux

Review URL: https://webrtc-codereview.appspot.com/376001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1599 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-02-03 17:47:32 +00:00
parent ce0a6ff43d
commit dde977ec83
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/modules/interface/module_common_types.h
View File

@ -1,3 +1,13 @@
/*
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef MODULE_COMMON_TYPES_H #ifndef MODULE_COMMON_TYPES_H
#define MODULE_COMMON_TYPES_H #define MODULE_COMMON_TYPES_H
@ -737,7 +747,7 @@ public:
AudioFrame& Append(const AudioFrame& rhs); AudioFrame& Append(const AudioFrame& rhs);
void Mute() const; void Mute();
AudioFrame& operator=(const AudioFrame& rhs); AudioFrame& operator=(const AudioFrame& rhs);
AudioFrame& operator>>=(const WebRtc_Word32 rhs); AudioFrame& operator>>=(const WebRtc_Word32 rhs);
@ -748,7 +758,7 @@ public:
WebRtc_UWord32 _timeStamp; WebRtc_UWord32 _timeStamp;
// Supporting Stereo, stereo samples are interleaved // Supporting Stereo, stereo samples are interleaved
mutable WebRtc_Word16 _payloadData[kMaxAudioFrameSizeSamples]; WebRtc_Word16 _payloadData[kMaxAudioFrameSizeSamples];
WebRtc_UWord16 _payloadDataLengthInSamples; WebRtc_UWord16 _payloadDataLengthInSamples;
int _frequencyInHz; int _frequencyInHz;
WebRtc_UWord8 _audioChannel; WebRtc_UWord8 _audioChannel;
@ -825,7 +835,7 @@ AudioFrame::UpdateFrame(
inline inline
void void
AudioFrame::Mute() const AudioFrame::Mute()
{ {
memset(_payloadData, 0, _payloadDataLengthInSamples * sizeof(WebRtc_Word16)); memset(_payloadData, 0, _payloadDataLengthInSamples * sizeof(WebRtc_Word16));
} }