Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added support for Thumbnails in DASH #10793

Merged
merged 7 commits into from
Feb 1, 2023
Merged

Added support for Thumbnails in DASH #10793

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16af5b7
DashManifest has been enhanced to allow fetching Thumbnail Meta Data …
gorkemg Nov 18, 2022
158cf0c
Added missing files
gorkemg Nov 18, 2022
2f8fd87
Added two new image specific properties 'tileCountHorizontal' and 'ti…
gorkemg Dec 5, 2022
dad7427
Image AdaptationSets have to be excluded from duration calculation, s…
gorkemg Dec 9, 2022
f518cb6
Removing files outside of library
gorkemg Jan 16, 2023
a250222
Removed thumbnails example streams from media.exolist.json
gorkemg Jan 16, 2023
40d8f00
Merge branch 'dev-v2' into dash-thumbnail-support
gorkemg Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Image AdaptationSets have to be excluded from duration calculation, s… 
…imilar to Text AdaptationSets, see issue 4029 (#4029).
  • Loading branch information
@gorkemg
gorkemg committed Dec 9, 2022
commit dad74276efdfc7119476a3d62746ba5a0cf3da0e
8 changes: 4 additions & 4 deletions library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,9 +1056,9 @@ private static long getAvailableStartTimeInManifestUs(
for (int i = 0; i < period.adaptationSets.size(); i++) {
AdaptationSet adaptationSet = period.adaptationSets.get(i);
List<Representation> representations = adaptationSet.representations;
// Exclude text adaptation sets from duration calculations, if we have at least one audio
// Exclude text and image adaptation sets from duration calculations, if we have at least one audio
// or video adaptation set. See: https://github.com/google/ExoPlayer/issues/4029
if ((haveAudioVideoAdaptationSets && adaptationSet.type == C.TRACK_TYPE_TEXT)
if ((haveAudioVideoAdaptationSets && (adaptationSet.type == C.TRACK_TYPE_TEXT || adaptationSet.type == C.TRACK_TYPE_IMAGE))
|| representations.isEmpty()) {
continue;
}
Expand Down Expand Up @@ -1088,9 +1088,9 @@ private static long getAvailableEndTimeInManifestUs(
for (int i = 0; i < period.adaptationSets.size(); i++) {
AdaptationSet adaptationSet = period.adaptationSets.get(i);
List<Representation> representations = adaptationSet.representations;
// Exclude text adaptation sets from duration calculations, if we have at least one audio
// Exclude text and image adaptation sets from duration calculations, if we have at least one audio
// or video adaptation set. See: https://github.com/google/ExoPlayer/issues/4029
if ((haveAudioVideoAdaptationSets && adaptationSet.type == C.TRACK_TYPE_TEXT)
if ((haveAudioVideoAdaptationSets && (adaptationSet.type == C.TRACK_TYPE_TEXT || adaptationSet.type == C.TRACK_TYPE_IMAGE))
|| representations.isEmpty()) {
continue;
}
Expand Down