Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support DTS audio in MP4 - Part 2 

Issue #52

Change-Id: Ib71077c5063aced23f9d060b35facbf8e6eb0a3a
This commit is contained in:
Bei Li 2015-12-08 16:57:35 -08:00 committed by Gerrit Code Review
parent e7a4dde677
commit aa805b9632
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packager/media/formats/mp4/mp4_muxer.cc
View File

@ -225,20 +225,42 @@ void MP4Muxer::GenerateAudioTrak(const AudioStreamInfo* audio_info,
trak->media.handler.type = kAudio; trak->media.handler.type = kAudio;
AudioSampleEntry audio; AudioSampleEntry audio;
switch(audio_info->codec()){
case kCodecAAC:
audio.format = FOURCC_MP4A; audio.format = FOURCC_MP4A;
audio.esds.es_descriptor.set_object_type(kISO_14496_3); // MPEG4 AAC.
audio.esds.es_descriptor.set_esid(track_id);
audio.esds.es_descriptor.set_decoder_specific_info(
audio_info->extra_data());
break;
case kCodecDTSC:
audio.format = FOURCC_DTSC;
audio.ddts.data = audio_info->extra_data();
break;
case kCodecDTSH:
audio.format = FOURCC_DTSH;
audio.ddts.data = audio_info->extra_data();
break;
case kCodecDTSL:
audio.format = FOURCC_DTSL;
audio.ddts.data = audio_info->extra_data();
break;
case kCodecDTSE:
audio.format = FOURCC_DTSE;
audio.ddts.data = audio_info->extra_data();
break;
case kCodecDTSM:
audio.format = FOURCC_DTSM;
audio.ddts.data = audio_info->extra_data();
break;
default:
NOTIMPLEMENTED();
break;
}
audio.channelcount = audio_info->num_channels(); audio.channelcount = audio_info->num_channels();
audio.samplesize = audio_info->sample_bits(); audio.samplesize = audio_info->sample_bits();
audio.samplerate = audio_info->sampling_frequency(); audio.samplerate = audio_info->sampling_frequency();
if (kCodecAAC) {
audio.esds.es_descriptor.set_object_type(kISO_14496_3); // MPEG4 AAC.
} else {
// Do we need to support other types?
NOTIMPLEMENTED();
}
audio.esds.es_descriptor.set_esid(track_id);
audio.esds.es_descriptor.set_decoder_specific_info(audio_info->extra_data());
SampleDescription& sample_description = SampleDescription& sample_description =
trak->media.information.sample_table.description; trak->media.information.sample_table.description;
sample_description.type = kAudio; sample_description.type = kAudio;