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

feat: add support for a frame-rate attribute #159

Merged
merged 2 commits into from
Aug 2, 2022
Merged

feat: add support for a frame-rate attribute #159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f1bed2
feat: add support for a frame-rate attribute
gjanblaszczyk Jun 9, 2022
59f1ee7
docs: fix typo in comment
gjanblaszczyk Jul 28, 2022
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
13 changes: 13 additions & 0 deletions src/parseAttributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { parseDivisionValue } from './utils/string';
import { from } from './utils/list';
import { parseDuration, parseDate } from './utils/time';

Expand Down Expand Up @@ -131,6 +132,18 @@ export const parsers = {
return parseInt(value, 10);
},

/**
* Specifies the frame rate of the representation
*
* @param {string} value
* value of attribute as a string
* @return {number}
* The parsed frame rate
*/
frameRate(value) {
return parseDivisionValue(value);
},

/**
* Specifies the number of the first Media Segment in this Representation in the Period
*
Expand Down
4 changes: 4 additions & 0 deletions src/toM3u8.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,10 @@ export const formatVideoPlaylist = ({
segments
};

if (attributes.frameRate) {
playlist.attributes['FRAME-RATE'] = attributes.frameRate;
}

if (attributes.contentProtection) {
playlist.contentProtection = attributes.contentProtection;
}
Expand Down
10 changes: 10 additions & 0 deletions src/utils/string.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/**
* Converts the provided string value that may contain the division operation to the number value.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Converts the provided string value that may contain the division operation to the number value.
* Converts the provided string that may contain a division operation to a number.

Copy link
Member Author

@gjanblaszczyk gjanblaszczyk Jul 28, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I have just updated the comment for the function. By the way, I added you as a reviewer to the related PR for a "httpstreaming" repo (videojs/http-streaming#1289).

*
* @param {string} value - the provided string value
*
* @return {number} the parsed string value
*/
export const parseDivisionValue = (value) => {
return parseFloat(value.split('/').reduce((prev, current) => prev / current));
};
1 change: 1 addition & 0 deletions test/manifests/608-captions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
1 change: 1 addition & 0 deletions test/manifests/708-captions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
1 change: 1 addition & 0 deletions test/manifests/location.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
1 change: 1 addition & 0 deletions test/manifests/locations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
2 changes: 2 additions & 0 deletions test/manifests/maat_vtt_segmentTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,7 @@ export const parsedManifest = {
'NAME': '482',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'FRAME-RATE': 23.976,
'RESOLUTION': {
width: 482,
height: 270
Expand Down Expand Up @@ -487,6 +488,7 @@ export const parsedManifest = {
'NAME': '720',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'FRAME-RATE': 23.976,
'RESOLUTION': {
width: 720,
height: 404
Expand Down
45 changes: 24 additions & 21 deletions test/manifests/multiperiod-dynamic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,16 +613,17 @@ export const parsedManifest = {
playlists: [
{
attributes: {
'NAME': 'default_video2000_0_1280x720',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 2008000,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 29.97,
'NAME': 'default_video2000_0_1280x720',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 1280,
height: 720
height: 720,
width: 1280
},
'CODECS': 'avc1.4d001f',
'BANDWIDTH': 2008000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: false,
Expand Down Expand Up @@ -905,16 +906,17 @@ export const parsedManifest = {
},
{
attributes: {
'NAME': 'default_video1200_1_960x540',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 1195000,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 29.97,
'NAME': 'default_video1200_1_960x540',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 960,
height: 540
height: 540,
width: 960
},
'CODECS': 'avc1.4d001f',
'BANDWIDTH': 1195000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: false,
Expand Down Expand Up @@ -1197,16 +1199,17 @@ export const parsedManifest = {
},
{
attributes: {
'NAME': 'default_video900_1_640x360',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 884000,
'CODECS': 'avc1.4d001e',
'FRAME-RATE': 29.97,
'NAME': 'default_video900_1_640x360',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 640,
height: 360
height: 360,
width: 640
},
'CODECS': 'avc1.4d001e',
'BANDWIDTH': 884000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: false,
Expand Down
1 change: 1 addition & 0 deletions test/manifests/multiperiod-segment-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
15 changes: 8 additions & 7 deletions test/manifests/multiperiod-segment-template.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,17 @@ export const parsedManifest = {
playlists: [
{
attributes: {
'NAME': '1',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 100000,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 24,
'NAME': '1',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 480,
height: 200
height: 200,
width: 480
},
'CODECS': 'avc1.4d001f',
'BANDWIDTH': 100000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: true,
Expand Down
6 changes: 6 additions & 0 deletions test/manifests/multiperiod-startnumber-removed-periods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 2942295,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 30,
'NAME': 'D',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -155,6 +156,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 4267536,
'CODECS': 'avc1.640020',
'FRAME-RATE': 60,
'NAME': 'E',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -219,6 +221,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 5256859,
'CODECS': 'avc1.640020',
'FRAME-RATE': 60,
'NAME': 'F',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -283,6 +286,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 240781,
'CODECS': 'avc1.4d000d',
'FRAME-RATE': 30,
'NAME': 'A',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -347,6 +351,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 494354,
'CODECS': 'avc1.4d001e',
'FRAME-RATE': 30,
'NAME': 'B',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -411,6 +416,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 1277155,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 30,
'NAME': 'C',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
6 changes: 6 additions & 0 deletions test/manifests/multiperiod-startnumber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 2942295,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 30,
'NAME': 'D',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -333,6 +334,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 4267536,
'CODECS': 'avc1.640020',
'FRAME-RATE': 60,
'NAME': 'E',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -486,6 +488,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 5256859,
'CODECS': 'avc1.640020',
'FRAME-RATE': 60,
'NAME': 'F',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -639,6 +642,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 240781,
'CODECS': 'avc1.4d000d',
'FRAME-RATE': 30,
'NAME': 'A',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -792,6 +796,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 494354,
'CODECS': 'avc1.4d001e',
'FRAME-RATE': 30,
'NAME': 'B',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -945,6 +950,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 1277155,
'CODECS': 'avc1.4d001e',
'FRAME-RATE': 30,
'NAME': 'C',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
45 changes: 24 additions & 21 deletions test/manifests/multiperiod.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,16 +613,17 @@ export const parsedManifest = {
playlists: [
{
attributes: {
'NAME': 'default_video2000_0_1280x720',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 2008000,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 29.97,
'NAME': 'default_video2000_0_1280x720',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 1280,
height: 720
height: 720,
width: 1280
},
'CODECS': 'avc1.4d001f',
'BANDWIDTH': 2008000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: true,
Expand Down Expand Up @@ -905,16 +906,17 @@ export const parsedManifest = {
},
{
attributes: {
'NAME': 'default_video1200_1_960x540',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 1195000,
'CODECS': 'avc1.4d001f',
'FRAME-RATE': 29.97,
'NAME': 'default_video1200_1_960x540',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 960,
height: 540
height: 540,
width: 960
},
'CODECS': 'avc1.4d001f',
'BANDWIDTH': 1195000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: true,
Expand Down Expand Up @@ -1197,16 +1199,17 @@ export const parsedManifest = {
},
{
attributes: {
'NAME': 'default_video900_1_640x360',
'AUDIO': 'audio',
'SUBTITLES': 'subs',
'BANDWIDTH': 884000,
'CODECS': 'avc1.4d001e',
'FRAME-RATE': 29.97,
'NAME': 'default_video900_1_640x360',
'PROGRAM-ID': 1,
'RESOLUTION': {
width: 640,
height: 360
height: 360,
width: 640
},
'CODECS': 'avc1.4d001e',
'BANDWIDTH': 884000,
'PROGRAM-ID': 1
'SUBTITLES': 'subs'
},
uri: '',
endList: true,
Expand Down
1 change: 1 addition & 0 deletions test/manifests/segmentBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
2 changes: 2 additions & 0 deletions test/manifests/segmentList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 449000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '482',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down Expand Up @@ -112,6 +113,7 @@ export const parsedManifest = {
'AUDIO': 'audio',
'BANDWIDTH': 3971000,
'CODECS': 'avc1.420015',
'FRAME-RATE': 23.976,
'NAME': '720',
'PROGRAM-ID': 1,
'RESOLUTION': {
Expand Down
Loading