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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 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 | « media/mojo/services/mojo_cdm_service.h ('k') | media/mojo/services/mojo_demuxer_stream_impl.h » ('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 #include "media/mojo/services/mojo_demuxer_stream_adapter.h" 5 #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "media/base/decoder_buffer.h" 9 #include "media/base/decoder_buffer.h"
10 #include "media/mojo/services/media_type_converters.h" 10 #include "media/mojo/services/media_type_converters.h"
11 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h" 11 #include "mojo/public/cpp/system/data_pipe.h"
12 12
13 namespace media { 13 namespace media {
14 14
15 MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter( 15 MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(
16 interfaces::DemuxerStreamPtr demuxer_stream, 16 interfaces::DemuxerStreamPtr demuxer_stream,
17 const base::Closure& stream_ready_cb) 17 const base::Closure& stream_ready_cb)
18 : demuxer_stream_(demuxer_stream.Pass()), 18 : demuxer_stream_(demuxer_stream.Pass()),
19 stream_ready_cb_(stream_ready_cb), 19 stream_ready_cb_(stream_ready_cb),
20 type_(DemuxerStream::UNKNOWN), 20 type_(DemuxerStream::UNKNOWN),
21 weak_factory_(this) { 21 weak_factory_(this) {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 case DemuxerStream::VIDEO: 135 case DemuxerStream::VIDEO:
136 DCHECK(video_config && !audio_config); 136 DCHECK(video_config && !audio_config);
137 video_config_ = video_config.To<VideoDecoderConfig>(); 137 video_config_ = video_config.To<VideoDecoderConfig>();
138 break; 138 break;
139 default: 139 default:
140 NOTREACHED(); 140 NOTREACHED();
141 } 141 }
142 } 142 }
143 143
144 } // namespace media 144 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm_service.h ('k') | media/mojo/services/mojo_demuxer_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698