| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include <memory> |
| 12 |
| 11 #include "webrtc/base/logging.h" | 13 #include "webrtc/base/logging.h" |
| 12 #include "webrtc/media/engine/webrtcvideoframe.h" | 14 #include "webrtc/media/engine/webrtcvideoframe.h" |
| 13 #include "webrtc/media/engine/webrtcvideoframefactory.h" | 15 #include "webrtc/media/engine/webrtcvideoframefactory.h" |
| 14 | 16 |
| 15 namespace cricket { | 17 namespace cricket { |
| 16 | 18 |
| 17 VideoFrame* WebRtcVideoFrameFactory::CreateAliasedFrame( | 19 VideoFrame* WebRtcVideoFrameFactory::CreateAliasedFrame( |
| 18 const CapturedFrame* aliased_frame, int width, int height) const { | 20 const CapturedFrame* aliased_frame, int width, int height) const { |
| 19 rtc::scoped_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame()); | 21 std::unique_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame()); |
| 20 if (!frame->Init(aliased_frame, width, height, apply_rotation_)) { | 22 if (!frame->Init(aliased_frame, width, height, apply_rotation_)) { |
| 21 LOG(LS_ERROR) << | 23 LOG(LS_ERROR) << |
| 22 "Failed to create WebRtcVideoFrame in CreateAliasedFrame."; | 24 "Failed to create WebRtcVideoFrame in CreateAliasedFrame."; |
| 23 return NULL; | 25 return NULL; |
| 24 } | 26 } |
| 25 return frame.release(); | 27 return frame.release(); |
| 26 } | 28 } |
| 27 | 29 |
| 28 } // namespace cricket | 30 } // namespace cricket |
| OLD | NEW |