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 |
(...skipping 56 matching lines...) Loading... |
67 } | 67 } |
68 | 68 |
69 const int64_t now_ms = _clock->TimeInMilliseconds(); | 69 const int64_t now_ms = _clock->TimeInMilliseconds(); |
70 if (decode_time_ms < 0) { | 70 if (decode_time_ms < 0) { |
71 decode_time_ms = | 71 decode_time_ms = |
72 static_cast<int32_t>(now_ms - frameInfo->decodeStartTimeMs); | 72 static_cast<int32_t>(now_ms - frameInfo->decodeStartTimeMs); |
73 } | 73 } |
74 _timing->StopDecodeTimer(decodedImage.timestamp(), decode_time_ms, now_ms, | 74 _timing->StopDecodeTimer(decodedImage.timestamp(), decode_time_ms, now_ms, |
75 frameInfo->renderTimeMs); | 75 frameInfo->renderTimeMs); |
76 | 76 |
77 decodedImage.set_render_time_ms(frameInfo->renderTimeMs); | 77 decodedImage.set_timestamp_us( |
| 78 frameInfo->renderTimeMs * rtc::kNumMicrosecsPerMillisec); |
78 decodedImage.set_rotation(frameInfo->rotation); | 79 decodedImage.set_rotation(frameInfo->rotation); |
79 // TODO(sakal): Investigate why callback is NULL sometimes and replace if | 80 // TODO(sakal): Investigate why callback is NULL sometimes and replace if |
80 // statement with a DCHECK. | 81 // statement with a DCHECK. |
81 if (callback) { | 82 if (callback) { |
82 callback->FrameToRender(decodedImage); | 83 callback->FrameToRender(decodedImage); |
83 } else { | 84 } else { |
84 LOG(LS_WARNING) << "No callback, dropping frame."; | 85 LOG(LS_WARNING) << "No callback, dropping frame."; |
85 } | 86 } |
86 return WEBRTC_VIDEO_CODEC_OK; | 87 return WEBRTC_VIDEO_CODEC_OK; |
87 } | 88 } |
(...skipping 97 matching lines...) Loading... |
185 | 186 |
186 bool VCMGenericDecoder::External() const { | 187 bool VCMGenericDecoder::External() const { |
187 return _isExternal; | 188 return _isExternal; |
188 } | 189 } |
189 | 190 |
190 bool VCMGenericDecoder::PrefersLateDecoding() const { | 191 bool VCMGenericDecoder::PrefersLateDecoding() const { |
191 return _decoder->PrefersLateDecoding(); | 192 return _decoder->PrefersLateDecoding(); |
192 } | 193 } |
193 | 194 |
194 } // namespace webrtc | 195 } // namespace webrtc |
OLD | NEW |