loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Signal container MIME type for JPEGs

Browse Source 
Before this change the `Format` on the image track output by the
`JpegExtractor` doesn't have a MIME type.

PiperOrigin-RevId: 381015819
This commit is contained in:
andrewlewis 2021-06-23 14:16:41 +01:00 committed by Oliver Woodman
parent 1a8592c5c0
commit 7d05f20493
14 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/jpeg/JpegExtractor.java
View File

@ -30,6 +30,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.mp4.MotionPhotoMetadata;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.ParsableByteArray;
import java.io.IOException;
import java.lang.annotation.Documented;
@ -273,7 +274,10 @@ public final class JpegExtractor implements Extractor {
TrackOutput imageTrackOutput =
checkNotNull(extractorOutput).track(IMAGE_TRACK_ID, C.TRACK_TYPE_IMAGE);
imageTrackOutput.format(
new Format.Builder().setMetadata(new Metadata(metadataEntries)).build());
new Format.Builder()
.setContainerMimeType(MimeTypes.IMAGE_JPEG)
.setMetadata(new Metadata(metadataEntries))
.build());
}
/**

1
testdata/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg.0.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/non-motion-photo-shortened.jpg.unknown_length.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.0.dump vendored
View File

@ -28,5 +28,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.1.dump vendored
View File

@ -28,5 +28,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.2.dump vendored
View File

@ -28,5 +28,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.3.dump vendored
View File

@ -28,5 +28,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-jfif-segment-shortened.jpg.unknown_length.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg.0.dump vendored
View File

@ -8,5 +8,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=131582, photoPresentationTimestampUs=0, videoStartPosition=131582, videoSize=8730]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-shortened.jpg.unknown_length.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-video-removed-shortened.jpg.0.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/pixel-motion-photo-video-removed-shortened.jpg.unknown_length.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/ss-motion-photo-shortened.jpg.0.dump vendored
View File

@ -8,5 +8,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=20345, photoPresentationTimestampUs=-9223372036854775807, videoStartPosition=20345, videoSize=2582]
tracksEnded = true

1
testdata/src/test/assets/extractordumps/jpeg/ss-motion-photo-shortened.jpg.unknown_length.dump vendored
View File

@ -7,5 +7,6 @@ track 1024:
total output bytes = 0
sample count = 0
format 0:
containerMimeType = image/jpeg
metadata = entries=[]
tracksEnded = true