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

Side by Side Diff: media/formats/mp2t/es_adapter_video_unittest.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/formats/mp2t/es_adapter_video.cc ('k') | media/formats/mp2t/es_parser.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 <stddef.h>
6 #include <stdint.h>
7
5 #include <sstream> 8 #include <sstream>
6 #include <string> 9 #include <string>
7 #include <vector> 10 #include <vector>
8 11
9 #include "base/bind.h" 12 #include "base/bind.h"
10 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h"
11 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
12 #include "base/time/time.h" 16 #include "base/time/time.h"
13 #include "media/base/media_util.h" 17 #include "media/base/media_util.h"
14 #include "media/base/stream_parser_buffer.h" 18 #include "media/base/stream_parser_buffer.h"
15 #include "media/base/timestamp_constants.h" 19 #include "media/base/timestamp_constants.h"
16 #include "media/base/video_decoder_config.h" 20 #include "media/base/video_decoder_config.h"
17 #include "media/formats/mp2t/es_adapter_video.h" 21 #include "media/formats/mp2t/es_adapter_video.h"
18 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
19 23
20 namespace media { 24 namespace media {
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 bool is_key_frame[] = {false, false, false, true, false, false}; 163 bool is_key_frame[] = {false, false, false, true, false, false};
160 StreamParserBuffer::BufferQueue buffer_queue = 164 StreamParserBuffer::BufferQueue buffer_queue =
161 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms)); 165 GenerateFakeBuffers(pts_ms, is_key_frame, arraysize(pts_ms));
162 166
163 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)", 167 EXPECT_EQ("(70,Y) (30,Y) (30,N) (30,N)",
164 RunAdapterTest(buffer_queue)); 168 RunAdapterTest(buffer_queue));
165 } 169 }
166 170
167 } // namespace mp2t 171 } // namespace mp2t
168 } // namespace media 172 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp2t/es_adapter_video.cc ('k') | media/formats/mp2t/es_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698