| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * Copyright 2014 The WebRTC Project Authors. All rights reserved. |
| 3 * Copyright 2014 Google Inc. | |
| 4 * | 3 * |
| 5 * Redistribution and use in source and binary forms, with or without | 4 * Use of this source code is governed by a BSD-style license |
| 6 * modification, are permitted provided that the following conditions are met: | 5 * that can be found in the LICENSE file in the root of the source |
| 7 * | 6 * tree. An additional intellectual property rights grant can be found |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 7 * in the file PATENTS. All contributing project authors may |
| 9 * this list of conditions and the following disclaimer. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | |
| 11 * this list of conditions and the following disclaimer in the documentation | |
| 12 * and/or other materials provided with the distribution. | |
| 13 * 3. The name of the author may not be used to endorse or promote products | |
| 14 * derived from this software without specific prior written permission. | |
| 15 * | |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 26 */ | 9 */ |
| 27 | 10 |
| 28 #include "talk/media/base/videoframefactory.h" | 11 #include "webrtc/media/base/videoframefactory.h" |
| 29 | 12 |
| 30 #include <algorithm> | 13 #include <algorithm> |
| 31 #include "talk/media/base/videocapturer.h" | 14 #include "webrtc/media/base/videocapturer.h" |
| 32 | 15 |
| 33 namespace cricket { | 16 namespace cricket { |
| 34 | 17 |
| 35 VideoFrame* VideoFrameFactory::CreateAliasedFrame( | 18 VideoFrame* VideoFrameFactory::CreateAliasedFrame( |
| 36 const CapturedFrame* input_frame, | 19 const CapturedFrame* input_frame, |
| 37 int cropped_input_width, | 20 int cropped_input_width, |
| 38 int cropped_input_height, | 21 int cropped_input_height, |
| 39 int output_width, | 22 int output_width, |
| 40 int output_height) const { | 23 int output_height) const { |
| 41 rtc::scoped_ptr<VideoFrame> cropped_input_frame(CreateAliasedFrame( | 24 rtc::scoped_ptr<VideoFrame> cropped_input_frame(CreateAliasedFrame( |
| (...skipping 27 matching lines...) Expand all Loading... |
| 69 return NULL; | 52 return NULL; |
| 70 } | 53 } |
| 71 } else { | 54 } else { |
| 72 cropped_input_frame->StretchToFrame(output_frame_.get(), true, true); | 55 cropped_input_frame->StretchToFrame(output_frame_.get(), true, true); |
| 73 output_frame_->SetTimeStamp(cropped_input_frame->GetTimeStamp()); | 56 output_frame_->SetTimeStamp(cropped_input_frame->GetTimeStamp()); |
| 74 } | 57 } |
| 75 return output_frame_->Copy(); | 58 return output_frame_->Copy(); |
| 76 } | 59 } |
| 77 | 60 |
| 78 } // namespace cricket | 61 } // namespace cricket |
| OLD | NEW |