r4326 was mistakenly committed to stable, so this is to re-merge back to trunk. Fixed the AGC and interface problems on the new path. In order to make the AGC work properly, we need to cache the volume value passed by the callback, compare it with the value returned by shared->transmit_mixer()->CaptureLevel(). If they are the same, we need to return 0 to indicate no volume needs changing, otherwise return the new volume. By doing this, we avoid setting the volume all the same, which allows the users to change the volume manually. This patch also fixes some minor issues with the interfaces too: make the int channel[] const, and correct the order of the input params in channel::Demultiplex. R=tommi@webrtc.org BUG=[2134] TEST=compile && manual AGC test Review URL: https://webrtc-codereview.appspot.com/1921004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4450 4adac7df-926f-26a2-2b94-8c16560cd09d
248 lines
7.7 KiB
C++
248 lines
7.7 KiB
C++
/*
|
|
* 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 WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
|
|
#define WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
|
|
|
|
#include "webrtc/common_audio/resampler/include/push_resampler.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/modules/interface/module_common_types.h"
|
|
#include "webrtc/modules/utility/interface/file_player.h"
|
|
#include "webrtc/modules/utility/interface/file_recorder.h"
|
|
#include "webrtc/voice_engine/include/voe_base.h"
|
|
#include "webrtc/voice_engine/level_indicator.h"
|
|
#include "webrtc/voice_engine/monitor_module.h"
|
|
#include "webrtc/voice_engine/voice_engine_defines.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioProcessing;
|
|
class ProcessThread;
|
|
class VoEExternalMedia;
|
|
class VoEMediaProcess;
|
|
|
|
namespace voe {
|
|
|
|
class ChannelManager;
|
|
class MixedAudio;
|
|
class Statistics;
|
|
|
|
class TransmitMixer : public MonitorObserver,
|
|
public FileCallback
|
|
|
|
{
|
|
public:
|
|
static int32_t Create(TransmitMixer*& mixer, uint32_t instanceId);
|
|
|
|
static void Destroy(TransmitMixer*& mixer);
|
|
|
|
int32_t SetEngineInformation(ProcessThread& processThread,
|
|
Statistics& engineStatistics,
|
|
ChannelManager& channelManager);
|
|
|
|
int32_t SetAudioProcessingModule(
|
|
AudioProcessing* audioProcessingModule);
|
|
|
|
int32_t PrepareDemux(const void* audioSamples,
|
|
uint32_t nSamples,
|
|
uint8_t nChannels,
|
|
uint32_t samplesPerSec,
|
|
uint16_t totalDelayMS,
|
|
int32_t clockDrift,
|
|
uint16_t currentMicLevel,
|
|
bool keyPressed);
|
|
|
|
|
|
int32_t DemuxAndMix();
|
|
// Used by the Chrome to pass the recording data to the specific VoE
|
|
// channels for demux.
|
|
void DemuxAndMix(const int voe_channels[], int number_of_voe_channels);
|
|
|
|
int32_t EncodeAndSend();
|
|
// Used by the Chrome to pass the recording data to the specific VoE
|
|
// channels for encoding and sending to the network.
|
|
void EncodeAndSend(const int voe_channels[], int number_of_voe_channels);
|
|
|
|
uint32_t CaptureLevel() const;
|
|
|
|
int32_t StopSend();
|
|
|
|
// VoEDtmf
|
|
void UpdateMuteMicrophoneTime(uint32_t lengthMs);
|
|
|
|
// VoEExternalMedia
|
|
int RegisterExternalMediaProcessing(VoEMediaProcess* object,
|
|
ProcessingTypes type);
|
|
int DeRegisterExternalMediaProcessing(ProcessingTypes type);
|
|
|
|
int GetMixingFrequency();
|
|
|
|
// VoEVolumeControl
|
|
int SetMute(bool enable);
|
|
|
|
bool Mute() const;
|
|
|
|
int8_t AudioLevel() const;
|
|
|
|
int16_t AudioLevelFullRange() const;
|
|
|
|
bool IsRecordingCall();
|
|
|
|
bool IsRecordingMic();
|
|
|
|
int StartPlayingFileAsMicrophone(const char* fileName,
|
|
bool loop,
|
|
FileFormats format,
|
|
int startPosition,
|
|
float volumeScaling,
|
|
int stopPosition,
|
|
const CodecInst* codecInst);
|
|
|
|
int StartPlayingFileAsMicrophone(InStream* stream,
|
|
FileFormats format,
|
|
int startPosition,
|
|
float volumeScaling,
|
|
int stopPosition,
|
|
const CodecInst* codecInst);
|
|
|
|
int StopPlayingFileAsMicrophone();
|
|
|
|
int IsPlayingFileAsMicrophone() const;
|
|
|
|
int ScaleFileAsMicrophonePlayout(float scale);
|
|
|
|
int StartRecordingMicrophone(const char* fileName,
|
|
const CodecInst* codecInst);
|
|
|
|
int StartRecordingMicrophone(OutStream* stream,
|
|
const CodecInst* codecInst);
|
|
|
|
int StopRecordingMicrophone();
|
|
|
|
int StartRecordingCall(const char* fileName, const CodecInst* codecInst);
|
|
|
|
int StartRecordingCall(OutStream* stream, const CodecInst* codecInst);
|
|
|
|
int StopRecordingCall();
|
|
|
|
void SetMixWithMicStatus(bool mix);
|
|
|
|
int32_t RegisterVoiceEngineObserver(VoiceEngineObserver& observer);
|
|
|
|
virtual ~TransmitMixer();
|
|
|
|
// MonitorObserver
|
|
void OnPeriodicProcess();
|
|
|
|
|
|
// FileCallback
|
|
void PlayNotification(int32_t id,
|
|
uint32_t durationMs);
|
|
|
|
void RecordNotification(int32_t id,
|
|
uint32_t durationMs);
|
|
|
|
void PlayFileEnded(int32_t id);
|
|
|
|
void RecordFileEnded(int32_t id);
|
|
|
|
#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION
|
|
// Typing detection
|
|
int TimeSinceLastTyping(int &seconds);
|
|
int SetTypingDetectionParameters(int timeWindow,
|
|
int costPerTyping,
|
|
int reportingThreshold,
|
|
int penaltyDecay,
|
|
int typeEventDelay);
|
|
#endif
|
|
|
|
void EnableStereoChannelSwapping(bool enable);
|
|
bool IsStereoChannelSwappingEnabled();
|
|
|
|
private:
|
|
TransmitMixer(uint32_t instanceId);
|
|
|
|
// Gets the maximum sample rate and number of channels over all currently
|
|
// sending codecs.
|
|
void GetSendCodecInfo(int* max_sample_rate, int* max_channels);
|
|
|
|
int GenerateAudioFrame(const int16_t audioSamples[],
|
|
int nSamples,
|
|
int nChannels,
|
|
int samplesPerSec);
|
|
int32_t RecordAudioToFile(uint32_t mixingFrequency);
|
|
|
|
int32_t MixOrReplaceAudioWithFile(
|
|
int mixingFrequency);
|
|
|
|
void ProcessAudio(int delay_ms, int clock_drift, int current_mic_level);
|
|
|
|
#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION
|
|
int TypingDetection(bool keyPressed);
|
|
#endif
|
|
|
|
// uses
|
|
Statistics* _engineStatisticsPtr;
|
|
ChannelManager* _channelManagerPtr;
|
|
AudioProcessing* audioproc_;
|
|
VoiceEngineObserver* _voiceEngineObserverPtr;
|
|
ProcessThread* _processThreadPtr;
|
|
|
|
// owns
|
|
MonitorModule _monitorModule;
|
|
AudioFrame _audioFrame;
|
|
PushResampler resampler_; // ADM sample rate -> mixing rate
|
|
FilePlayer* _filePlayerPtr;
|
|
FileRecorder* _fileRecorderPtr;
|
|
FileRecorder* _fileCallRecorderPtr;
|
|
int _filePlayerId;
|
|
int _fileRecorderId;
|
|
int _fileCallRecorderId;
|
|
bool _filePlaying;
|
|
bool _fileRecording;
|
|
bool _fileCallRecording;
|
|
voe::AudioLevel _audioLevel;
|
|
// protect file instances and their variables in MixedParticipants()
|
|
CriticalSectionWrapper& _critSect;
|
|
CriticalSectionWrapper& _callbackCritSect;
|
|
|
|
#ifdef WEBRTC_VOICE_ENGINE_TYPING_DETECTION
|
|
int32_t _timeActive;
|
|
int32_t _timeSinceLastTyping;
|
|
int32_t _penaltyCounter;
|
|
bool _typingNoiseWarning;
|
|
|
|
// Tunable treshold values
|
|
int _timeWindow; // nr of10ms slots accepted to count as a hit.
|
|
int _costPerTyping; // Penalty added for a typing + activity coincide.
|
|
int _reportingThreshold; // Threshold for _penaltyCounter.
|
|
int _penaltyDecay; // How much we reduce _penaltyCounter every 10 ms.
|
|
int _typeEventDelay; // How old typing events we allow
|
|
|
|
#endif
|
|
bool _saturationWarning;
|
|
|
|
int _instanceId;
|
|
bool _mixFileWithMicrophone;
|
|
uint32_t _captureLevel;
|
|
VoEMediaProcess* external_postproc_ptr_;
|
|
VoEMediaProcess* external_preproc_ptr_;
|
|
bool _mute;
|
|
int32_t _remainingMuteMicTimeMs;
|
|
bool stereo_codec_;
|
|
bool swap_stereo_channels_;
|
|
};
|
|
|
|
#endif // WEBRTC_VOICE_ENGINE_TRANSMIT_MIXER_H
|
|
|
|
} // namespace voe
|
|
|
|
} // namespace webrtc
|