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

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

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 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 (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 <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 11 matching lines...) Expand all
22 #include "ui/gfx/geometry/size.h" 22 #include "ui/gfx/geometry/size.h"
23 23
24 namespace media { 24 namespace media {
25 25
26 const int kStartTimestampMs = 0; 26 const int kStartTimestampMs = 0;
27 const int kDurationMs = 30; 27 const int kDurationMs = 30;
28 const int kStartWidth = 320; 28 const int kStartWidth = 320;
29 const int kStartHeight = 240; 29 const int kStartHeight = 240;
30 const int kWidthDelta = 4; 30 const int kWidthDelta = 4;
31 const int kHeightDelta = 3; 31 const int kHeightDelta = 3;
32 const uint8 kKeyId[] = { 0x00, 0x01, 0x02, 0x03 }; 32 const uint8_t kKeyId[] = {0x00, 0x01, 0x02, 0x03};
33 const uint8 kIv[] = { 33 const uint8_t kIv[] = {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
34 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 34 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
35 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
36 };
37 35
38 FakeDemuxerStream::FakeDemuxerStream(int num_configs, 36 FakeDemuxerStream::FakeDemuxerStream(int num_configs,
39 int num_buffers_in_one_config, 37 int num_buffers_in_one_config,
40 bool is_encrypted) 38 bool is_encrypted)
41 : task_runner_(base::ThreadTaskRunnerHandle::Get()), 39 : task_runner_(base::ThreadTaskRunnerHandle::Get()),
42 num_configs_(num_configs), 40 num_configs_(num_configs),
43 num_buffers_in_one_config_(num_buffers_in_one_config), 41 num_buffers_in_one_config_(num_buffers_in_one_config),
44 config_changes_(num_configs > 1), 42 config_changes_(num_configs > 1),
45 is_encrypted_(is_encrypted), 43 is_encrypted_(is_encrypted),
46 read_to_hold_(-1) { 44 read_to_hold_(-1) {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() { 208 FakeDemuxerStreamProvider::~FakeDemuxerStreamProvider() {
211 } 209 }
212 210
213 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) { 211 DemuxerStream* FakeDemuxerStreamProvider::GetStream(DemuxerStream::Type type) {
214 if (type == DemuxerStream::Type::AUDIO) 212 if (type == DemuxerStream::Type::AUDIO)
215 return nullptr; 213 return nullptr;
216 return &fake_video_stream_; 214 return &fake_video_stream_;
217 }; 215 };
218 216
219 } // namespace media 217 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698