admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove last use of ACMAMRPackingFormat

Browse Source 
It was no-op used in FileRecorder.

BUG=webrtc:3520

Review URL: https://codereview.webrtc.org/1360173003

Cr-Commit-Position: refs/heads/master@{#10102}
This commit is contained in:
henrik.lundin 2015-09-28 23:30:22 -07:00 committed by Commit bot
parent d6024e3c34
commit fb9e76369d
4 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h
View File

@ -34,25 +34,6 @@ enum ACMVADMode {
VADVeryAggr = 3
};
///////////////////////////////////////////////////////////////////////////
// enum ACMAMRPackingFormat
// An enumerator for different bit-packing format of AMR codec according to
// RFC 3267.
//
// -AMRUndefined : undefined.
// -AMRBandwidthEfficient : bandwidth-efficient mode.
// -AMROctetAlligned : Octet-alligned mode.
// -AMRFileStorage : file-storage mode.
//
// TODO(henrik.lundin) Remove; only referenced in file_recorder, but all use
// is no-op.
enum ACMAMRPackingFormat {
AMRUndefined = -1,
AMRBandwidthEfficient = 0,
AMROctetAlligned = 1,
AMRFileStorage = 2
};
///////////////////////////////////////////////////////////////////////////
//
// Enumeration of Opus mode for intended application.

8
webrtc/modules/utility/interface/file_recorder.h
View File

@ -13,7 +13,6 @@
#include "webrtc/common_types.h"
#include "webrtc/engine_configurations.h"
#include "webrtc/modules/audio_coding/main/interface/audio_coding_module_typedefs.h"
#include "webrtc/modules/interface/module_common_types.h"
#include "webrtc/modules/media_file/interface/media_file_defines.h"
#include "webrtc/system_wrappers/interface/tick_util.h"
@ -40,14 +39,12 @@ public:
virtual int32_t StartRecordingAudioFile(
const char* fileName,
const CodecInst& codecInst,
uint32_t notification,
ACMAMRPackingFormat amrFormat = AMRFileStorage) = 0;
uint32_t notification) = 0;
virtual int32_t StartRecordingAudioFile(
OutStream& destStream,
const CodecInst& codecInst,
uint32_t notification,
ACMAMRPackingFormat amrFormat = AMRFileStorage) = 0;
uint32_t notification) = 0;
// Stop recording.
// Note: this API is for both audio and video.
@ -74,7 +71,6 @@ public:
const char* fileName,
const CodecInst& audioCodecInst,
const VideoCodec& videoCodecInst,
ACMAMRPackingFormat amrFormat = AMRFileStorage,
bool videoOnly = false) = 0;
// Record the video frame in videoFrame to AVI file.

11
webrtc/modules/utility/source/file_recorder_impl.cc
View File

@ -32,7 +32,6 @@ FileRecorderImpl::FileRecorderImpl(uint32_t instanceID,
_fileFormat(fileFormat),
_moduleFile(MediaFile::CreateMediaFile(_instanceID)),
codec_info_(),
_amrFormat(AMRFileStorage),
_audioBuffer(),
_audioEncoder(instanceID),
_audioResampler()
@ -62,16 +61,13 @@ int32_t FileRecorderImpl::RegisterModuleFileCallback(
int32_t FileRecorderImpl::StartRecordingAudioFile(
const char* fileName,
const CodecInst& codecInst,
uint32_t notificationTimeMs,
ACMAMRPackingFormat amrFormat)
uint32_t notificationTimeMs)
{
if(_moduleFile == NULL)
{
return -1;
}
codec_info_ = codecInst;
_amrFormat = amrFormat;
int32_t retVal = 0;
retVal =_moduleFile->StartRecordingAudioFile(fileName, _fileFormat,
codecInst,
@ -97,12 +93,9 @@ int32_t FileRecorderImpl::StartRecordingAudioFile(
int32_t FileRecorderImpl::StartRecordingAudioFile(
OutStream& destStream,
const CodecInst& codecInst,
uint32_t notificationTimeMs,
ACMAMRPackingFormat amrFormat)
uint32_t notificationTimeMs)
{
codec_info_ = codecInst;
_amrFormat = amrFormat;
int32_t retVal = _moduleFile->StartRecordingAudioStream(
destStream,
_fileFormat,

11
webrtc/modules/utility/source/file_recorder_impl.h
View File

@ -50,13 +50,11 @@ public:
virtual int32_t StartRecordingAudioFile(
const char* fileName,
const CodecInst& codecInst,
uint32_t notificationTimeMs,
ACMAMRPackingFormat amrFormat = AMRFileStorage);
uint32_t notificationTimeMs) override;
virtual int32_t StartRecordingAudioFile(
OutStream& destStream,
const CodecInst& codecInst,
uint32_t notificationTimeMs,
ACMAMRPackingFormat amrFormat = AMRFileStorage);
uint32_t notificationTimeMs) override;
virtual int32_t StopRecording();
virtual bool IsRecording() const;
virtual int32_t codec_info(CodecInst& codecInst) const;
@ -67,8 +65,7 @@ public:
const char* fileName,
const CodecInst& audioCodecInst,
const VideoCodec& videoCodecInst,
ACMAMRPackingFormat amrFormat = AMRFileStorage,
bool videoOnly = false)
bool videoOnly = false) override
{
return -1;
}
@ -88,8 +85,6 @@ protected:
private:
CodecInst codec_info_;
ACMAMRPackingFormat _amrFormat;
int8_t _audioBuffer[MAX_AUDIO_BUFFER_IN_BYTES];
AudioCoder _audioEncoder;
Resampler _audioResampler;