ContentResolverにビデオ情報を登録してからサムネイル情報を登録するようにした。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/CameraWrapper.java

@@ -80,8 +80,6 @@ void notifyEvent(final CameraEvent event) {
 
     private final CameraManager mCameraManager;
 
-    private final HandlerThread mBackgroundThread = new HandlerThread("background");
-
     private final HandlerThread mSessionConfigurationThread = new HandlerThread("session-config");
 
     private final Handler mBackgroundHandler;
@@ -124,8 +122,7 @@ void notifyEvent(final CameraEvent event) {
                   final @NonNull String cameraId) throws CameraAccessException {
         mCameraId = cameraId;
         mCameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
-        mBackgroundThread.start();
-        mBackgroundHandler = new Handler(Looper.getMainLooper());//mBackgroundThread.getLooper());
+        mBackgroundHandler = new Handler(Looper.getMainLooper());
         mSessionConfigurationThread.start();
         mSessionConfigurationHandler = new Handler(mSessionConfigurationThread.getLooper());
         mOptions = initOptions();
@@ -190,7 +187,6 @@ public boolean isRecording() {
 
     public synchronized void destroy() {
         close();
-        mBackgroundThread.quit();
         mSessionConfigurationThread.quit();
     }
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/camera/Camera2Recorder.java

@@ -55,6 +55,7 @@
 import java.util.List;
 import java.util.Locale;
 
+
 public class Camera2Recorder extends AbstractCamera2Recorder implements HostDevicePhotoRecorder, HostDeviceStreamRecorder {
 
     /**
@@ -532,18 +533,15 @@ private void registerVideo(final File videoFile) {
             values.put(MediaStore.Video.Media.ARTIST, "DeviceConnect");
             values.put(MediaStore.Video.Media.MIME_TYPE, "video/avc");
             values.put(MediaStore.Video.Media.DATA, videoFile.toString());
-            long thumbnailId = registerVideoThumbnail(videoFile);
-            if (thumbnailId > -1) {
-                values.put(MediaStore.Video.Media.MINI_THUMB_MAGIC, thumbnailId);
-            }
             Uri uri = resolver.insert(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values);
 
             // 動画IDをサムネイルDBに挿入.
             try {
-                if (uri != null && thumbnailId > -1) {
+                if (uri != null) {
                     String id = uri.getLastPathSegment();
                     if (id != null) {
                         long videoId = Long.parseLong(id);
+                        long thumbnailId = registerVideoThumbnail(videoFile, videoId);
                         boolean updated = updateThumbnailInfo(thumbnailId, videoId);
                         if (updated) {
                             if (DEBUG) {
@@ -569,7 +567,7 @@ private void registerVideo(final File videoFile) {
         }
     }
 
-    private long registerVideoThumbnail(final File videoFile) {
+    private long registerVideoThumbnail(final File videoFile, final long videoId) {
         String videoFilePath = videoFile.getAbsolutePath();
         final int kind = MediaStore.Images.Thumbnails.MINI_KIND;
         Bitmap thumbnail = ThumbnailUtils.createVideoThumbnail(videoFilePath, kind);
@@ -588,6 +586,7 @@ private long registerVideoThumbnail(final File videoFile) {
             values.put(MediaStore.Video.Thumbnails.WIDTH, thumbnail.getWidth());
             values.put(MediaStore.Video.Thumbnails.HEIGHT, thumbnail.getHeight());
             values.put(MediaStore.Video.Thumbnails.KIND, kind);
+            values.put(MediaStore.Video.Thumbnails.VIDEO_ID, videoId);
             ContentResolver resolver = getContext().getApplicationContext().getContentResolver();
             Uri uri = resolver.insert(MediaStore.Video.Thumbnails.EXTERNAL_CONTENT_URI, values);
             if (uri == null) {
@@ -617,11 +616,6 @@ private long registerVideoThumbnail(final File videoFile) {
                 Log.e(TAG, "Failed to parse thumbnail ID as long type: videoFilePath=" + videoFilePath);
             }
             return -1;
-        } catch (NullPointerException e) {
-            if (DEBUG) {
-                Log.e(TAG, "Failed to parse thumbnail ID as long type: videoFilePath=" + videoFilePath);
-            }
-            return -1;
         } finally {
             thumbnail.recycle();
         }