diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /media/cast/audio_sender/audio_encoder.h | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'media/cast/audio_sender/audio_encoder.h')
| -rw-r--r-- | media/cast/audio_sender/audio_encoder.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media/cast/audio_sender/audio_encoder.h b/media/cast/audio_sender/audio_encoder.h index 4a22d1983b..7c2b4f3b09 100644 --- a/media/cast/audio_sender/audio_encoder.h +++ b/media/cast/audio_sender/audio_encoder.h @@ -24,13 +24,15 @@ namespace cast { class AudioEncoder : public base::RefCountedThreadSafe<AudioEncoder> { public: - typedef base::Callback<void(scoped_ptr<EncodedAudioFrame>, + typedef base::Callback<void(scoped_ptr<transport::EncodedAudioFrame>, const base::TimeTicks&)> FrameEncodedCallback; AudioEncoder(const scoped_refptr<CastEnvironment>& cast_environment, const AudioSenderConfig& audio_config, const FrameEncodedCallback& frame_encoded_callback); + CastInitializationStatus InitializationResult() const; + // The |audio_bus| must be valid until the |done_callback| is called. // The callback is called from the main cast thread as soon as the encoder is // done with |audio_bus|; it does not mean that the encoded data has been |