diff options
| author | James Dong <jdong@google.com> | 2012-02-02 11:54:43 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-02 15:50:24 -0800 |
| commit | 874d1f1f65a989405b3c1f692014ef2072e09f5e (patch) | |
| tree | 780d3c94ea2c3409a78b00221c65c441e3abaf97 /media | |
| parent | b2305815f04d64a2e6abf672618676bbb197dee9 (diff) | |
| download | frameworks_base-874d1f1f65a989405b3c1f692014ef2072e09f5e.zip frameworks_base-874d1f1f65a989405b3c1f692014ef2072e09f5e.tar.gz frameworks_base-874d1f1f65a989405b3c1f692014ef2072e09f5e.tar.bz2 | |
Unhide AAC_ADTS file format
o also actually decprecated RAW_AMR file format
Change-Id: Ic8ef5b0dca6f793fddf9e79d431e79f5083f7bff
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index a720c0a..85d99c1 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -204,18 +204,24 @@ public class MediaRecorder /** MPEG4 media file format*/ public static final int MPEG_4 = 2; - /** The following formats are audio only .aac or .amr formats **/ - /** @deprecated Deprecated in favor of AMR_NB */ - /** Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB */ - /** AMR NB file format */ + /** The following formats are audio only .aac or .amr formats */ + + /** + * AMR NB file format + * @deprecated Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB + */ public static final int RAW_AMR = 3; + /** AMR NB file format */ public static final int AMR_NB = 3; + /** AMR WB file format */ public static final int AMR_WB = 4; + /** @hide AAC ADIF file format */ public static final int AAC_ADIF = 5; - /** @hide AAC ADTS file format */ + + /** AAC ADTS file format */ public static final int AAC_ADTS = 6; /** @hide Stream over a socket, limited to a single stream */ |