| 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/video_frame.h" | 5 #include "media/base/video_frame.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 scoped_refptr<media::VideoFrame> frame; | 232 scoped_refptr<media::VideoFrame> frame; |
| 233 bool done_callback_was_run = false; | 233 bool done_callback_was_run = false; |
| 234 { | 234 { |
| 235 scoped_refptr<media::VideoFrame> wrapped_frame = | 235 scoped_refptr<media::VideoFrame> wrapped_frame = |
| 236 VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight)); | 236 VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight)); |
| 237 ASSERT_TRUE(wrapped_frame.get()); | 237 ASSERT_TRUE(wrapped_frame.get()); |
| 238 | 238 |
| 239 gfx::Rect visible_rect(1, 1, 1, 1); | 239 gfx::Rect visible_rect(1, 1, 1, 1); |
| 240 gfx::Size natural_size = visible_rect.size(); | 240 gfx::Size natural_size = visible_rect.size(); |
| 241 frame = media::VideoFrame::WrapVideoFrame( | 241 frame = media::VideoFrame::WrapVideoFrame( |
| 242 wrapped_frame, visible_rect, natural_size); | 242 wrapped_frame, wrapped_frame->format(), visible_rect, natural_size); |
| 243 frame->AddDestructionObserver( | 243 frame->AddDestructionObserver(base::Bind( |
| 244 base::Bind(&FrameNoLongerNeededCallback, wrapped_frame, | 244 &FrameNoLongerNeededCallback, wrapped_frame, &done_callback_was_run)); |
| 245 &done_callback_was_run)); | |
| 246 EXPECT_EQ(wrapped_frame->coded_size(), frame->coded_size()); | 245 EXPECT_EQ(wrapped_frame->coded_size(), frame->coded_size()); |
| 247 EXPECT_EQ(wrapped_frame->data(media::VideoFrame::kYPlane), | 246 EXPECT_EQ(wrapped_frame->data(media::VideoFrame::kYPlane), |
| 248 frame->data(media::VideoFrame::kYPlane)); | 247 frame->data(media::VideoFrame::kYPlane)); |
| 249 EXPECT_NE(wrapped_frame->visible_rect(), frame->visible_rect()); | 248 EXPECT_NE(wrapped_frame->visible_rect(), frame->visible_rect()); |
| 250 EXPECT_EQ(visible_rect, frame->visible_rect()); | 249 EXPECT_EQ(visible_rect, frame->visible_rect()); |
| 251 EXPECT_NE(wrapped_frame->natural_size(), frame->natural_size()); | 250 EXPECT_NE(wrapped_frame->natural_size(), frame->natural_size()); |
| 252 EXPECT_EQ(natural_size, frame->natural_size()); | 251 EXPECT_EQ(natural_size, frame->natural_size()); |
| 253 } | 252 } |
| 254 | 253 |
| 255 EXPECT_FALSE(done_callback_was_run); | 254 EXPECT_FALSE(done_callback_was_run); |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 489 | 488 |
| 490 for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) { | 489 for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) { |
| 491 const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i); | 490 const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i); |
| 492 int value = -1; | 491 int value = -1; |
| 493 EXPECT_TRUE(result.GetInteger(key, &value)); | 492 EXPECT_TRUE(result.GetInteger(key, &value)); |
| 494 EXPECT_EQ(i, value); | 493 EXPECT_EQ(i, value); |
| 495 } | 494 } |
| 496 } | 495 } |
| 497 | 496 |
| 498 } // namespace media | 497 } // namespace media |
| OLD | NEW |