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

Commit 34dd708a authored by ztenghui's avatar ztenghui Committed by Android Git Automerger
Browse files

am 50b9eb1c: Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev 

* commit '50b9eb1c':
  Update the documentiation for MediaMuxer::writeSampleData()
parents 11c6b669 50b9eb1c

media/java/android/media/MediaMuxer.java

+4 −2
Original line number Diff line number Diff line
@@ -257,8 +257,10 @@ final public class MediaMuxer { 
    }



    /**

     * Writes an encoded sample into the muxer. The application needs to make

     * sure that the samples are written into the right tracks.

     * Writes an encoded sample into the muxer.

     * <p>The application needs to make sure that the samples are written into

     * the right tracks. Also, it needs to make sure the samples for each track

     * are written in chronological order.</p>

     * @param byteBuf The encoded sample.

     * @param trackIndex The track index for this sample.

     * @param bufferInfo The buffer information related to this sample.