OLD | NEW |
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 <string> | 9 #include <string> |
7 | 10 |
8 #include "base/bind.h" | 11 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
10 #include "base/logging.h" | 13 #include "base/logging.h" |
11 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
12 #include "base/time/time.h" | 15 #include "base/time/time.h" |
13 #include "media/base/audio_decoder_config.h" | 16 #include "media/base/audio_decoder_config.h" |
14 #include "media/base/decoder_buffer.h" | 17 #include "media/base/decoder_buffer.h" |
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 scoped_refptr<DecoderBuffer> buffer = | 336 scoped_refptr<DecoderBuffer> buffer = |
334 ReadTestDataFile("bear-640x360-non_square_pixel-with_pasp.mp4"); | 337 ReadTestDataFile("bear-640x360-non_square_pixel-with_pasp.mp4"); |
335 | 338 |
336 EXPECT_MEDIA_LOG(VideoCodecLog("avc1.6401e")); | 339 EXPECT_MEDIA_LOG(VideoCodecLog("avc1.6401e")); |
337 EXPECT_TRUE(AppendDataInPieces(buffer->data(), buffer->data_size(), 512)); | 340 EXPECT_TRUE(AppendDataInPieces(buffer->data(), buffer->data_size(), 512)); |
338 EXPECT_EQ(gfx::Size(639, 360), video_decoder_config_.natural_size()); | 341 EXPECT_EQ(gfx::Size(639, 360), video_decoder_config_.natural_size()); |
339 } | 342 } |
340 | 343 |
341 } // namespace mp4 | 344 } // namespace mp4 |
342 } // namespace media | 345 } // namespace media |
OLD | NEW |