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

Side by Side Diff: media/formats/webm/webm_cluster_parser_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 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
« no previous file with comments | « media/formats/webm/webm_cluster_parser.cc ('k') | media/formats/webm/webm_content_encodings.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 <algorithm> 8 #include <algorithm>
6 #include <cstdlib> 9 #include <cstdlib>
7 #include <string> 10 #include <string>
8 #include <vector> 11 #include <vector>
9 12
10 #include "base/bind.h" 13 #include "base/bind.h"
11 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/macros.h"
12 #include "base/strings/string_number_conversions.h" 16 #include "base/strings/string_number_conversions.h"
13 #include "media/base/audio_decoder_config.h" 17 #include "media/base/audio_decoder_config.h"
14 #include "media/base/decrypt_config.h" 18 #include "media/base/decrypt_config.h"
15 #include "media/base/mock_media_log.h" 19 #include "media/base/mock_media_log.h"
16 #include "media/base/timestamp_constants.h" 20 #include "media/base/timestamp_constants.h"
17 #include "media/formats/webm/cluster_builder.h" 21 #include "media/formats/webm/cluster_builder.h"
18 #include "media/formats/webm/opus_packet_builder.h" 22 #include "media/formats/webm/opus_packet_builder.h"
19 #include "media/formats/webm/webm_cluster_parser.h" 23 #include "media/formats/webm/webm_cluster_parser.h"
20 #include "media/formats/webm/webm_constants.h" 24 #include "media/formats/webm/webm_constants.h"
21 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1143 int block_count = arraysize(kBlockInfo); 1147 int block_count = arraysize(kBlockInfo);
1144 scoped_ptr<Cluster> cluster(CreateCluster(0, kBlockInfo, block_count)); 1148 scoped_ptr<Cluster> cluster(CreateCluster(0, kBlockInfo, block_count));
1145 int result = parser_->Parse(cluster->data(), cluster->size()); 1149 int result = parser_->Parse(cluster->data(), cluster->size());
1146 EXPECT_EQ(cluster->size(), result); 1150 EXPECT_EQ(cluster->size(), result);
1147 1151
1148 // Will verify that duration of buffer matches that of BlockDuration. 1152 // Will verify that duration of buffer matches that of BlockDuration.
1149 ASSERT_TRUE(VerifyBuffers(parser_, kBlockInfo, block_count)); 1153 ASSERT_TRUE(VerifyBuffers(parser_, kBlockInfo, block_count));
1150 } 1154 }
1151 1155
1152 } // namespace media 1156 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/webm/webm_cluster_parser.cc ('k') | media/formats/webm/webm_content_encodings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698