Skip to content

Fix bugs of issue #27 #28

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

Open
aleen42 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix bugs of issue #27 #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dfbfc3
Fix bugs of issue #27
aleen42 Sep 5, 2016
6f7bfa8
Fix bugs of using octal literal in strict mode
aleen42 Sep 5, 2016
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
74 changes: 39 additions & 35 deletions src/ogg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,42 @@ var AV = require('av');
try {
var OggDemuxer = require('ogg.js');
} catch (e) {};
if (!OggDemuxer) return;

OggDemuxer.plugins.push({
magic: "\177FLAC",

init: function() {
this.list = new AV.BufferList();
this.stream = new AV.Stream(this.list);
},

readHeaders: function(packet) {
var stream = this.stream;
this.list.append(new AV.Buffer(packet));

stream.advance(5); // magic
if (stream.readUInt8() != 1)
throw new Error('Unsupported FLAC version');

stream.advance(3);
if (stream.peekString(0, 4) != 'fLaC')
throw new Error('Not flac');

this.flac = AV.Demuxer.find(stream.peekSingleBuffer(0, stream.remainingBytes()));
if (!this.flac)
throw new Error('Flac demuxer not found');

this.flac.prototype.readChunk.call(this);
return true;
},

readPacket: function(packet) {
this.list.append(new AV.Buffer(packet));
this.flac.prototype.readChunk.call(this);
}
});

// return calling outside a function will be not proper.
// if (!OggDemuxer) return;

if (OggDemuxer) {
OggDemuxer.plugins.push({
magic: '177FLAC',

init: function() {
this.list = new AV.BufferList();
this.stream = new AV.Stream(this.list);
},

readHeaders: function(packet) {
var stream = this.stream;
this.list.append(new AV.Buffer(packet));

stream.advance(5); // magic
if (stream.readUInt8() != 1)
throw new Error('Unsupported FLAC version');

stream.advance(3);
if (stream.peekString(0, 4) != 'fLaC')
throw new Error('Not flac');

this.flac = AV.Demuxer.find(stream.peekSingleBuffer(0, stream.remainingBytes()));
if (!this.flac)
throw new Error('Flac demuxer not found');

this.flac.prototype.readChunk.call(this);
return true;
},

readPacket: function(packet) {
this.list.append(new AV.Buffer(packet));
this.flac.prototype.readChunk.call(this);
}
});
}