eyevinn-channel-engine 4.0.11 → 4.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/workflows/nodejs.yml +2 -2
- package/LICENSE +200 -10
- package/README.md +32 -4
- package/dist/engine/server.d.ts +1 -0
- package/dist/engine/server.js +4 -4
- package/dist/engine/session.js +11 -3
- package/dist/package.json +1 -1
- package/engine/server.ts +5 -4
- package/engine/session.js +12 -2
- package/package.json +1 -1
|
@@ -12,9 +12,9 @@ jobs:
|
|
|
12
12
|
node-version: [14.x, 16.x]
|
|
13
13
|
|
|
14
14
|
steps:
|
|
15
|
-
- uses: actions/checkout@
|
|
15
|
+
- uses: actions/checkout@v3
|
|
16
16
|
- name: Use Node.js ${{ matrix.node-version }}
|
|
17
|
-
uses: actions/setup-node@
|
|
17
|
+
uses: actions/setup-node@v3
|
|
18
18
|
with:
|
|
19
19
|
node-version: ${{ matrix.node-version }}
|
|
20
20
|
- name: npm install, build, and test
|
package/LICENSE
CHANGED
|
@@ -1,13 +1,203 @@
|
|
|
1
|
-
Copyright 2018 Eyevinn Technology
|
|
2
1
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
Apache License
|
|
3
|
+
Version 2.0, January 2004
|
|
4
|
+
http://www.apache.org/licenses/
|
|
6
5
|
|
|
7
|
-
|
|
6
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
7
|
+
|
|
8
|
+
1. Definitions.
|
|
9
|
+
|
|
10
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
11
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
12
|
+
|
|
13
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
14
|
+
the copyright owner that is granting the License.
|
|
15
|
+
|
|
16
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
17
|
+
other entities that control, are controlled by, or are under common
|
|
18
|
+
control with that entity. For the purposes of this definition,
|
|
19
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
20
|
+
direction or management of such entity, whether by contract or
|
|
21
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
22
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
23
|
+
|
|
24
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
25
|
+
exercising permissions granted by this License.
|
|
26
|
+
|
|
27
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
28
|
+
including but not limited to software source code, documentation
|
|
29
|
+
source, and configuration files.
|
|
30
|
+
|
|
31
|
+
"Object" form shall mean any form resulting from mechanical
|
|
32
|
+
transformation or translation of a Source form, including but
|
|
33
|
+
not limited to compiled object code, generated documentation,
|
|
34
|
+
and conversions to other media types.
|
|
35
|
+
|
|
36
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
37
|
+
Object form, made available under the License, as indicated by a
|
|
38
|
+
copyright notice that is included in or attached to the work
|
|
39
|
+
(an example is provided in the Appendix below).
|
|
40
|
+
|
|
41
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
42
|
+
form, that is based on (or derived from) the Work and for which the
|
|
43
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
44
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
45
|
+
of this License, Derivative Works shall not include works that remain
|
|
46
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
47
|
+
the Work and Derivative Works thereof.
|
|
48
|
+
|
|
49
|
+
"Contribution" shall mean any work of authorship, including
|
|
50
|
+
the original version of the Work and any modifications or additions
|
|
51
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
52
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
53
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
54
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
55
|
+
means any form of electronic, verbal, or written communication sent
|
|
56
|
+
to the Licensor or its representatives, including but not limited to
|
|
57
|
+
communication on electronic mailing lists, source code control systems,
|
|
58
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
59
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
60
|
+
excluding communication that is conspicuously marked or otherwise
|
|
61
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
62
|
+
|
|
63
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
64
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
65
|
+
subsequently incorporated within the Work.
|
|
66
|
+
|
|
67
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
68
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
69
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
70
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
71
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
72
|
+
Work and such Derivative Works in Source or Object form.
|
|
73
|
+
|
|
74
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
75
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
76
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
77
|
+
(except as stated in this section) patent license to make, have made,
|
|
78
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
79
|
+
where such license applies only to those patent claims licensable
|
|
80
|
+
by such Contributor that are necessarily infringed by their
|
|
81
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
82
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
83
|
+
institute patent litigation against any entity (including a
|
|
84
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
85
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
86
|
+
or contributory patent infringement, then any patent licenses
|
|
87
|
+
granted to You under this License for that Work shall terminate
|
|
88
|
+
as of the date such litigation is filed.
|
|
89
|
+
|
|
90
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
91
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
92
|
+
modifications, and in Source or Object form, provided that You
|
|
93
|
+
meet the following conditions:
|
|
94
|
+
|
|
95
|
+
(a) You must give any other recipients of the Work or
|
|
96
|
+
Derivative Works a copy of this License; and
|
|
97
|
+
|
|
98
|
+
(b) You must cause any modified files to carry prominent notices
|
|
99
|
+
stating that You changed the files; and
|
|
100
|
+
|
|
101
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
102
|
+
that You distribute, all copyright, patent, trademark, and
|
|
103
|
+
attribution notices from the Source form of the Work,
|
|
104
|
+
excluding those notices that do not pertain to any part of
|
|
105
|
+
the Derivative Works; and
|
|
106
|
+
|
|
107
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
108
|
+
distribution, then any Derivative Works that You distribute must
|
|
109
|
+
include a readable copy of the attribution notices contained
|
|
110
|
+
within such NOTICE file, excluding those notices that do not
|
|
111
|
+
pertain to any part of the Derivative Works, in at least one
|
|
112
|
+
of the following places: within a NOTICE text file distributed
|
|
113
|
+
as part of the Derivative Works; within the Source form or
|
|
114
|
+
documentation, if provided along with the Derivative Works; or,
|
|
115
|
+
within a display generated by the Derivative Works, if and
|
|
116
|
+
wherever such third-party notices normally appear. The contents
|
|
117
|
+
of the NOTICE file are for informational purposes only and
|
|
118
|
+
do not modify the License. You may add Your own attribution
|
|
119
|
+
notices within Derivative Works that You distribute, alongside
|
|
120
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
121
|
+
that such additional attribution notices cannot be construed
|
|
122
|
+
as modifying the License.
|
|
123
|
+
|
|
124
|
+
You may add Your own copyright statement to Your modifications and
|
|
125
|
+
may provide additional or different license terms and conditions
|
|
126
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
127
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
128
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
129
|
+
the conditions stated in this License.
|
|
130
|
+
|
|
131
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
132
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
133
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
134
|
+
this License, without any additional terms or conditions.
|
|
135
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
136
|
+
the terms of any separate license agreement you may have executed
|
|
137
|
+
with Licensor regarding such Contributions.
|
|
138
|
+
|
|
139
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
140
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
141
|
+
except as required for reasonable and customary use in describing the
|
|
142
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
143
|
+
|
|
144
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
145
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
146
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
147
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
148
|
+
implied, including, without limitation, any warranties or conditions
|
|
149
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
150
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
151
|
+
appropriateness of using or redistributing the Work and assume any
|
|
152
|
+
risks associated with Your exercise of permissions under this License.
|
|
153
|
+
|
|
154
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
155
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
156
|
+
unless required by applicable law (such as deliberate and grossly
|
|
157
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
158
|
+
liable to You for damages, including any direct, indirect, special,
|
|
159
|
+
incidental, or consequential damages of any character arising as a
|
|
160
|
+
result of this License or out of the use or inability to use the
|
|
161
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
162
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
163
|
+
other commercial damages or losses), even if such Contributor
|
|
164
|
+
has been advised of the possibility of such damages.
|
|
165
|
+
|
|
166
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
167
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
168
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
169
|
+
or other liability obligations and/or rights consistent with this
|
|
170
|
+
License. However, in accepting such obligations, You may act only
|
|
171
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
172
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
173
|
+
defend, and hold each Contributor harmless for any liability
|
|
174
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
175
|
+
of your accepting any such warranty or additional liability.
|
|
176
|
+
|
|
177
|
+
END OF TERMS AND CONDITIONS
|
|
178
|
+
|
|
179
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
180
|
+
|
|
181
|
+
To apply the Apache License to your work, attach the following
|
|
182
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
183
|
+
replaced with your own identifying information. (Don't include
|
|
184
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
185
|
+
comment syntax for the file format. We also recommend that a
|
|
186
|
+
file or class name and description of purpose be included on the
|
|
187
|
+
same "printed page" as the copyright notice for easier
|
|
188
|
+
identification within third-party archives.
|
|
189
|
+
|
|
190
|
+
Copyright 2018- Eyevinn Technology AB
|
|
191
|
+
|
|
192
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
193
|
+
you may not use this file except in compliance with the License.
|
|
194
|
+
You may obtain a copy of the License at
|
|
195
|
+
|
|
196
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
197
|
+
|
|
198
|
+
Unless required by applicable law or agreed to in writing, software
|
|
199
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
200
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
201
|
+
See the License for the specific language governing permissions and
|
|
202
|
+
limitations under the License.
|
|
8
203
|
|
|
9
|
-
Unless required by applicable law or agreed to in writing, software
|
|
10
|
-
distributed under the License is distributed on an "AS IS" BASIS,
|
|
11
|
-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
12
|
-
See the License for the specific language governing permissions and
|
|
13
|
-
limitations under the License.
|
package/README.md
CHANGED
|
@@ -1,7 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
<h1 align="center">
|
|
2
|
+
Eyevinn Channel Engine
|
|
3
|
+
</h1>
|
|
4
|
+
<div align="center">
|
|
5
|
+
Open Source FAST Channel Engine library based on VOD2Live technology
|
|
6
|
+
<br/>
|
|
7
|
+
<br/>
|
|
8
|
+
:book: <b><a href="https://vod2live.docs.eyevinn.technology">Read the documentation</a></b> :eyes:
|
|
9
|
+
</div>
|
|
10
|
+
|
|
11
|
+
<div align="center">
|
|
12
|
+
<br/>
|
|
13
|
+
|
|
14
|
+
[](https://www.npmjs.com/package/eyevinn-channel-engine)
|
|
15
|
+
[](https://github.com/Eyevinn/channel-engine/releases)
|
|
16
|
+
[](LICENSE)
|
|
17
|
+
[](https://github.com/eyevinn/channel-engine/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
|
|
18
|
+
[](https://github.com/eyevinn)
|
|
19
|
+
[](http://slack.streamingtech.se)
|
|
20
|
+
|
|
21
|
+
</div>
|
|
5
22
|
|
|
6
23
|
Eyevinn Channel Engine is a core component library for creating FAST channels based on VOD2Live technology. Combine this vod2live technology component with your business and scheduling logic to build your very own and unique FAST channel engine.
|
|
7
24
|
|
|
@@ -17,6 +34,7 @@ A live demo and example is available here: [https://vod2live.eyevinn.technology]
|
|
|
17
34
|
- Produce a personalized 24/7 HLS live channel unique for each viewer
|
|
18
35
|
- Mix VOD2Live channel with a "real" live HLS stream
|
|
19
36
|
- Develop adapters to plugin with custom scheduling endpoints
|
|
37
|
+
- High Availability with Redis Cache as shared state store
|
|
20
38
|
- And much more!
|
|
21
39
|
|
|
22
40
|
## System Requirements
|
|
@@ -38,6 +56,16 @@ Supported Node.js Versions
|
|
|
38
56
|
|
|
39
57
|
*\* not supported with demuxed sources*
|
|
40
58
|
|
|
59
|
+
## High Availability Support
|
|
60
|
+
|
|
61
|
+
[High availability support](https://vod2live.docs.eyevinn.technology/usage-guide.html#high-availability) is from v3 general available in the Channel Engine and it uses Redis as the shared storage. This allows you to run a replicaset behind a round-robin load balancer. Supported Redis Engine versions:
|
|
62
|
+
|
|
63
|
+
| Version | Supported |
|
|
64
|
+
| ------- | --------- |
|
|
65
|
+
| 5.x | Yes |
|
|
66
|
+
| 6.x | Yes |
|
|
67
|
+
| 7.x | No |
|
|
68
|
+
|
|
41
69
|
## Usage
|
|
42
70
|
|
|
43
71
|
Follow [this tutorial](https://vod2live.docs.eyevinn.technology/getting-started.html) to get started building your own FAST channel engine.
|
package/dist/engine/server.d.ts
CHANGED
package/dist/engine/server.js
CHANGED
|
@@ -819,7 +819,7 @@ var ChannelEngine = /** @class */ (function () {
|
|
|
819
819
|
case 6:
|
|
820
820
|
body = _a.sent();
|
|
821
821
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
822
|
-
"Content-Type": "application/
|
|
822
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
823
823
|
"Access-Control-Allow-Origin": "*",
|
|
824
824
|
"Access-Control-Allow-Headers": "X-Session-Id",
|
|
825
825
|
"Access-Control-Expose-Headers": "X-Session-Id",
|
|
@@ -858,7 +858,7 @@ var ChannelEngine = /** @class */ (function () {
|
|
|
858
858
|
case 2:
|
|
859
859
|
body = _a.sent();
|
|
860
860
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
861
|
-
"Content-Type": "application/
|
|
861
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
862
862
|
"Access-Control-Allow-Origin": "*",
|
|
863
863
|
"Cache-Control": "max-age=".concat(this.streamerOpts.cacheTTL || '4'),
|
|
864
864
|
"X-Instance-Id": this.instanceId + "<".concat(version, ">"),
|
|
@@ -925,7 +925,7 @@ var ChannelEngine = /** @class */ (function () {
|
|
|
925
925
|
//verbose(`[${session.sessionId}] body=`);
|
|
926
926
|
//verbose(body);
|
|
927
927
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
928
|
-
"Content-Type": "application/
|
|
928
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
929
929
|
"Access-Control-Allow-Origin": "*",
|
|
930
930
|
"Cache-Control": "max-age=".concat(this.streamerOpts.cacheTTL || '4'),
|
|
931
931
|
"X-Instance-Id": this.instanceId + "<".concat(version, ">"),
|
|
@@ -1026,7 +1026,7 @@ var ChannelEngine = /** @class */ (function () {
|
|
|
1026
1026
|
endpoints.push({
|
|
1027
1027
|
health: '/health/' + sessionId,
|
|
1028
1028
|
status: '/status/' + sessionId,
|
|
1029
|
-
playback:
|
|
1029
|
+
playback: "/channels/".concat(sessionId, "/master.m3u8"),
|
|
1030
1030
|
});
|
|
1031
1031
|
_b.label = 3;
|
|
1032
1032
|
case 3:
|
package/dist/engine/session.js
CHANGED
|
@@ -1354,7 +1354,7 @@ var Session = /** @class */ (function () {
|
|
|
1354
1354
|
};
|
|
1355
1355
|
Session.prototype.getMasterManifestAsync = function (filter) {
|
|
1356
1356
|
return __awaiter(this, void 0, void 0, function () {
|
|
1357
|
-
var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, _a, _, channels, sessionProfile;
|
|
1357
|
+
var m3u8, currentVod, audioGroupIds, defaultAudioGroupId, hasClosedCaptions, i, audioGroupId, j, audioTrack, _a, _, channels, audioGroupIdFileName, sessionProfile;
|
|
1358
1358
|
var _this = this;
|
|
1359
1359
|
return __generator(this, function (_b) {
|
|
1360
1360
|
switch (_b.label) {
|
|
@@ -1373,6 +1373,7 @@ var Session = /** @class */ (function () {
|
|
|
1373
1373
|
throw new Error('Session not ready');
|
|
1374
1374
|
}
|
|
1375
1375
|
audioGroupIds = currentVod.getAudioGroups();
|
|
1376
|
+
debug("[".concat(this._sessionId, "]: currentVod.getAudioGroups()=").concat(audioGroupIds.join(",")));
|
|
1376
1377
|
hasClosedCaptions = this._closedCaptions && this._closedCaptions.length > 0;
|
|
1377
1378
|
if (hasClosedCaptions) {
|
|
1378
1379
|
this._closedCaptions.forEach(function (cc) {
|
|
@@ -1387,14 +1388,17 @@ var Session = /** @class */ (function () {
|
|
|
1387
1388
|
for (j = 0; j < this._audioTracks.length; j++) {
|
|
1388
1389
|
audioTrack = this._audioTracks[j];
|
|
1389
1390
|
_a = currentVod.getAudioCodecsAndChannelsForGroupId(audioGroupId), _ = _a[0], channels = _a[1];
|
|
1390
|
-
|
|
1391
|
+
audioGroupIdFileName = audioGroupId;
|
|
1392
|
+
if (audioTrack.enforceAudioGroupId) {
|
|
1393
|
+
audioGroupIdFileName = audioTrack.enforceAudioGroupId;
|
|
1394
|
+
}
|
|
1391
1395
|
m3u8 += "#EXT-X-MEDIA:TYPE=AUDIO" +
|
|
1392
1396
|
",GROUP-ID=\"".concat(audioGroupId, "\"") +
|
|
1393
1397
|
",LANGUAGE=\"".concat(audioTrack.language, "\"") +
|
|
1394
1398
|
",NAME=\"".concat(audioTrack.name, "\"") +
|
|
1395
1399
|
",AUTOSELECT=YES,DEFAULT=".concat(audioTrack.default ? 'YES' : 'NO') +
|
|
1396
1400
|
",CHANNELS=\"".concat(channels ? channels : 2, "\"") +
|
|
1397
|
-
",URI=\"master-".concat(
|
|
1401
|
+
",URI=\"master-".concat(audioGroupIdFileName, "_").concat(audioTrack.language, ".m3u8;session=").concat(this._sessionId, "\"") +
|
|
1398
1402
|
"\n";
|
|
1399
1403
|
}
|
|
1400
1404
|
}
|
|
@@ -1412,7 +1416,11 @@ var Session = /** @class */ (function () {
|
|
|
1412
1416
|
if (audioCodec) {
|
|
1413
1417
|
var profileChannels = profile.channels ? profile.channels : "2";
|
|
1414
1418
|
audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
|
|
1419
|
+
if (!audioGroupIds.includes(audioGroupIdToUse)) {
|
|
1420
|
+
audioGroupIdToUse = defaultAudioGroupId;
|
|
1421
|
+
}
|
|
1415
1422
|
}
|
|
1423
|
+
debug("[".concat(_this._sessionId, "]: audioGroupIdToUse=").concat(audioGroupIdToUse));
|
|
1416
1424
|
// skip stream if no corresponding audio group can be found
|
|
1417
1425
|
if (audioGroupIdToUse) {
|
|
1418
1426
|
m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +
|
package/dist/package.json
CHANGED
package/engine/server.ts
CHANGED
|
@@ -122,6 +122,7 @@ export interface AudioTracks {
|
|
|
122
122
|
language: string;
|
|
123
123
|
name: string;
|
|
124
124
|
default?: boolean;
|
|
125
|
+
enforceAudioGroupId?: string;
|
|
125
126
|
}
|
|
126
127
|
|
|
127
128
|
export interface IChannelManager {
|
|
@@ -662,7 +663,7 @@ export class ChannelEngine {
|
|
|
662
663
|
try {
|
|
663
664
|
const body = await session.getMasterManifestAsync(filter);
|
|
664
665
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
665
|
-
"Content-Type": "application/
|
|
666
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
666
667
|
"Access-Control-Allow-Origin": "*",
|
|
667
668
|
"Access-Control-Allow-Headers": "X-Session-Id",
|
|
668
669
|
"Access-Control-Expose-Headers": "X-Session-Id",
|
|
@@ -690,7 +691,7 @@ export class ChannelEngine {
|
|
|
690
691
|
req.headers["x-playback-session-id"]
|
|
691
692
|
);
|
|
692
693
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
693
|
-
"Content-Type": "application/
|
|
694
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
694
695
|
"Access-Control-Allow-Origin": "*",
|
|
695
696
|
"Cache-Control": `max-age=${this.streamerOpts.cacheTTL || '4'}`,
|
|
696
697
|
"X-Instance-Id": this.instanceId + `<${version}>`,
|
|
@@ -734,7 +735,7 @@ export class ChannelEngine {
|
|
|
734
735
|
//verbose(`[${session.sessionId}] body=`);
|
|
735
736
|
//verbose(body);
|
|
736
737
|
res.sendRaw(200, Buffer.from(body, 'utf8'), {
|
|
737
|
-
"Content-Type": "application/
|
|
738
|
+
"Content-Type": "application/vnd.apple.mpegurl",
|
|
738
739
|
"Access-Control-Allow-Origin": "*",
|
|
739
740
|
"Cache-Control": `max-age=${this.streamerOpts.cacheTTL || '4'}`,
|
|
740
741
|
"X-Instance-Id": this.instanceId + `<${version}>`,
|
|
@@ -806,7 +807,7 @@ export class ChannelEngine {
|
|
|
806
807
|
endpoints.push({
|
|
807
808
|
health: '/health/' + sessionId,
|
|
808
809
|
status: '/status/' + sessionId,
|
|
809
|
-
playback:
|
|
810
|
+
playback: `/channels/${sessionId}/master.m3u8`,
|
|
810
811
|
});
|
|
811
812
|
}
|
|
812
813
|
}
|
package/engine/session.js
CHANGED
|
@@ -951,6 +951,7 @@ class Session {
|
|
|
951
951
|
throw new Error('Session not ready');
|
|
952
952
|
}
|
|
953
953
|
let audioGroupIds = currentVod.getAudioGroups();
|
|
954
|
+
debug(`[${this._sessionId}]: currentVod.getAudioGroups()=${audioGroupIds.join(",")}`);
|
|
954
955
|
let defaultAudioGroupId;
|
|
955
956
|
let hasClosedCaptions = this._closedCaptions && this._closedCaptions.length > 0;
|
|
956
957
|
if (hasClosedCaptions) {
|
|
@@ -967,13 +968,17 @@ class Session {
|
|
|
967
968
|
let audioTrack = this._audioTracks[j];
|
|
968
969
|
const [_, channels] = currentVod.getAudioCodecsAndChannelsForGroupId(audioGroupId);
|
|
969
970
|
// Make default track if set property is true.
|
|
971
|
+
let audioGroupIdFileName = audioGroupId;
|
|
972
|
+
if (audioTrack.enforceAudioGroupId) {
|
|
973
|
+
audioGroupIdFileName = audioTrack.enforceAudioGroupId;
|
|
974
|
+
}
|
|
970
975
|
m3u8 += `#EXT-X-MEDIA:TYPE=AUDIO` +
|
|
971
976
|
`,GROUP-ID="${audioGroupId}"` +
|
|
972
977
|
`,LANGUAGE="${audioTrack.language}"` +
|
|
973
978
|
`,NAME="${audioTrack.name}"` +
|
|
974
979
|
`,AUTOSELECT=YES,DEFAULT=${audioTrack.default ? 'YES' : 'NO'}` +
|
|
975
980
|
`,CHANNELS="${channels ? channels : 2}"` +
|
|
976
|
-
`,URI="master-${
|
|
981
|
+
`,URI="master-${audioGroupIdFileName}_${audioTrack.language}.m3u8;session=${this._sessionId}"` +
|
|
977
982
|
"\n";
|
|
978
983
|
}
|
|
979
984
|
}
|
|
@@ -987,12 +992,17 @@ class Session {
|
|
|
987
992
|
if (this.use_demuxed_audio) {
|
|
988
993
|
// find matching audio group based on codec in stream
|
|
989
994
|
let audioGroupIdToUse;
|
|
990
|
-
const [_, audioCodec] = codecsFromString(profile.codecs);
|
|
995
|
+
const [_, audioCodec] = codecsFromString(profile.codecs);
|
|
991
996
|
if (audioCodec) {
|
|
992
997
|
const profileChannels = profile.channels ? profile.channels : "2";
|
|
993
998
|
audioGroupIdToUse = currentVod.getAudioGroupIdForCodecs(audioCodec, profileChannels);
|
|
999
|
+
if (!audioGroupIds.includes(audioGroupIdToUse)) {
|
|
1000
|
+
audioGroupIdToUse = defaultAudioGroupId;
|
|
1001
|
+
}
|
|
994
1002
|
}
|
|
995
1003
|
|
|
1004
|
+
debug(`[${this._sessionId}]: audioGroupIdToUse=${audioGroupIdToUse}`);
|
|
1005
|
+
|
|
996
1006
|
// skip stream if no corresponding audio group can be found
|
|
997
1007
|
if (audioGroupIdToUse) {
|
|
998
1008
|
m3u8 += '#EXT-X-STREAM-INF:BANDWIDTH=' + profile.bw +
|