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

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

Issue 760523008: Switch from a DataPipe per DecoderBuffer to a single one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments. Created 6 years 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_MOJO_DEMUXER_STREAM_ADAPTER_H_ 5 #ifndef MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
6 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_ 6 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 // on to the caller of Read() until OnAudioDecoderConfigChanged is observed. 62 // on to the caller of Read() until OnAudioDecoderConfigChanged is observed.
63 DemuxerStream::ReadCB read_cb_; 63 DemuxerStream::ReadCB read_cb_;
64 64
65 // The front of the queue is the current config. We pop when we observe 65 // The front of the queue is the current config. We pop when we observe
66 // DemuxerStatus::CONFIG_CHANGED. 66 // DemuxerStatus::CONFIG_CHANGED.
67 std::queue<AudioDecoderConfig> audio_config_queue_; 67 std::queue<AudioDecoderConfig> audio_config_queue_;
68 std::queue<VideoDecoderConfig> video_config_queue_; 68 std::queue<VideoDecoderConfig> video_config_queue_;
69 69
70 DemuxerStream::Type type_; 70 DemuxerStream::Type type_;
71 71
72 // DataPipe for deserializing the data section of DecoderBuffers from.
73 mojo::ScopedDataPipeConsumerHandle stream_pipe_;
74
72 base::WeakPtrFactory<MojoDemuxerStreamAdapter> weak_factory_; 75 base::WeakPtrFactory<MojoDemuxerStreamAdapter> weak_factory_;
73 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamAdapter); 76 DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamAdapter);
74 }; 77 };
75 78
76 } // namespace media 79 } // namespace media
77 80
78 #endif // MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_ 81 #endif // MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
OLDNEW
« no previous file with comments | « media/mojo/services/media_type_converters.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698