diff options
author | Byunghun Jeon <bjeon@codeaurora.org> | 2016-05-10 16:59:33 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-25 21:55:20 -0700 |
commit | 9cd5721ea88d24549a2946e1aaaef04993bc94d6 (patch) | |
tree | 5cace1ebb46725b06e76340b2e902ffc682d8903 /src/com/android/camera/util/CameraUtil.java | |
parent | 56881f01e46cd33506b7d8a9ee1a7e66165c4519 (diff) | |
download | android_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.tar.gz android_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.tar.bz2 android_packages_apps_Snap-9cd5721ea88d24549a2946e1aaaef04993bc94d6.zip |
SnapdragonCamera: Add video to Camera2 module
Add video to Camera2 module and combine the UI
Change-Id: I0bcd86eb6b95fe2180856780ddd794682259e799
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
-rw-r--r-- | src/com/android/camera/util/CameraUtil.java | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java index 9b728b642..b89e13675 100644 --- a/src/com/android/camera/util/CameraUtil.java +++ b/src/com/android/camera/util/CameraUtil.java @@ -36,6 +36,7 @@ import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; import android.location.Location; +import android.media.MediaRecorder; import android.net.Uri; import android.os.Handler; import android.os.ParcelFileDescriptor; @@ -1223,4 +1224,62 @@ public class CameraUtil { return retRatio; } + public static String millisecondToTimeString(long milliSeconds, boolean displayCentiSeconds) { + long seconds = milliSeconds / 1000; // round down to compute seconds + long minutes = seconds / 60; + long hours = minutes / 60; + long remainderMinutes = minutes - (hours * 60); + long remainderSeconds = seconds - (minutes * 60); + + StringBuilder timeStringBuilder = new StringBuilder(); + + // Hours + if (hours > 0) { + if (hours < 10) { + timeStringBuilder.append('0'); + } + timeStringBuilder.append(hours); + + timeStringBuilder.append(':'); + } + + // Minutes + if (remainderMinutes < 10) { + timeStringBuilder.append('0'); + } + timeStringBuilder.append(remainderMinutes); + timeStringBuilder.append(':'); + + // Seconds + if (remainderSeconds < 10) { + timeStringBuilder.append('0'); + } + timeStringBuilder.append(remainderSeconds); + + // Centi seconds + if (displayCentiSeconds) { + timeStringBuilder.append('.'); + long remainderCentiSeconds = (milliSeconds - seconds * 1000) / 10; + if (remainderCentiSeconds < 10) { + timeStringBuilder.append('0'); + } + timeStringBuilder.append(remainderCentiSeconds); + } + + return timeStringBuilder.toString(); + } + + public static String convertOutputFormatToMimeType(int outputFileFormat) { + if (outputFileFormat == MediaRecorder.OutputFormat.MPEG_4) { + return "video/mp4"; + } + return "video/3gpp"; + } + + public static String convertOutputFormatToFileExt(int outputFileFormat) { + if (outputFileFormat == MediaRecorder.OutputFormat.MPEG_4) { + return ".mp4"; + } + return ".3gp"; + } } |