From d609ca7f6a48f32dcd6671f877a96e8bf1b898ed Mon Sep 17 00:00:00 2001 From: James Dong Date: Wed, 22 Dec 2010 10:32:51 -0800 Subject: Expose AMRNB/WB and AAC encoder and related file output formats - do not merge bug - 3305667 Change-Id: I8f137af7f87cb010f75cae1777b9ec6b6af8214f --- media/java/android/media/MediaRecorder.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'media') 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; -- cgit v1.1