| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "ppapi/cpp/video_frame.h" | 5 #include "ppapi/cpp/private/video_frame_private.h" |
| 6 | 6 |
| 7 namespace pp { | 7 namespace pp { |
| 8 | 8 |
| 9 // VideoFrame ------------------------------------------------------------------ | 9 VideoFrame_Private::VideoFrame_Private() |
| 10 | |
| 11 VideoFrame::VideoFrame() | |
| 12 : video_frame_() { | 10 : video_frame_() { |
| 13 video_frame_.image_data = image_data_.pp_resource(); | 11 video_frame_.image_data = image_data_.pp_resource(); |
| 14 } | 12 } |
| 15 | 13 |
| 16 VideoFrame::VideoFrame(const ImageData& image_data, PP_TimeTicks timestamp) | 14 VideoFrame_Private::VideoFrame_Private(const ImageData& image_data, |
| 15 PP_TimeTicks timestamp) |
| 17 : image_data_(image_data), video_frame_() { | 16 : image_data_(image_data), video_frame_() { |
| 18 video_frame_.timestamp = timestamp; | 17 video_frame_.timestamp = timestamp; |
| 19 video_frame_.image_data = image_data_.pp_resource(); | 18 video_frame_.image_data = image_data_.pp_resource(); |
| 20 } | 19 } |
| 21 | 20 |
| 22 VideoFrame::VideoFrame(PassRef, const PP_VideoFrame& pp_video_frame) | 21 VideoFrame_Private::VideoFrame_Private( |
| 22 PassRef, |
| 23 const PP_VideoFrame_Private& pp_video_frame) |
| 23 : video_frame_(pp_video_frame) { | 24 : video_frame_(pp_video_frame) { |
| 24 // Take over the image_data resource in the frame. | 25 // Take over the image_data resource in the frame. |
| 25 image_data_ = ImageData(PASS_REF, video_frame_.image_data); | 26 image_data_ = ImageData(PASS_REF, video_frame_.image_data); |
| 26 } | 27 } |
| 27 | 28 |
| 28 VideoFrame::VideoFrame(const VideoFrame& other) | 29 VideoFrame_Private::VideoFrame_Private(const VideoFrame_Private& other) |
| 29 : video_frame_() { | 30 : video_frame_() { |
| 30 set_image_data(other.image_data()); | 31 set_image_data(other.image_data()); |
| 31 set_timestamp(other.timestamp()); | 32 set_timestamp(other.timestamp()); |
| 32 } | 33 } |
| 33 | 34 |
| 34 VideoFrame::~VideoFrame() { | 35 VideoFrame_Private::~VideoFrame_Private() { |
| 35 } | 36 } |
| 36 | 37 |
| 37 VideoFrame& VideoFrame::operator=(const VideoFrame& other) { | 38 VideoFrame_Private& VideoFrame_Private::operator=( |
| 39 const VideoFrame_Private& other) { |
| 38 if (this == &other) | 40 if (this == &other) |
| 39 return *this; | 41 return *this; |
| 40 | 42 |
| 41 set_image_data(other.image_data()); | 43 set_image_data(other.image_data()); |
| 42 set_timestamp(other.timestamp()); | 44 set_timestamp(other.timestamp()); |
| 43 | 45 |
| 44 return *this; | 46 return *this; |
| 45 } | 47 } |
| 46 | 48 |
| 47 } // namespace pp | 49 } // namespace pp |
| OLD | NEW |