| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 #include "webrtc/base/logging.h" | 11 #include "webrtc/base/logging.h" | 
| 12 #include "webrtc/base/trace_event.h" | 12 #include "webrtc/base/trace_event.h" | 
| 13 #include "webrtc/modules/video_coding/main/interface/video_coding.h" | 13 #include "webrtc/modules/video_coding/include/video_coding.h" | 
| 14 #include "webrtc/modules/video_coding/main/source/generic_decoder.h" | 14 #include "webrtc/modules/video_coding/generic_decoder.h" | 
| 15 #include "webrtc/modules/video_coding/main/source/internal_defines.h" | 15 #include "webrtc/modules/video_coding/internal_defines.h" | 
| 16 #include "webrtc/system_wrappers/include/clock.h" | 16 #include "webrtc/system_wrappers/include/clock.h" | 
| 17 | 17 | 
| 18 namespace webrtc { | 18 namespace webrtc { | 
| 19 | 19 | 
| 20 VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming& timing, | 20 VCMDecodedFrameCallback::VCMDecodedFrameCallback(VCMTiming& timing, | 
| 21                                                  Clock* clock) | 21                                                  Clock* clock) | 
| 22 : | 22 : | 
| 23 _critSect(CriticalSectionWrapper::CreateCriticalSection()), | 23 _critSect(CriticalSectionWrapper::CreateCriticalSection()), | 
| 24 _clock(clock), | 24 _clock(clock), | 
| 25 _receiveCallback(NULL), | 25 _receiveCallback(NULL), | 
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 203     _callback = callback; | 203     _callback = callback; | 
| 204     return _decoder.RegisterDecodeCompleteCallback(callback); | 204     return _decoder.RegisterDecodeCompleteCallback(callback); | 
| 205 } | 205 } | 
| 206 | 206 | 
| 207 bool VCMGenericDecoder::External() const | 207 bool VCMGenericDecoder::External() const | 
| 208 { | 208 { | 
| 209     return _isExternal; | 209     return _isExternal; | 
| 210 } | 210 } | 
| 211 | 211 | 
| 212 }  // namespace | 212 }  // namespace | 
| OLD | NEW | 
|---|