Skip to content

handle whole m3u8 in redirection case #7575

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

handle whole m3u8 in redirection case #7575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 34 additions & 27 deletions src/main/java/io/antmedia/filter/HlsManifestModifierFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,35 +157,42 @@ else if (StringUtils.isNullOrEmpty(startDate) || StringUtils.isNullOrEmpty(endDa
}

if(original != null) {
MediaPlaylistParser parser = new MediaPlaylistParser();
MediaPlaylist playList = parser.readPlaylist(original);

List<MediaSegment> segments = new ArrayList<>();
for (MediaSegment segment : playList.mediaSegments())
{
segment.programDateTime().ifPresent(dateTime ->
String newData = "";
if(StringUtils.isNullOrEmpty(startDate) || StringUtils.isNullOrEmpty(endDate)) {
//I have added this to handle all and partial m3u8 in redirection case
newData = original;
}
else {
MediaPlaylistParser parser = new MediaPlaylistParser();
MediaPlaylist playList = parser.readPlaylist(original);

List<MediaSegment> segments = new ArrayList<>();
for (MediaSegment segment : playList.mediaSegments())
{
long time = dateTime.toEpochSecond();
if (time >= start && time <= end)
segment.programDateTime().ifPresent(dateTime ->
{
segments.add(MediaSegment.builder()
.duration(segment.duration())
.uri(segment.uri())
.build());
}
});
}

MediaPlaylist newPlayList = MediaPlaylist.builder()
.version(playList.version())
.targetDuration(playList.targetDuration())
.ongoing(false)
.addAllMediaSegments(segments)
.build();

String newData = new MediaPlaylistParser().writePlaylistAsString(newPlayList);
if (parameterExists) {
newData = modifyManifestFileContent(newData, token, subscriberId, subscriberCode, SEGMENT_FILE_REGEX);
long time = dateTime.toEpochSecond();
if (time >= start && time <= end)
{
segments.add(MediaSegment.builder()
.duration(segment.duration())
.uri(segment.uri())
.build());
}
});
}

MediaPlaylist newPlayList = MediaPlaylist.builder()
.version(playList.version())
.targetDuration(playList.targetDuration())
.ongoing(false)
.addAllMediaSegments(segments)
.build();

newData = new MediaPlaylistParser().writePlaylistAsString(newPlayList);
if (parameterExists) {
newData = modifyManifestFileContent(newData, token, subscriberId, subscriberCode, SEGMENT_FILE_REGEX);
}
}

// Write final modified data to response
Expand Down
Loading