Revert layouts (shahen94#71)

* temporary remove playerLayer * fix(Trimmer): Preview Images load preview images properly when video's duration is less than 10sec * get preview image with the right orientation
alonle · Jun 7, 2017 · dd3d14d · dd3d14d
1 parent 77d5040
commit dd3d14d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/android/src/main/java/com/shahenlibrary/Trimmer/Trimmer.java b/android/src/main/java/com/shahenlibrary/Trimmer/Trimmer.java
@@ -105,6 +105,7 @@ public static void getPreviewImages(String path, Promise promise, ReactApplicati
 
     for (int i = 0; i < duration; i += duration / 10) {
       Bitmap frame = retriever.getFrameAtTime(i * 1000);
+
       if(frame == null) {
         continue;
       }

diff --git a/android/src/main/java/com/shahenlibrary/VideoPlayer/VideoPlayerView.java b/android/src/main/java/com/shahenlibrary/VideoPlayer/VideoPlayerView.java
@@ -287,8 +287,17 @@ public void sendMediaInfo() {
 
   public void getFrame(float sec) {
     Bitmap bmp = metadataRetriever.getFrameAtTime((long) (sec * 1000000));
+
+    int width = Integer.parseInt(metadataRetriever.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
+    int height = Integer.parseInt(metadataRetriever.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
+    int orientation = Integer.parseInt(metadataRetriever.extractMetadata(FFmpegMediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION));
+
+    Matrix mx = new Matrix();
+    mx.postRotate(orientation - 360);
+    Bitmap normalizedBmp = Bitmap.createBitmap(bmp, 0, 0, width, height, mx, true);
+
     ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    bmp.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
+    normalizedBmp.compress(Bitmap.CompressFormat.PNG, 100, byteArrayOutputStream);
     byte[] byteArray = byteArrayOutputStream .toByteArray();
     String encoded = Base64.encodeToString(byteArray, Base64.DEFAULT);
 

diff --git a/ios/RNVideoProcessing/RNVideoPlayer.swift b/ios/RNVideoProcessing/RNVideoPlayer.swift
@@ -343,12 +343,13 @@ class RNVideoPlayer: RCTView {
         playerItem = AVPlayerItem(url: movieURL as! URL)
         player.replaceCurrentItem(with: playerItem)
 
-        playerLayer = AVPlayerLayer(player: player)
-        playerLayer!.frame = filterView.bounds
-        playerLayer!.videoGravity = self._resizeMode
-        playerLayer!.masksToBounds = true
-        playerLayer!.removeFromSuperlayer()
-        filterView.layer.addSublayer(playerLayer!)
+        // MARK - Temporary removing playeLayer, it dublicates video if it's in landscape mode
+        //        playerLayer = AVPlayerLayer(player: player)
+        //        playerLayer!.frame = filterView.bounds
+        //        playerLayer!.videoGravity = self._resizeMode
+        //        playerLayer!.masksToBounds = true
+        //        playerLayer!.removeFromSuperlayer()
+        //        filterView.layer.addSublayer(playerLayer!)
 
         print("CHANGED playerframe \(playerLayer), frameAAA \(playerLayer?.frame)")
         self.setNeedsLayout()