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

fix: support aac data with id3 tags with [email protected] #899

Merged
merged 1 commit into from
Jul 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"global": "^4.3.2",
"m3u8-parser": "4.4.2",
"mpd-parser": "0.10.1",
"mux.js": "5.6.5",
"mux.js": "5.6.6",
"video.js": "^6 || ^7"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions test/media-segment-request.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ QUnit.test('aac with id3 will make it to the transmuxer', function(assert) {
this.options.doneFn = () => {
assert.deepEqual(this.calls, {
data: 1,
trackInfo: 48,
trackInfo: 1,
Copy link
Contributor Author

@brandonocasey brandonocasey Jul 10, 2020

Choose a reason for hiding this comment

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

We now only fire trackinfo on the muxer once for audio, rather than every time we fire data or timed-metadata. The partial muxer and video stream already did this.

progress: 1,
timingInfo: 2,
captions: 0,
Expand All @@ -272,15 +272,15 @@ QUnit.test('aac with id3 will make it to the transmuxer', function(assert) {
this.standardXHRResponse(this.requests[0], aacWithId3Segment());
});

QUnit.skip('aac without id3 will make it to the transmuxer', function(assert) {
QUnit.test('aac without id3 will make it to the transmuxer', function(assert) {
const done = assert.async();

this.options.segment.transmuxer = this.createTransmuxer();
this.options.segment.resolvedUri = 'foo.aac';
this.options.doneFn = () => {
assert.deepEqual(this.calls, {
data: 1,
trackInfo: 47,
trackInfo: 1,
progress: 1,
timingInfo: 2,
captions: 0,
Expand Down Expand Up @@ -440,7 +440,7 @@ QUnit.test('aac with id3 will make it to the partial transmuxer', function(asser
this.standardXHRResponse(this.requests[0], aacWithId3Segment());
});

QUnit.skip('aac without id3 will make it to the partial transmuxer', function(assert) {
QUnit.test('aac without id3 will make it to the partial transmuxer', function(assert) {
const done = assert.async();

this.options.segment.transmuxer = this.createTransmuxer(true);
Expand Down