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

Side by Side Diff: media/mojo/services/mojo_demuxer_stream_impl.h

Issue 728043002: Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « device/battery/battery_monitor_impl.cc ('k') | media/mojo/services/mojo_demuxer_stream_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "media/base/demuxer_stream.h" 10 #include "media/base/demuxer_stream.h"
(...skipping 10 matching lines...) Expand all
21 // |stream| is the underlying DemuxerStream we are proxying for. 21 // |stream| is the underlying DemuxerStream we are proxying for.
22 // Note: |this| does not take ownership of |stream|. 22 // Note: |this| does not take ownership of |stream|.
23 explicit MojoDemuxerStreamImpl(media::DemuxerStream* stream); 23 explicit MojoDemuxerStreamImpl(media::DemuxerStream* stream);
24 ~MojoDemuxerStreamImpl() override; 24 ~MojoDemuxerStreamImpl() override;
25 25
26 // mojo::DemuxerStream implementation. 26 // mojo::DemuxerStream implementation.
27 void Read(const mojo::Callback<void(mojo::DemuxerStream::Status, 27 void Read(const mojo::Callback<void(mojo::DemuxerStream::Status,
28 mojo::MediaDecoderBufferPtr)>& callback) 28 mojo::MediaDecoderBufferPtr)>& callback)
29 override; 29 override;
30 30
31 void DidConnect(); 31 // mojo::InterfaceImpl overrides.
32 void OnConnectionEstablished() override;
32 33
33 private: 34 private:
34 // |callback| is the callback that was passed to the initiating Read() 35 // |callback| is the callback that was passed to the initiating Read()
35 // call by our client. 36 // call by our client.
36 // |status| and |buffer| are the standard media::ReadCB parameters. 37 // |status| and |buffer| are the standard media::ReadCB parameters.
37 typedef mojo::Callback<void(mojo::DemuxerStream::Status, 38 typedef mojo::Callback<void(mojo::DemuxerStream::Status,
38 mojo::MediaDecoderBufferPtr)> BufferReadyCB; 39 mojo::MediaDecoderBufferPtr)> BufferReadyCB;
39 void OnBufferReady(const BufferReadyCB& callback, 40 void OnBufferReady(const BufferReadyCB& callback,
40 media::DemuxerStream::Status status, 41 media::DemuxerStream::Status status,
41 const scoped_refptr<media::DecoderBuffer>& buffer); 42 const scoped_refptr<media::DecoderBuffer>& buffer);
42 43
43 // See constructor. We do not own |stream_|. 44 // See constructor. We do not own |stream_|.
44 media::DemuxerStream* stream_; 45 media::DemuxerStream* stream_;
45 46
46 base::WeakPtrFactory<MojoDemuxerStreamImpl> weak_factory_; 47 base::WeakPtrFactory<MojoDemuxerStreamImpl> weak_factory_;
47 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamImpl); 48 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamImpl);
48 }; 49 };
49 50
50 } // namespace media 51 } // namespace media
51 52
52 #endif // MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_ 53 #endif // MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « device/battery/battery_monitor_impl.cc ('k') | media/mojo/services/mojo_demuxer_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698