Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1055)

Unified Diff: components/audio_modem/audio_recorder_impl.h

Issue 940123004: Convert audio samples in Whispernet. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test fix. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/audio_modem/audio_recorder_impl.h
diff --git a/components/audio_modem/audio_recorder_impl.h b/components/audio_modem/audio_recorder_impl.h
index 5da0b1c0602f27b36082da610ae2928409882127..d5f567f0eff086dfecb00017bdf7fae32043458b 100644
--- a/components/audio_modem/audio_recorder_impl.h
+++ b/components/audio_modem/audio_recorder_impl.h
@@ -13,7 +13,6 @@
#include "components/audio_modem/audio_recorder.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
-#include "media/base/audio_converter.h"
namespace base {
class MessageLoop;
@@ -28,8 +27,7 @@ namespace audio_modem {
// The AudioRecorder class will record audio until told to stop.
class AudioRecorderImpl final
: public AudioRecorder,
- public media::AudioInputStream::AudioInputCallback,
- public media::AudioConverter::InputCallback {
+ public media::AudioInputStream::AudioInputCallback {
public:
using RecordedSamplesCallback = base::Callback<void(const std::string&)>;
@@ -79,10 +77,6 @@ class AudioRecorderImpl final
double volume) override;
void OnError(media::AudioInputStream* stream) override;
- // AudioConverter::InputCallback overrides:
- double ProvideInput(media::AudioBus* dest,
- base::TimeDelta buffer_delay) override;
-
// Flushes the audio loop, making sure that any queued operations are
// performed.
void FlushAudioLoopForTesting();
@@ -93,17 +87,12 @@ class AudioRecorderImpl final
RecordedSamplesCallback decode_callback_;
- // ProvideInput will use this buffer as its source.
- const media::AudioBus* temp_conversion_buffer_;
-
// Outside of the ctor/Initialize method, only access the next variables on
// the recording thread.
scoped_ptr<media::AudioBus> buffer_;
int total_buffer_frames_;
int buffer_frame_index_;
- scoped_ptr<media::AudioConverter> converter_;
-
scoped_ptr<media::AudioInputStream> input_stream_for_testing_;
scoped_ptr<media::AudioParameters> params_for_testing_;

Powered by Google App Engine
This is Rietveld 408576698