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

Side by Side Diff: media/formats/mp4/box_reader_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/mp4/box_reader.cc ('k') | media/formats/mp4/cenc.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 <stdint.h>
5 #include <string.h> 6 #include <string.h>
6 7
7 #include "base/logging.h" 8 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
9 #include "media/base/mock_media_log.h" 10 #include "media/base/mock_media_log.h"
10 #include "media/formats/mp4/box_definitions.h" 11 #include "media/formats/mp4/box_definitions.h"
11 #include "media/formats/mp4/box_reader.h" 12 #include "media/formats/mp4/box_reader.h"
12 #include "media/formats/mp4/rcheck.h" 13 #include "media/formats/mp4/rcheck.h"
13 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
14 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 EXPECT_EQ(FOURCC_EMSG, reader->type()); 321 EXPECT_EQ(FOURCC_EMSG, reader->type());
321 322
322 // Reading the child should fail since the number of samples specified 323 // Reading the child should fail since the number of samples specified
323 // doesn't match what is in the box. 324 // doesn't match what is in the box.
324 std::vector<TrackFragmentRun> children; 325 std::vector<TrackFragmentRun> children;
325 EXPECT_FALSE(reader->ReadAllChildrenAndCheckFourCC(&children)); 326 EXPECT_FALSE(reader->ReadAllChildrenAndCheckFourCC(&children));
326 } 327 }
327 328
328 } // namespace mp4 329 } // namespace mp4
329 } // namespace media 330 } // namespace media
OLDNEW
« no previous file with comments | « media/formats/mp4/box_reader.cc ('k') | media/formats/mp4/cenc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698