Skip to content
Closed
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
2 changes: 2 additions & 0 deletions d.ts/mpegts.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ declare namespace Mpegts {
interface MSEPlayer extends Player {
mediaInfo: MSEPlayerMediaInfo;
statisticsInfo: MSEPlayerStatisticsInfo;
switchPrimaryAudio(): void;
switchSecondaryAudio(): void;
}

interface NativePlayer extends Player {
Expand Down
1 change: 1 addition & 0 deletions d.ts/src/demux/ts-demuxer.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ declare class TSDemuxer extends BaseDemuxer {
private audio_metadata_changed_;
private video_track_;
private audio_track_;
preferred_secondary_audio: boolean;
constructor(probe_data: any, config: any);
destroy(): void;
static probe(buffer: ArrayBuffer): {
Expand Down
21 changes: 21 additions & 0 deletions src/core/transmuxer.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import TransmuxingController from './transmuxing-controller.js';
import TransmuxingEvents from './transmuxing-events.js';
import TransmuxingWorker from './transmuxing-worker.js';
import MediaInfo from './media-info.js';
import TSDemuxer from '../demux/ts-demuxer.ts';

class Transmuxer {

Expand Down Expand Up @@ -140,6 +141,26 @@ class Transmuxer {
}
}

switchPrimaryAudio() {
if (this._worker) {
this._worker.postMessage({cmd: 'switch_audio', param: 'primary'});
} else {
if (this._controller._demuxer instanceof TSDemuxer) {
this._controller._demuxer.preferred_secondary_audio = false;
}
}
}

switchSecondaryAudio() {
if (this._worker) {
this._worker.postMessage({cmd: 'switch_audio', param: 'secondary'});
} else {
if (this._controller._demuxer instanceof TSDemuxer) {
this._controller._demuxer.preferred_secondary_audio = true;
}
}
}

_onInitSegment(type, initSegment) {
// do async invoke
Promise.resolve().then(() => {
Expand Down
10 changes: 10 additions & 0 deletions src/core/transmuxing-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import LoggingControl from '../utils/logging-control.js';
import Polyfill from '../utils/polyfill.js';
import TransmuxingController from './transmuxing-controller.js';
import TransmuxingEvents from './transmuxing-events.js';
import TSDemuxer from '../demux/ts-demuxer.ts';

/* post message to worker:
data: {
Expand Down Expand Up @@ -97,6 +98,15 @@ let TransmuxingWorker = function (self) {
}
break;
}
case 'switch_audio':
if (controller._demuxer instanceof TSDemuxer) {
if (e.data.param === 'primary') {
controller._demuxer.preferred_secondary_audio = false;
} else if (e.data.param === 'secondary') {
controller._demuxer.preferred_secondary_audio = true;
}
}
break;
}
});

Expand Down
6 changes: 4 additions & 2 deletions src/demux/ts-demuxer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ class TSDemuxer extends BaseDemuxer {
private video_track_ = {type: 'video', id: 1, sequenceNumber: 0, samples: [], length: 0};
private audio_track_ = {type: 'audio', id: 2, sequenceNumber: 0, samples: [], length: 0};

public preferred_secondary_audio = false;

public constructor(probe_data: any, config: any) {
super();

Expand Down Expand Up @@ -733,7 +735,7 @@ class TSDemuxer extends BaseDemuxer {
pmt.common_pids.h264 = elementary_PID;
} else if (stream_type === StreamType.kH265 && !pmt.common_pids.h264 && !pmt.common_pids.h265) {
pmt.common_pids.h265 = elementary_PID;
} else if (stream_type === StreamType.kADTSAAC && !pmt.common_pids.adts_aac) {
} else if (stream_type === StreamType.kADTSAAC && (!pmt.common_pids.adts_aac || this.preferred_secondary_audio)) {
pmt.common_pids.adts_aac = elementary_PID;
} else if ((stream_type === StreamType.kMPEG1Audio || stream_type === StreamType.kMPEG2Audio) && !pmt.common_pids.mp3) {
pmt.common_pids.mp3 = elementary_PID;
Expand Down Expand Up @@ -1416,7 +1418,7 @@ class TSDemuxer extends BaseDemuxer {
if (pts != undefined) {
let pts_ms = Math.floor(pts / this.timescale_);
timed_id3_metadata.pts = pts_ms;
}
}

if (dts != undefined) {
let dts_ms = Math.floor(dts / this.timescale_);
Expand Down
8 changes: 8 additions & 0 deletions src/player/mse-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,14 @@ class MSEPlayer {
this._mediaElement.pause();
}

switchPrimaryAudio() {
this._transmuxer.switchPrimaryAudio();
}

switchSecondaryAudio() {
this._transmuxer.switchSecondaryAudio()
}

get type() {
return this._type;
}
Expand Down