8000 Add support for stable rendition and variant id tag by sagarDCIN · Pull Request #5 · etherlabsio/go-m3u8 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add support for stable rendition and variant id tag #5

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

Merged
merged 4 commits into from
Sep 20, 2022
Merged

Add support for stable rendition and variant id tag #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe88383
Add support for stable rendition and variant id tag as per latest hls…
sagarDCIN Sep 16, 2022
9fe2020
updated go version
sagarDCIN Sep 16, 2022
869dfc0
added go version 1.13
sagarDCIN Sep 16, 2022
d00190d
fixed go versions in travis.yml
sagarDCIN Sep 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file 8000
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
language: go
go:
- "1.10"
- "1.11"
- "1.13"

before_install:
- go get -t -v ./...
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/etherlabsio/go-m3u8

go 1.12
go 1.13

require (
github.com/AlekSi/pointer v1.0.0
Expand Down
53 changes: 29 additions & 24 deletions m3u8/mediaItem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,39 @@ import (

// MediaItem represents a set of EXT-X-MEDIA attributes
type MediaItem struct {
Type string
GroupID string
Name string
Language *string
AssocLanguage *string
AutoSelect *bool
Default *bool
Forced *bool
URI *string
InStreamID *string
Characteristics *string
Channels *string
Type string
GroupID string
Name string
Language *string
AssocLanguage *string
AutoSelect *bool
Default *bool
Forced *bool
URI *string
InStreamID *string
Characteristics *string
Channels *string
StableRenditionId *string
}

// NewMediaItem parses a text line and returns a *MediaItem
func NewMediaItem(text string) (*MediaItem, error) {
attributes := ParseAttributes(text)

return &MediaItem{
Type: attributes[TypeTag],
GroupID: attributes[GroupIDTag],
Name: attributes[NameTag],
Language: pointerTo(attributes, LanguageTag),
AssocLanguage: pointerTo(attributes, AssocLanguageTag),
AutoSelect: parseYesNo(attributes, AutoSelectTag),
Default: parseYesNo(attributes, DefaultTag),
Forced: parseYesNo(attributes, ForcedTag),
URI: pointerTo(attributes, URITag),
InStreamID: pointerTo(attributes, InStreamIDTag),
Characteristics: pointerTo(attributes, CharacteristicsTag),
Channels: pointerTo(attributes, ChannelsTag),
Type: attributes[TypeTag],
GroupID: attributes[GroupIDTag],
Name: attributes[NameTag],
Language: pointerTo(attributes, LanguageTag),
AssocLanguage: pointerTo(attributes, AssocLanguageTag),
AutoSelect: parseYesNo(attributes, AutoSelectTag),
Default: parseYesNo(attributes, DefaultTag),
Forced: parseYesNo(attributes, ForcedTag),
URI: pointerTo(attributes, URITag),
InStreamID: pointerTo(attributes, InStreamIDTag),
Characteristics: pointerTo(attributes, CharacteristicsTag),
Channels: pointerTo(attributes, ChannelsTag),
StableRenditionId: pointerTo(attributes, StableRenditionIDTag),
}, nil
}

Expand Down Expand Up @@ -75,6 +77,9 @@ func (mi *MediaItem) String() string {
if mi.Channels != nil {
slice = append(slice, fmt.Sprintf(quotedFormatString, ChannelsTag, *mi.Channels))
}
if mi.StableRenditionId != nil {
slice = append(slice, fmt.Sprintf(quotedFormatString, StableRenditionIDTag, *mi.StableRenditionId))
}

return fmt.Sprintf("%s:%s", MediaItemTag, strings.Join(slice, ","))
}
5 changes: 5 additions & 0 deletions m3u8/playlistItem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ type PlaylistItem struct {
FrameRate *float64
HDCPLevel *string
Resolution *Resolution
StableVariantID *string
}

// NewPlaylistItem parses a text line and returns a *PlaylistItem
Expand Down Expand Up @@ -79,6 +80,7 @@ func NewPlaylistItem(text string) (*PlaylistItem, error) {
Name: pointerTo(attributes, NameTag),
HDCPLevel: pointerTo(attributes, HDCPLevelTag),
Resolution: resolution,
StableVariantID: pointerTo(attributes, StableVariantIDTag),
}, nil
}

Expand Down Expand Up @@ -132,6 +134,9 @@ func (pi *PlaylistItem) String() string {
if pi.Name != nil {
slice = append(slice, fmt.Sprintf(quotedFormatString, NameTag, *pi.Name))
}
if pi.StableVariantID != nil {
slice = append(slice, fmt.Sprintf(quotedFormatString, StableVariantIDTag, *pi.StableVariantID))
}

attributesString := strings.Join(slice, ",")

Expand Down
22 changes: 12 additions & 10 deletions m3u8/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,17 @@ const (

// MediaItem tags

TypeTag = "TYPE"
GroupIDTag = "GROUP-ID"
AssocLanguageTag = "ASSOC-LANGUAGE"
NameTag = "NAME"
AutoSelectTag = "AUTOSELECT"
DefaultTag = "DEFAULT"
ForcedTag = "FORCED"
InStreamIDTag = "INSTREAM-ID"
CharacteristicsTag = "CHARACTERISTICS"
ChannelsTag = "CHANNELS"
TypeTag = "TYPE"
GroupIDTag = "GROUP-ID"
AssocLanguageTag = "ASSOC-LANGUAGE"
NameTag = "NAME"
AutoSelectTag = "AUTOSELECT"
DefaultTag = "DEFAULT"
ForcedTag = "FORCED"
InStreamIDTag = "INSTREAM-ID"
CharacteristicsTag = "CHARACTERISTICS"
ChannelsTag = "CHANNELS"
StableRenditionIDTag = "STABLE-RENDITION-ID"

/// PlaylistItem tags

Expand All @@ -92,6 +93,7 @@ const (
SubtitlesTag = "SUBTITLES"
ClosedCaptionsTag = "CLOSED-CAPTIONS"
HDCPLevelTag = "HDCP-LEVEL"
StableVariantIDTag = "STABLE-VARIANT-ID"

// Values

Expand Down
5 changes: 3 additions & 2 deletions test/mediaItem_test.go
View file
Open in desktop
6DAF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func TestMediaItem_Parse(t *testing.T) {
ASSOC-LANGUAGE="spoken",NAME="Francais",AUTOSELECT=YES,
INSTREAM-ID="SERVICE3",CHARACTERISTICS="public.html",
CHANNELS="6",
"DEFAULT=NO,URI="frelo/prog_index.m3u8",FORCED=YES
"DEFAULT=NO,URI="frelo/prog_index.m3u8",STABLE-RENDITION-ID="1234",FORCED=YES
"`

mi, err := m3u8.NewMediaItem(line)
Expand All @@ -21,6 +21,7 @@ CHANNELS="6",
assert.Equal(t, "audio-lo", mi.GroupID)
assert.Equal(t, "Francais", mi.Name)

assertNotNilEqual(t, "1234", mi.StableRenditionId)
assertNotNilEqual(t, "fre", mi.Language)
assertNotNilEqual(t, "spoken", mi.AssocLanguage)
assertNotNilEqual(t, true, mi.AutoSelect)
Expand All @@ -31,6 +32,6 @@ CHANNELS="6",
assertNotNilEqual(t, "public.html", mi.Characteristics)
assertNotNilEqual(t, "6", mi.Channels)

expected := "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio-lo\",LANGUAGE=\"fre\",ASSOC-LANGUAGE=\"spoken\",NAME=\"Francais\",AUTOSELECT=YES,DEFAULT=NO,URI=\"frelo/prog_index.m3u8\",FORCED=YES,INSTREAM-ID=\"SERVICE3\",CHARACTERISTICS=\"public.html\",CHANNELS=\"6\""
expected := "#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID=\"audio-lo\",LANGUAGE=\"fre\",ASSOC-LANGUAGE=\"spoken\",NAME=\"Francais\",AUTOSELECT=YES,DEFAULT=NO,URI=\"frelo/prog_index.m3u8\",FORCED=YES,INSTREAM-ID=\"SERVICE3\",CHARACTERISTICS=\"public.html\",CHANNELS=\"6\",STABLE-RENDITION-ID=\"1234\""
assertToString(t, expected, mi)
}
6 changes: 4 additions & 2 deletions test/playlistItem_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
func TestPlaylistItem_Parse(t *testing.T) {
line := `#EXT-X-STREAM-INF:CODECS="avc",BANDWIDTH=540,
PROGRAM-ID=1,RESOLUTION=1920x1080,FRAME-RATE=23.976,
AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",
AVERAGE-BANDWIDTH=550,AUDIO="test",VIDEO="test2",STABLE-VARIANT-ID="1234"
SUBTITLES="subs",CLOSED-CAPTIONS="caps",URI="test.url",
NAME="1080p",HDCP-LEVEL=TYPE-0`

Expand All @@ -32,6 +32,7 @@ NAME="1080p",HDCP-LEVEL=TYPE-0`
assertNotNilEqual(t, "1080p", pi.Name)
assert.False(t, pi.IFrame)
assertNotNilEqual(t, "TYPE-0", pi.HDCPLevel)
assertNotNilEqual(t, "1234", pi.StableVariantID)
}

func TestPlaylistItem_ToString(t *testing.T) {
Expand Down Expand Up @@ -113,9 +114,10 @@ func TestPlaylistItem_ToString_2(t *testing.T) {
Name: pointer.ToString("SD"),
HDCPLevel: pointer.ToString("TYPE-0"),
ProgramID: pointer.ToString("1"),
StableVariantID: pointer.ToString("1234"),
}

expected := `#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="avc",BANDWIDTH=540,AVERAGE-BANDWIDTH=500,FRAME-RATE=30.000,HDCP-LEVEL=TYPE-0,AUDIO="test",VIDEO="test2",SUBTITLES="subs",CLOSED-CAPTIONS="caps",NAME="SD"
expected := `#EXT-X-STREAM-INF:PROGRAM-ID=1,CODECS="avc",BANDWIDTH=540,AVERAGE-BANDWIDTH=500,FRAME-RATE=30.000,HDCP-LEVEL=TYPE-0,AUDIO="test",VIDEO="test2",SUBTITLES="subs",CLOSED-CAPTIONS="caps",NAME="SD",STABLE-VARIANT-ID="1234"
test.url`
assert.Equal(t, expected, p.String())

Expand Down
0