e7edea9759
Reason for revert:
voice_engine_unittests: FilePlayerTest.PlayWavPcm16File and FilePlayerTest.PlayWavPcmuFile fail on 32-bit android (android_rel and android-dbg try bots, Android32 Tests (L Nexus5) and Android32 Tests (L Nexus7.2) build bots).
Not sure why this would happen, since I just moved the test without modifying it. Some test filtering that no longer manages to disable them? Anyway, reverting until I know how to fix.
This was actually caught by the try bots, but I missed it because I was manually ignoring them because of an error with the bots. :-(
Original issue's description:
> Move FilePlayer and FileRecorder to Voice Engine
>
> Because Voice Engine was the only user.
>
> R=perkj@webrtc.org, solenberg@webrtc.org
>
> Committed: 65874b163e
TBR=perkj@webrtc.org,solenberg@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.webrtc.org/2092633002
Cr-Commit-Position: refs/heads/master@{#13267}
79 lines
2.5 KiB
C++
79 lines
2.5 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_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
|
|
#define WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
|
|
|
|
#include "webrtc/common_audio/resampler/include/resampler.h"
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/engine_configurations.h"
|
|
#include "webrtc/modules/media_file/media_file.h"
|
|
#include "webrtc/modules/media_file/media_file_defines.h"
|
|
#include "webrtc/modules/utility/include/file_player.h"
|
|
#include "webrtc/modules/utility/source/coder.h"
|
|
#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
class FilePlayerImpl : public FilePlayer
|
|
{
|
|
public:
|
|
FilePlayerImpl(uint32_t instanceID, FileFormats fileFormat);
|
|
~FilePlayerImpl();
|
|
|
|
virtual int Get10msAudioFromFile(
|
|
int16_t* outBuffer,
|
|
size_t& lengthInSamples,
|
|
int frequencyInHz);
|
|
virtual int32_t RegisterModuleFileCallback(FileCallback* callback);
|
|
virtual int32_t StartPlayingFile(
|
|
const char* fileName,
|
|
bool loop,
|
|
uint32_t startPosition,
|
|
float volumeScaling,
|
|
uint32_t notification,
|
|
uint32_t stopPosition = 0,
|
|
const CodecInst* codecInst = NULL);
|
|
virtual int32_t StartPlayingFile(
|
|
InStream& sourceStream,
|
|
uint32_t startPosition,
|
|
float volumeScaling,
|
|
uint32_t notification,
|
|
uint32_t stopPosition = 0,
|
|
const CodecInst* codecInst = NULL);
|
|
virtual int32_t StopPlayingFile();
|
|
virtual bool IsPlayingFile() const;
|
|
virtual int32_t GetPlayoutPosition(uint32_t& durationMs);
|
|
virtual int32_t AudioCodec(CodecInst& audioCodec) const;
|
|
virtual int32_t Frequency() const;
|
|
virtual int32_t SetAudioScaling(float scaleFactor);
|
|
|
|
protected:
|
|
int32_t SetUpAudioDecoder();
|
|
|
|
uint32_t _instanceID;
|
|
const FileFormats _fileFormat;
|
|
MediaFile& _fileModule;
|
|
|
|
uint32_t _decodedLengthInMS;
|
|
|
|
private:
|
|
AudioCoder _audioDecoder;
|
|
|
|
CodecInst _codec;
|
|
int32_t _numberOf10MsPerFrame;
|
|
int32_t _numberOf10MsInDecoder;
|
|
|
|
Resampler _resampler;
|
|
float _scaling;
|
|
};
|
|
} // namespace webrtc
|
|
#endif // WEBRTC_MODULES_UTILITY_SOURCE_FILE_PLAYER_IMPL_H_
|