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

Side by Side Diff: media/base/fake_demuxer_stream.cc

Issue 1965273003: Fix include path for moved thread_task_runner_handle.h header in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 years, 7 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/base/bind_to_current_loop.h ('k') | media/base/fake_text_track_stream.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/base/fake_demuxer_stream.h" 5 #include "media/base/fake_demuxer_stream.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
18 #include "base/thread_task_runner_handle.h" 18 #include "base/threading/thread_task_runner_handle.h"
19 #include "media/base/bind_to_current_loop.h" 19 #include "media/base/bind_to_current_loop.h"
20 #include "media/base/decoder_buffer.h" 20 #include "media/base/decoder_buffer.h"
21 #include "media/base/media_util.h" 21 #include "media/base/media_util.h"
22 #include "media/base/test_helpers.h" 22 #include "media/base/test_helpers.h"
23 #include "media/base/timestamp_constants.h" 23 #include "media/base/timestamp_constants.h"
24 #include "media/base/video_frame.h" 24 #include "media/base/video_frame.h"
25 #include "ui/gfx/geometry/rect.h" 25 #include "ui/gfx/geometry/rect.h"
26 #include "ui/gfx/geometry/size.h" 26 #include "ui/gfx/geometry/size.h"
27 27
28 namespace media { 28 namespace media {
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() { 217 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() {
218 } 218 }
219 219
220 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) { 220 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) {
221 if (type == DemuxerStream::Type::AUDIO) 221 if (type == DemuxerStream::Type::AUDIO)
222 return nullptr; 222 return nullptr;
223 return &fake_video_stream_; 223 return &fake_video_stream_;
224 }; 224 };
225 225
226 } // namespace media 226 } // namespace media
OLDNEW
« no previous file with comments | « media/base/bind_to_current_loop.h ('k') | media/base/fake_text_track_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698