Set Format.frameRate for single-frame MP4 tracks

Issue: androidx/media#1051 PiperOrigin-RevId: 613516802
google · Mar 7, 2024 · d987dbb · d987dbb
1 parent 879e4b3
commit d987dbb
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 1 deletion.
diff --git a/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java b/...ary/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java
@@ -637,7 +637,7 @@ private void processMoovAtom(ContainerAtom moov) throws ParserException {
                       ? C.ROLE_FLAG_MAIN
                       : C.ROLE_FLAG_ALTERNATE));
         }
-        if (trackDurationUs > 0 && trackSampleTable.sampleCount > 1) {
+        if (trackDurationUs > 0 && trackSampleTable.sampleCount > 0) {
           float frameRate = trackSampleTable.sampleCount / (trackDurationUs / 1000000f);
           formatBuilder.setFrameRate(frameRate);
         }

diff --git a/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump b/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.0.dump
@@ -270,6 +270,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump b/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.1.dump
@@ -214,6 +214,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump b/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.2.dump
@@ -130,6 +130,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump b/testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-2-hevc-tracks.jpg.3.dump
@@ -46,6 +46,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump b/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump
@@ -16,6 +16,7 @@ track 0:
     maxInputSize = 3895
     width = 180
     height = 120
+    frameRate = 1.1534026
     pixelWidthHeightRatio = 0.5
     colorInfo:
       lumaBitdepth = 8

diff --git a/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump b/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump
@@ -16,6 +16,7 @@ track 0:
     maxInputSize = 3895
     width = 180
     height = 120
+    frameRate = 1.1534026
     pixelWidthHeightRatio = 0.5
     colorInfo:
       lumaBitdepth = 8

diff --git a/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump b/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump
@@ -16,6 +16,7 @@ track 0:
     maxInputSize = 3895
     width = 180
     height = 120
+    frameRate = 1.1534026
     pixelWidthHeightRatio = 0.5
     colorInfo:
       lumaBitdepth = 8

diff --git a/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump b/.../src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump
@@ -16,6 +16,7 @@ track 0:
     maxInputSize = 3895
     width = 180
     height = 120
+    frameRate = 1.1534026
     pixelWidthHeightRatio = 0.5
     colorInfo:
       lumaBitdepth = 8

diff --git a/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump b/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.0.dump
@@ -269,6 +269,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump b/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.1.dump
@@ -213,6 +213,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump b/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.2.dump
@@ -129,6 +129,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump b/testdata/src/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.3.dump
@@ -45,6 +45,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1

diff --git a/...c/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump b/...c/test/assets/extractordumps/mp4/pixel-motion-photo-2-hevc-tracks.mp4.unknown_length.dump
@@ -269,6 +269,7 @@ track 1:
     maxInputSize = 151345
     width = 2048
     height = 1536
+    frameRate = 2.142245
     rotationDegrees = 90
     colorInfo:
       colorSpace = 1