| 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, |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 output_frame_->GetHeight() != static_cast<size_t>(output_height)) { | 63 output_frame_->GetHeight() != static_cast<size_t>(output_height)) { |
| 64 output_frame_.reset( | 64 output_frame_.reset( |
| 65 cropped_input_frame->Stretch(output_width, output_height, true, true)); | 65 cropped_input_frame->Stretch(output_width, output_height, true, true)); |
| 66 if (!output_frame_) { | 66 if (!output_frame_) { |
| 67 LOG(LS_WARNING) << "Failed to stretch frame to " << output_width << "x" | 67 LOG(LS_WARNING) << "Failed to stretch frame to " << output_width << "x" |
| 68 << output_height; | 68 << output_height; |
| 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_->SetElapsedTime(cropped_input_frame->GetElapsedTime()); | |
| 74 output_frame_->SetTimeStamp(cropped_input_frame->GetTimeStamp()); | 73 output_frame_->SetTimeStamp(cropped_input_frame->GetTimeStamp()); |
| 75 } | 74 } |
| 76 return output_frame_->Copy(); | 75 return output_frame_->Copy(); |
| 77 } | 76 } |
| 78 | 77 |
| 79 } // namespace cricket | 78 } // namespace cricket |
| OLD | NEW |