Merge detached android branch #5419
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Terminal - FW Backup - FW logs
…alsense into merge-android-branch
…alsense into merge-android-branch
dorodnic
suggested changes
Dec 29, 2019
wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Frame.java
Outdated
Show resolved
Hide resolved
wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/FileUtilities.java
Outdated
Show resolved
Hide resolved
wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/PreviewActivity.java
Outdated
Show resolved
Hide resolved
Merge android branch
Spacing and checking support before setting preset
dorodnic
reviewed
Jan 14, 2020
| @@ -15,10 +15,10 @@ macro(os_set_flags) | |||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -pedantic -g -Wno-missing-field-initializers") | |||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-switch -Wno-multichar") | |||
| set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fPIE -pie") | |||
|
|
|||
| set(HWM_OVER_XU ON) | |||
| @@ -156,7 +156,7 @@ public String prettyPrint(){ | |||
| "\nFrame Count: " + mTotalFrameCount + | |||
| "\nFrame Number: " + mFrameNumber + | |||
| "\nFrame Loss: " + mFrameLoss + | |||
| "\nHW timestamp: " + mHWTimestamp + | |||
| "\nHW timestamp: " + (long)mHWTimestamp + | |||
There was a problem hiding this comment.
Print double in fixed representation, not long
| @@ -201,8 +201,8 @@ private void logFrameData() { | |||
| mResolution + ", " + | |||
| mRequestedFps + ", " + | |||
| mFrameNumber + ", " + | |||
| mHWTimestamp + ", " + | |||
| mHWTimestampDiff + ", " + | |||
| (long)mHWTimestamp + ", " + | |||
Formatting string of double instead of casting it to long
dorodnic
approved these changes
Jan 20, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add the following features:
Fix issues: