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

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

Browse Source 
Merge commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974' into gingerbread-plus-aosp

* commit 'f0aa24d91d23195f811e317c4cc4ddbe06db8974':
  Added damr box for AMR (NB and WB) sample entry
This commit is contained in:
James Dong
2010-07-30 14:52:05 -07:00
committed by Android Git Automerger
parent 3b724c836b f0aa24d91d
commit 7600f93401
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->write(kData2, sizeof(kData2));
mOwner->endBox(); // esds 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(); mOwner->endBox();
} else { } else {