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

Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev

Browse Source
This commit is contained in:
Lajos Molnar
2013-05-29 19:11:02 +00:00
committed by Android (Google) Code Review
parent 91ea7882cd ecca7f60a6
commit 673903a275
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -11989,7 +11989,6 @@ package android.media {
method public void start(); method public void start();
method public void stop(); method public void stop();
method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo); method public void writeSampleData(int, java.nio.ByteBuffer, android.media.MediaCodec.BufferInfo);
field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1
} }
public static final class MediaMuxer.OutputFormat { public static final class MediaMuxer.OutputFormat {

15
media/java/android/media/MediaMuxer.java
View File

@@ -74,16 +74,6 @@ final public class MediaMuxer {
public static final int MUXER_OUTPUT_MPEG_4 = 0; 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. // All the native functions are listed here.
private static native int nativeSetup(FileDescriptor fd, int format); private static native int nativeSetup(FileDescriptor fd, int format);
private static native void nativeRelease(int nativeObject); private static native void nativeRelease(int nativeObject);
@@ -260,10 +250,13 @@ final public class MediaMuxer {
* Writes an encoded sample into the muxer. * Writes an encoded sample into the muxer.
* <p>The application needs to make sure that the samples are written into * <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 * 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 byteBuf The encoded sample.
* @param trackIndex The track index for this sample. * @param trackIndex The track index for this sample.
* @param bufferInfo The buffer information related to 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, public void writeSampleData(int trackIndex, ByteBuffer byteBuf,
BufferInfo bufferInfo) { BufferInfo bufferInfo) {