Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 7600f934: am f0aa24d9: Merge "Added damr box for AMR (NB and WB) sample entry" into gingerbread

Browse Source 
Merge commit '7600f934015cff4d678b0f4e8df0eb93749be7bb'

* commit '7600f934015cff4d678b0f4e8df0eb93749be7bb':
  Added damr box for AMR (NB and WB) sample entry
This commit is contained in:
James Dong
2010-07-30 14:54:26 -07:00
committed by Android Git Automerger
parent bc6ed6c9f6 7600f93401
commit e1c5dae372
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/libstagefright/MPEG4Writer.cpp
View File

@@ -1615,6 +1615,16 @@ void MPEG4Writer::Track::writeTrackHeader(
mOwner->write(kData2, sizeof(kData2));
mOwner->endBox(); // esds
} else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_AMR_NB, mime) ||
!strcasecmp(MEDIA_MIMETYPE_AUDIO_AMR_WB, mime)) {
// 3gpp2 Spec AMRSampleEntry fields
mOwner->beginBox("damr");
mOwner->writeCString(" "); // vendor: 4 bytes
mOwner->writeInt8(0); // decoder version
mOwner->writeInt16(0x83FF); // mode set: all enabled
mOwner->writeInt8(0); // mode change period
mOwner->writeInt8(1); // frames per sample
mOwner->endBox();
}
mOwner->endBox();
} else {