Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: webrtc/media/webrtc/webrtcvideoframefactory.cc

Issue 1676923002: Change to WebRTC license in webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright (c) 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 "webrtc/base/logging.h" 11 #include "webrtc/base/logging.h"
29 #include "webrtc/media/webrtc/webrtcvideoframe.h" 12 #include "webrtc/media/webrtc/webrtcvideoframe.h"
30 #include "webrtc/media/webrtc/webrtcvideoframefactory.h" 13 #include "webrtc/media/webrtc/webrtcvideoframefactory.h"
31 14
32 namespace cricket { 15 namespace cricket {
33 16
34 VideoFrame* WebRtcVideoFrameFactory::CreateAliasedFrame( 17 VideoFrame* WebRtcVideoFrameFactory::CreateAliasedFrame(
35 const CapturedFrame* aliased_frame, int width, int height) const { 18 const CapturedFrame* aliased_frame, int width, int height) const {
36 rtc::scoped_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame()); 19 rtc::scoped_ptr<WebRtcVideoFrame> frame(new WebRtcVideoFrame());
37 if (!frame->Init(aliased_frame, width, height, apply_rotation_)) { 20 if (!frame->Init(aliased_frame, width, height, apply_rotation_)) {
38 LOG(LS_ERROR) << 21 LOG(LS_ERROR) <<
39 "Failed to create WebRtcVideoFrame in CreateAliasedFrame."; 22 "Failed to create WebRtcVideoFrame in CreateAliasedFrame.";
40 return NULL; 23 return NULL;
41 } 24 }
42 return frame.release(); 25 return frame.release();
43 } 26 }
44 27
45 } // namespace cricket 28 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/webrtc/webrtcvideoframefactory.h ('k') | webrtc/media/webrtc/webrtcvideoframefactory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698