Merge pull request #636 from TakayukiHoshi1984/modify_audio_no_activity

Hostプラグインの音声録音時にActivityを起動しないようにした

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/AndroidManifest.xml

@@ -72,13 +72,6 @@
             android:taskAffinity=".player"
             android:screenOrientation="landscape"/>
 
-        <activity
-            android:name="org.deviceconnect.android.deviceplugin.host.recorder.audio.AudioRecorderActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleInstance"
-            android:taskAffinity=".audio"
-            android:exported="false"/>
-
         <activity
             android:name="org.deviceconnect.android.deviceplugin.host.activity.CanvasProfileActivity"
             android:exported="false"

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/mediaplayer/AspectFixedVideoView.java

@@ -32,18 +32,22 @@ public AspectFixedVideoView(Context context) {
     public void setVideoURI(Uri uri) {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         retriever.setDataSource(this.getContext(), uri);
-        int w = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
-        int h = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
-        mVideoRotation = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION));
-        if (mVideoRotation == 90 || mVideoRotation == 270) {
-            mVideoWidth = h;
-            mVideoHeight = w;
-        } else {
-            mVideoWidth = w;
-            mVideoHeight = h;
-        }
-        if (BuildConfig.DEBUG) {
-            Log.d("AspectFixedVideoView", "setVideoURI: " + mVideoWidth + "x" + mVideoHeight + " " + mVideoRotation);
+        // 音声ファイルの場合はビデオサイズを取得しない
+        if (retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH) != null
+            && retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT) != null) {
+            int w = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
+            int h = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
+            mVideoRotation = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION));
+            if (mVideoRotation == 90 || mVideoRotation == 270) {
+                mVideoWidth = h;
+                mVideoHeight = w;
+            } else {
+                mVideoWidth = w;
+                mVideoHeight = h;
+            }
+            if (BuildConfig.DEBUG) {
+                Log.d("AspectFixedVideoView", "setVideoURI: " + mVideoWidth + "x" + mVideoHeight + " " + mVideoRotation);
+            }
         }
         super.setVideoURI(uri);
     }