media/mojo/services/mojo_demuxer_stream_adapter.cc - Issue 846443006: Include Mojo SDK/EDK via fully-qualified paths in Chromium code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 846443006: Include Mojo SDK/EDK via fully-qualified paths in Chromium code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix include to satisfy checkdeps Created 5 years, 11 months 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 »

OLD	NEW
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 "mojo/public/cpp/system/data_pipe.h"	11 #include "third_party/mojo/src/mojo/public/cpp/system/data_pipe.h"

12	12

13 namespace media {	13 namespace media {

14	14

15 MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(	15 MojoDemuxerStreamAdapter::MojoDemuxerStreamAdapter(

16 mojo::DemuxerStreamPtr demuxer_stream,	16 mojo::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 114 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
136 CHECK_EQ(ReadDataRaw(stream_pipe_.get(), media_buffer->writable_data(),	136 CHECK_EQ(ReadDataRaw(stream_pipe_.get(), media_buffer->writable_data(),

137 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE),	137 &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE),

138 MOJO_RESULT_OK);	138 MOJO_RESULT_OK);

139 CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size()));	139 CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size()));

140 }	140 }

141	141

142 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kOk, media_buffer);	142 base::ResetAndReturn(&read_cb_).Run(DemuxerStream::kOk, media_buffer);

143 }	143 }

144	144

145 } // namespace media	145 } // namespace media

OLD	NEW