diff options
| author | ztenghui <ztenghui@google.com> | 2013-04-08 17:22:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-08 17:22:29 +0000 |
| commit | 50b9eb1c7375a87525d44a036337a8ba18eba55b (patch) | |
| tree | 729c4f1695a08ec0067a5516398cf03bdc9e85cb | |
| parent | 26c134398422a4f4e703cdf7b87fb1cb08d542c4 (diff) | |
| parent | f7d3aae32859a52c24713dba30e4d7ef779fdfb1 (diff) | |
| download | frameworks_base-50b9eb1c7375a87525d44a036337a8ba18eba55b.zip frameworks_base-50b9eb1c7375a87525d44a036337a8ba18eba55b.tar.gz frameworks_base-50b9eb1c7375a87525d44a036337a8ba18eba55b.tar.bz2 | |
Merge "Update the documentiation for MediaMuxer::writeSampleData()" into jb-mr2-dev
| -rw-r--r-- | media/java/android/media/MediaMuxer.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index 1f5ca35..c0fbd2e 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -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. |