| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2015 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 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 897 " for last " << statistic_time_ms << " ms."; | 897 " for last " << statistic_time_ms << " ms."; |
| 898 start_time_ms_ = rtc::TimeMillis(); | 898 start_time_ms_ = rtc::TimeMillis(); |
| 899 current_frames_ = 0; | 899 current_frames_ = 0; |
| 900 current_bytes_ = 0; | 900 current_bytes_ = 0; |
| 901 current_decoding_time_ms_ = 0; | 901 current_decoding_time_ms_ = 0; |
| 902 current_delay_time_ms_ = 0; | 902 current_delay_time_ms_ = 0; |
| 903 } | 903 } |
| 904 | 904 |
| 905 // If the frame was dropped, frame_buffer is left as nullptr. | 905 // If the frame was dropped, frame_buffer is left as nullptr. |
| 906 if (frame_buffer) { | 906 if (frame_buffer) { |
| 907 VideoFrame decoded_frame(frame_buffer, 0, 0, webrtc::kVideoRotation_0); | 907 VideoFrame decoded_frame(frame_buffer, 0, 0, webrtc::kVideoRotation_0, |
| 908 webrtc::kVideoContent_Default); |
| 908 decoded_frame.set_timestamp(output_timestamps_ms); | 909 decoded_frame.set_timestamp(output_timestamps_ms); |
| 909 decoded_frame.set_ntp_time_ms(output_ntp_timestamps_ms); | 910 decoded_frame.set_ntp_time_ms(output_ntp_timestamps_ms); |
| 910 | 911 |
| 911 rtc::Optional<uint8_t> qp = pending_frame_qps_.front(); | 912 rtc::Optional<uint8_t> qp = pending_frame_qps_.front(); |
| 912 pending_frame_qps_.pop_front(); | 913 pending_frame_qps_.pop_front(); |
| 913 callback_->Decoded(decoded_frame, rtc::Optional<int32_t>(decode_time_ms), | 914 callback_->Decoded(decoded_frame, rtc::Optional<int32_t>(decode_time_ms), |
| 914 qp); | 915 qp); |
| 915 } | 916 } |
| 916 return true; | 917 return true; |
| 917 } | 918 } |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1026 webrtc::VideoDecoder* decoder) { | 1027 webrtc::VideoDecoder* decoder) { |
| 1027 ALOGD << "Destroy video decoder."; | 1028 ALOGD << "Destroy video decoder."; |
| 1028 delete decoder; | 1029 delete decoder; |
| 1029 } | 1030 } |
| 1030 | 1031 |
| 1031 const char* MediaCodecVideoDecoder::ImplementationName() const { | 1032 const char* MediaCodecVideoDecoder::ImplementationName() const { |
| 1032 return "MediaCodec"; | 1033 return "MediaCodec"; |
| 1033 } | 1034 } |
| 1034 | 1035 |
| 1035 } // namespace webrtc_jni | 1036 } // namespace webrtc_jni |
| OLD | NEW |