| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <string> | 8 #include <string> |
| 6 | 9 |
| 7 #include "base/logging.h" | 10 #include "base/logging.h" |
| 8 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 9 #include "media/base/android/media_codec_util.h" | 12 #include "media/base/android/media_codec_util.h" |
| 10 #include "media/base/android/sdk_media_codec_bridge.h" | 13 #include "media/base/android/sdk_media_codec_bridge.h" |
| 11 #include "media/base/decoder_buffer.h" | 14 #include "media/base/decoder_buffer.h" |
| 12 #include "media/base/test_data_util.h" | 15 #include "media/base/test_data_util.h" |
| 13 #include "testing/gmock/include/gmock/gmock.h" | 16 #include "testing/gmock/include/gmock/gmock.h" |
| 14 | 17 |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 290 } | 293 } |
| 291 | 294 |
| 292 TEST(SdkMediaCodecBridgeTest, CreateUnsupportedCodec) { | 295 TEST(SdkMediaCodecBridgeTest, CreateUnsupportedCodec) { |
| 293 EXPECT_EQ(nullptr, AudioCodecBridge::Create(kUnknownAudioCodec)); | 296 EXPECT_EQ(nullptr, AudioCodecBridge::Create(kUnknownAudioCodec)); |
| 294 EXPECT_EQ(nullptr, VideoCodecBridge::CreateDecoder(kUnknownVideoCodec, false, | 297 EXPECT_EQ(nullptr, VideoCodecBridge::CreateDecoder(kUnknownVideoCodec, false, |
| 295 gfx::Size(320, 240), | 298 gfx::Size(320, 240), |
| 296 nullptr, nullptr)); | 299 nullptr, nullptr)); |
| 297 } | 300 } |
| 298 | 301 |
| 299 } // namespace media | 302 } // namespace media |
| OLD | NEW |