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