e5e36ddc40
This changelist is based on Chromium autoroller CL https://webrtc-review.googlesource.com/c/src/+/112847 with additional JNI fixes needed to propagate upstream changes introduced inc99e905516Change log:3546854f59..2e285ebae2Full diff:3546854f59..2e285ebae2Changed dependencies * src/base:0551460b2b..62febbdbd7* src/build:59f4bb0792..8b1ff06550* src/ios:0c78d113b3..2c8e8f83db* src/testing:d387a4a97a..da3cc6c84a* src/third_party:e31ab38349..a862efe9b4* src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/1b98245e3c..6f862e54f2 * src/third_party/depot_tools:016601cc21..0b287c5bca* src/third_party/r8: uM1IGlYVeBYwmhwRCSMVqRvmu4YFlL7M2yLwZ1DWUvAC..ndmKWh0vZhDc2iLXEETOuWXVfafHbqwI_FcSgJJIfpoC * src/tools:476768d37c..cc443eb2fdDEPS diff:3546854f59..2e285ebae2/DEPS No update to Clang. No-Try: True Bug: chromium:898660 Change-Id: I8be89e16d9639d96fc09f053e29414381a486846 Reviewed-on: https://webrtc-review.googlesource.com/c/112595 Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Oleh Prypin <oprypin@webrtc.org> Commit-Queue: Artem Titarenko <artit@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25900}
47 lines
1.4 KiB
C++
47 lines
1.4 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include <jni.h>
|
|
|
|
#include "rtc_base/timestampaligner.h"
|
|
#include "rtc_base/timeutils.h"
|
|
#include "sdk/android/generated_video_jni/jni/TimestampAligner_jni.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
static jlong JNI_TimestampAligner_RtcTimeNanos(JNIEnv* env) {
|
|
return rtc::TimeNanos();
|
|
}
|
|
|
|
static jlong JNI_TimestampAligner_CreateTimestampAligner(JNIEnv* env) {
|
|
return jlongFromPointer(new rtc::TimestampAligner());
|
|
}
|
|
|
|
static void JNI_TimestampAligner_ReleaseTimestampAligner(
|
|
JNIEnv* env,
|
|
jlong timestamp_aligner) {
|
|
delete reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner);
|
|
}
|
|
|
|
static jlong JNI_TimestampAligner_TranslateTimestamp(
|
|
JNIEnv* env,
|
|
jlong timestamp_aligner,
|
|
jlong camera_time_ns) {
|
|
return reinterpret_cast<rtc::TimestampAligner*>(timestamp_aligner)
|
|
->TranslateTimestamp(camera_time_ns / rtc::kNumNanosecsPerMicrosec,
|
|
rtc::TimeMicros()) *
|
|
rtc::kNumNanosecsPerMicrosec;
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|