| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * libjingle | 2  * libjingle | 
| 3  * Copyright 2011 Google Inc. | 3  * Copyright 2011 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 // Implementation of CarbonVideoRenderer | 28 // Implementation of CarbonVideoRenderer | 
| 29 | 29 | 
| 30 #include "talk/media/devices/carbonvideorenderer.h" | 30 #include "webrtc/media/devices/carbonvideorenderer.h" | 
| 31 | 31 | 
| 32 #include "talk/media/base/videocommon.h" |  | 
| 33 #include "talk/media/base/videoframe.h" |  | 
| 34 #include "webrtc/base/logging.h" | 32 #include "webrtc/base/logging.h" | 
|  | 33 #include "webrtc/media/base/videocommon.h" | 
|  | 34 #include "webrtc/media/base/videoframe.h" | 
| 35 | 35 | 
| 36 namespace cricket { | 36 namespace cricket { | 
| 37 | 37 | 
| 38 CarbonVideoRenderer::CarbonVideoRenderer(int x, int y) | 38 CarbonVideoRenderer::CarbonVideoRenderer(int x, int y) | 
| 39     : image_width_(0), | 39     : image_width_(0), | 
| 40       image_height_(0), | 40       image_height_(0), | 
| 41       x_(x), | 41       x_(x), | 
| 42       y_(y), | 42       y_(y), | 
| 43       window_ref_(NULL) { | 43       window_ref_(NULL) { | 
| 44 } | 44 } | 
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 180   if (err != noErr) { | 180   if (err != noErr) { | 
| 181     LOG(LS_ERROR) << "Failed to install event handler, error code: " << err; | 181     LOG(LS_ERROR) << "Failed to install event handler, error code: " << err; | 
| 182     return false; | 182     return false; | 
| 183   } | 183   } | 
| 184   SelectWindow(window_ref_); | 184   SelectWindow(window_ref_); | 
| 185   ShowWindow(window_ref_); | 185   ShowWindow(window_ref_); | 
| 186   return true; | 186   return true; | 
| 187 } | 187 } | 
| 188 | 188 | 
| 189 }  // namespace cricket | 189 }  // namespace cricket | 
| OLD | NEW | 
|---|