diff options
| author | James Dong <jdong@google.com> | 2010-12-22 12:40:57 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-22 12:40:57 -0800 |
| commit | 27d4ad2a5771ad025fa69f64b093d7429d94bfd3 (patch) | |
| tree | ebdfd8fe462e86500a411536971a251d6faacf00 /media/java/android | |
| parent | 2f209e885a86b8396fe1344043cf9858751fcb64 (diff) | |
| parent | 2bf89b2197674ccc414ea60a61199562df9dc52b (diff) | |
| download | frameworks_base-27d4ad2a5771ad025fa69f64b093d7429d94bfd3.zip frameworks_base-27d4ad2a5771ad025fa69f64b093d7429d94bfd3.tar.gz frameworks_base-27d4ad2a5771ad025fa69f64b093d7429d94bfd3.tar.bz2 | |
am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
Diffstat (limited to 'media/java/android')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index ecabae8..32c02bc 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -178,11 +178,12 @@ public class MediaRecorder /** The following formats are audio only .aac or .amr formats **/ /** @deprecated Deprecated in favor of AMR_NB */ - /** TODO: change link when AMR_NB is exposed. Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB */ + /** Deprecated in favor of MediaRecorder.OutputFormat.AMR_NB */ + /** AMR NB file format */ public static final int RAW_AMR = 3; - /** @hide AMR NB file format */ + /** AMR NB file format */ public static final int AMR_NB = 3; - /** @hide AMR WB file format */ + /** AMR WB file format */ public static final int AMR_WB = 4; /** @hide AAC ADIF file format */ public static final int AAC_ADIF = 5; @@ -208,9 +209,9 @@ public class MediaRecorder public static final int DEFAULT = 0; /** AMR (Narrowband) audio codec */ public static final int AMR_NB = 1; - /** @hide AMR (Wideband) audio codec */ + /** AMR (Wideband) audio codec */ public static final int AMR_WB = 2; - /** @hide AAC audio codec */ + /** AAC audio codec */ public static final int AAC = 3; /** @hide enhanced AAC audio codec */ public static final int AAC_PLUS = 4; |