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.

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

Added support for #EXT-X-MEDIA:TYPE=SUBTITLES tracks #514

Open
wants to merge 13 commits into
base: dev
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	src/org/mangui/hls/demux/TSDemuxer.as
#	src/org/mangui/hls/playlist/Manifest.as
#	src/org/mangui/hls/stream/HLSNetStream.as
  • Loading branch information
neilrackett committed Jul 5, 2016
commit 5d4ccc91788a09bd0d465fcd800b0f7ae34bda93
4 changes: 2 additions & 2 deletions src/org/mangui/hls/demux/TSDemuxer.as
Original file line number Diff line number Diff line change
@@ -836,8 +836,8 @@ package org.mangui.hls.demux {
}
break;
case _pmtId:
CONFIG::LOGGING {
if (_pmtParsed == false || _unknownPIDFound == true) {
CONFIG::LOGGING {
if (_pmtParsed == false || _unknownPIDFound == true) {
if(_pmtParsed == false) {
Log.debug("TS: PMT found");
} else {
8 changes: 4 additions & 4 deletions src/org/mangui/hls/playlist/Manifest.as
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ package org.mangui.hls.playlist {
import org.mangui.hls.model.Level;
import org.mangui.hls.utils.DateUtil;
import org.mangui.hls.utils.Hex;
import org.mangui.hls.utils.StringUtil;
import org.mangui.hls.utils.StringUtil;

CONFIG::LOGGING {
import org.mangui.hls.utils.Log;
@@ -472,7 +472,7 @@ package org.mangui.hls.playlist {
break;
case RENDITION_STATE_READSIMPLEVALUE:
if (c == ",") {
variables[StringUtil.trim(key)] = value;
variables[StringUtil.trim(key)] = value;
key = "";
value = "";
state = RENDITION_STATE_READKEY;
@@ -489,7 +489,7 @@ package org.mangui.hls.playlist {
break;
case STATE_READQUOTEDVALUE_END:
if (c == ",") {
variables[StringUtil.trim(key)] = value;
variables[StringUtil.trim(key)] = value;
key = "";
value = "";
state = RENDITION_STATE_READKEY;
@@ -499,7 +499,7 @@ package org.mangui.hls.playlist {
}

if (key) {
variables[StringUtil.trim(key)] = value;
variables[StringUtil.trim(key)] = value;
}

return variables;
2 changes: 1 addition & 1 deletion src/org/mangui/hls/stream/HLSNetStream.as
Original file line number Diff line number Diff line change
@@ -159,7 +159,7 @@ package org.mangui.hls.stream {
// Log.info("netstream/total:" + super.bufferLength + "/" + this.bufferLength);

if (_seekState != HLSSeekStates.SEEKING) {
if (_playbackState == HLSPlayStates.PLAYING) {
if (_playbackState == HLSPlayStates.PLAYING || _playbackState == HLSPlayStates.PLAYING_BUFFERING) {
/* check if play head reached end of stream.
this happens when
playstate is PLAYING
You are viewing a condensed version of this merge commit. You can view the full changes here.