| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "media/base/test_helpers.h" | 5 #include "media/base/test_helpers.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/pickle.h" | 10 #include "base/pickle.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 run_loop_->Quit(); | 119 run_loop_->Quit(); |
| 120 } | 120 } |
| 121 | 121 |
| 122 static VideoDecoderConfig GetTestConfig(VideoCodec codec, | 122 static VideoDecoderConfig GetTestConfig(VideoCodec codec, |
| 123 gfx::Size coded_size, | 123 gfx::Size coded_size, |
| 124 bool is_encrypted) { | 124 bool is_encrypted) { |
| 125 gfx::Rect visible_rect(coded_size.width(), coded_size.height()); | 125 gfx::Rect visible_rect(coded_size.width(), coded_size.height()); |
| 126 gfx::Size natural_size = coded_size; | 126 gfx::Size natural_size = coded_size; |
| 127 | 127 |
| 128 return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, | 128 return VideoDecoderConfig(codec, VIDEO_CODEC_PROFILE_UNKNOWN, |
| 129 VideoFrame::YV12, | 129 VideoFrame::YV12, coded_size, visible_rect, natural_size, |
| 130 VideoFrame::COLOR_SPACE_UNSPECIFIED, coded_size, | 130 NULL, 0, is_encrypted); |
| 131 visible_rect, natural_size, NULL, 0, is_encrypted); | |
| 132 } | 131 } |
| 133 | 132 |
| 134 static const gfx::Size kNormalSize(320, 240); | 133 static const gfx::Size kNormalSize(320, 240); |
| 135 static const gfx::Size kLargeSize(640, 480); | 134 static const gfx::Size kLargeSize(640, 480); |
| 136 | 135 |
| 137 VideoDecoderConfig TestVideoConfig::Invalid() { | 136 VideoDecoderConfig TestVideoConfig::Invalid() { |
| 138 return GetTestConfig(kUnknownVideoCodec, kNormalSize, false); | 137 return GetTestConfig(kUnknownVideoCodec, kNormalSize, false); |
| 139 } | 138 } |
| 140 | 139 |
| 141 VideoDecoderConfig TestVideoConfig::Normal() { | 140 VideoDecoderConfig TestVideoConfig::Normal() { |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 expecting_b_ = false; | 273 expecting_b_ = false; |
| 275 } | 274 } |
| 276 | 275 |
| 277 void AddLogEntryForTest(MediaLog::MediaLogLevel level, | 276 void AddLogEntryForTest(MediaLog::MediaLogLevel level, |
| 278 const std::string& message) { | 277 const std::string& message) { |
| 279 DVLOG(1) << "Media log (" << MediaLog::MediaLogLevelToString(level) | 278 DVLOG(1) << "Media log (" << MediaLog::MediaLogLevelToString(level) |
| 280 << "): " << message; | 279 << "): " << message; |
| 281 } | 280 } |
| 282 | 281 |
| 283 } // namespace media | 282 } // namespace media |
| OLD | NEW |