diff options
| author | Lajos Molnar <lajos@google.com> | 2013-05-28 13:59:33 -0700 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2013-05-29 12:08:18 -0700 |
| commit | ecca7f60a69d99a9569c06bdf9c122f853e67d47 (patch) | |
| tree | dad778660a7f15bf4427a92d9cdc40dd99925149 /media/java | |
| parent | 62f47bc29588e495a6f8efd082b34a92f8ec2098 (diff) | |
| download | frameworks_base-ecca7f60a69d99a9569c06bdf9c122f853e67d47.zip frameworks_base-ecca7f60a69d99a9569c06bdf9c122f853e67d47.tar.gz frameworks_base-ecca7f60a69d99a9569c06bdf9c122f853e67d47.tar.bz2 | |
android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.
Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.
Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaMuxer.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index c0fbd2e..e49a00e 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -74,16 +74,6 @@ final public class MediaMuxer { public static final int MUXER_OUTPUT_MPEG_4 = 0; }; - /** - * The sample is a sync sample, which does not require other video samples - * to decode. This flag is used in {@link #writeSampleData} to indicate - * which sample is a sync sample. - */ - /* Keep this flag in sync with its equivalent in - * include/media/stagefright/MediaMuxer.h. - */ - public static final int SAMPLE_FLAG_SYNC = 1; - // All the native functions are listed here. private static native int nativeSetup(FileDescriptor fd, int format); private static native void nativeRelease(int nativeObject); @@ -260,10 +250,13 @@ final public class MediaMuxer { * 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> + * are written in chronological order (e.g. in the order they are provided + * by the encoder.)</p> * @param byteBuf The encoded sample. * @param trackIndex The track index for this sample. * @param bufferInfo The buffer information related to this sample. + * MediaMuxer uses the flags provided in {@link MediaCodec.BufferInfo}, + * to signal sync frames. */ public void writeSampleData(int trackIndex, ByteBuffer byteBuf, BufferInfo bufferInfo) { |