Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0aa24d9 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

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

parents 00e5c613 c80218a9

media/libstagefright/MPEG4Writer.cpp

+10 −0
Original line number Diff line number Diff line
@@ -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 {