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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 4 years, 12 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/fake_audio_renderer_sink.h ('k') | media/base/fake_demuxer_stream_unittest.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>
8
7 #include <vector> 9 #include <vector>
8 10
9 #include "base/bind.h" 11 #include "base/bind.h"
10 #include "base/callback_helpers.h" 12 #include "base/callback_helpers.h"
11 #include "base/location.h" 13 #include "base/location.h"
12 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h"
13 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
14 #include "base/thread_task_runner_handle.h" 17 #include "base/thread_task_runner_handle.h"
15 #include "media/base/bind_to_current_loop.h" 18 #include "media/base/bind_to_current_loop.h"
16 #include "media/base/decoder_buffer.h" 19 #include "media/base/decoder_buffer.h"
17 #include "media/base/media_util.h" 20 #include "media/base/media_util.h"
18 #include "media/base/test_helpers.h" 21 #include "media/base/test_helpers.h"
19 #include "media/base/timestamp_constants.h" 22 #include "media/base/timestamp_constants.h"
20 #include "media/base/video_frame.h" 23 #include "media/base/video_frame.h"
21 #include "ui/gfx/geometry/rect.h" 24 #include "ui/gfx/geometry/rect.h"
22 #include "ui/gfx/geometry/size.h" 25 #include "ui/gfx/geometry/size.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() { 211 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() {
209 } 212 }
210 213
211 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) { 214 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) {
212 if (type == DemuxerStream::Type::AUDIO) 215 if (type == DemuxerStream::Type::AUDIO)
213 return nullptr; 216 return nullptr;
214 return &fake_video_stream_; 217 return &fake_video_stream_;
215 }; 218 };
216 219
217 } // namespace media 220 } // namespace media
OLDNEW
« no previous file with comments | « media/base/fake_audio_renderer_sink.h ('k') | media/base/fake_demuxer_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698