Signal container MIME type for JPEGs
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:
parent
1a8592c5c0
commit
7d05f20493
@ -30,6 +30,7 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
|
|||||||
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
|
import com.google.android.exoplayer2.extractor.mp4.Mp4Extractor;
|
||||||
import com.google.android.exoplayer2.metadata.Metadata;
|
import com.google.android.exoplayer2.metadata.Metadata;
|
||||||
import com.google.android.exoplayer2.metadata.mp4.MotionPhotoMetadata;
|
import com.google.android.exoplayer2.metadata.mp4.MotionPhotoMetadata;
|
||||||
|
import com.google.android.exoplayer2.util.MimeTypes;
|
||||||
import com.google.android.exoplayer2.util.ParsableByteArray;
|
import com.google.android.exoplayer2.util.ParsableByteArray;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.lang.annotation.Documented;
|
import java.lang.annotation.Documented;
|
||||||
@ -273,7 +274,10 @@ public final class JpegExtractor implements Extractor {
|
|||||||
TrackOutput imageTrackOutput =
|
TrackOutput imageTrackOutput =
|
||||||
checkNotNull(extractorOutput).track(IMAGE_TRACK_ID, C.TRACK_TYPE_IMAGE);
|
checkNotNull(extractorOutput).track(IMAGE_TRACK_ID, C.TRACK_TYPE_IMAGE);
|
||||||
imageTrackOutput.format(
|
imageTrackOutput.format(
|
||||||
new Format.Builder().setMetadata(new Metadata(metadataEntries)).build());
|
new Format.Builder()
|
||||||
|
.setContainerMimeType(MimeTypes.IMAGE_JPEG)
|
||||||
|
.setMetadata(new Metadata(metadataEntries))
|
||||||
|
.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -28,5 +28,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -28,5 +28,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -28,5 +28,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -28,5 +28,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=6377, photoPresentationTimestampUs=1232840, videoStartPosition=6377, videoSize=4686]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -8,5 +8,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=131582, photoPresentationTimestampUs=0, videoStartPosition=131582, videoSize=8730]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=131582, photoPresentationTimestampUs=0, videoStartPosition=131582, videoSize=8730]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -8,5 +8,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=20345, photoPresentationTimestampUs=-9223372036854775807, videoStartPosition=20345, videoSize=2582]
|
metadata = entries=[Motion photo metadata: photoStartPosition=0, photoSize=20345, photoPresentationTimestampUs=-9223372036854775807, videoStartPosition=20345, videoSize=2582]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
@ -7,5 +7,6 @@ track 1024:
|
|||||||
total output bytes = 0
|
total output bytes = 0
|
||||||
sample count = 0
|
sample count = 0
|
||||||
format 0:
|
format 0:
|
||||||
|
containerMimeType = image/jpeg
|
||||||
metadata = entries=[]
|
metadata = entries=[]
|
||||||
tracksEnded = true
|
tracksEnded = true
|
||||||
|
Loading…
x
Reference in New Issue
Block a user