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

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

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo 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
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_DEMUXER_STREAM_PROVIDER_SHIM_H_ 5 #ifndef MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
6 #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ 6 #define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "media/base/demuxer_stream_provider.h" 11 #include "media/base/demuxer_stream_provider.h"
12 #include "media/mojo/services/mojo_demuxer_stream_adapter.h" 12 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 // DemuxerStreamProvider shim for mojo::DemuxerStreams. 16 // DemuxerStreamProvider shim for mojo::DemuxerStreams.
17 class DemuxerStreamProviderShim : public DemuxerStreamProvider { 17 class DemuxerStreamProviderShim : public DemuxerStreamProvider {
18 public: 18 public:
19 // Constructs the shim; at least a single audio or video stream must be 19 // Constructs the shim; at least a single audio or video stream must be
20 // provided. |demuxer_ready_cb| will be called once the streams have been 20 // provided. |demuxer_ready_cb| will be called once the streams have been
21 // initialized. Calling any method before then is an error. 21 // initialized. Calling any method before then is an error.
22 DemuxerStreamProviderShim(mojo::DemuxerStreamPtr audio, 22 DemuxerStreamProviderShim(mojo::DemuxerStreamPtr audio,
23 mojo::DemuxerStreamPtr video, 23 mojo::DemuxerStreamPtr video,
24 const base::Closure& demuxer_ready_cb); 24 const base::Closure& demuxer_ready_cb);
25 ~DemuxerStreamProviderShim() override; 25 ~DemuxerStreamProviderShim() override;
26 26
27 // DemuxerStreamProvider interface. 27 // DemuxerStreamProvider interface.
28 DemuxerStream* GetStream(DemuxerStream::Type type) override; 28 DemuxerStream* GetStream(DemuxerStream::Type type) override;
29 Liveness GetLiveness() const override;
30 29
31 private: 30 private:
32 // Called as each mojo::DemuxerStream becomes ready. Once all streams are 31 // Called as each mojo::DemuxerStream becomes ready. Once all streams are
33 // ready it will fire the |demuxer_ready_cb_| provided during construction. 32 // ready it will fire the |demuxer_ready_cb_| provided during construction.
34 void OnStreamReady(); 33 void OnStreamReady();
35 34
36 // Stored copy the ready callback provided during construction; cleared once 35 // Stored copy the ready callback provided during construction; cleared once
37 // all streams are ready. 36 // all streams are ready.
38 base::Closure demuxer_ready_cb_; 37 base::Closure demuxer_ready_cb_;
39 38
40 // Scoped container for demuxer stream adapters which interface with the 39 // Scoped container for demuxer stream adapters which interface with the
41 // mojo level demuxer streams. |streams_ready_| tracks how many streams are 40 // mojo level demuxer streams. |streams_ready_| tracks how many streams are
42 // ready and is used by OnStreamReady() to know when |demuxer_ready_cb_| 41 // ready and is used by OnStreamReady() to know when |demuxer_ready_cb_|
43 // should be fired. 42 // should be fired.
44 ScopedVector<MojoDemuxerStreamAdapter> streams_; 43 ScopedVector<MojoDemuxerStreamAdapter> streams_;
45 size_t streams_ready_; 44 size_t streams_ready_;
46 45
47 // WeakPtrFactorys must always be the last member variable. 46 // WeakPtrFactorys must always be the last member variable.
48 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_; 47 base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_;
49 48
50 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim); 49 DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim);
51 }; 50 };
52 51
53 } // namespace media 52 } // namespace media
54 53
55 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_ 54 #endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
OLDNEW
« no previous file with comments | « media/formats/webm/webm_stream_parser.cc ('k') | media/mojo/services/demuxer_stream_provider_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698