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

am 2bf89b21: Merge "Expose AMRNB/WB and AAC encoder and related file output formats - do not merge" into gingerbread

Browse Source 
* commit '2bf89b2197674ccc414ea60a61199562df9dc52b':
  Expose AMRNB/WB and AAC encoder and related file output formats - do not merge
This commit is contained in:
James Dong
2010-12-22 12:40:57 -08:00
committed by Android Git Automerger
parent 2f209e885a 2bf89b2197
commit 27d4ad2a57
2 changed files with 51 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
api/current.xml
View File

@@ -89226,6 +89226,17 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<field name="AAC"
type="int"
transient="false"
volatile="false"
value="3"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="AMR_NB" <field name="AMR_NB"
type="int" type="int"
transient="false" transient="false"
@@ -89237,6 +89248,17 @@
visibility="public" visibility="public"
> >
</field> </field>
<field name="AMR_WB"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DEFAULT" <field name="DEFAULT"
type="int" type="int"
transient="false" transient="false"
@@ -89393,6 +89415,28 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<field name="AMR_NB"
type="int"
transient="false"
volatile="false"
value="3"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="AMR_WB"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="DEFAULT" <field name="DEFAULT"
type="int" type="int"
transient="false" transient="false"
@@ -226793,7 +226837,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="t" type="T"> <parameter name="arg0" type="T">
</parameter> </parameter>
</method> </method>
</interface> </interface>

11
media/java/android/media/MediaRecorder.java
View File

@@ -178,11 +178,12 @@ public class MediaRecorder
/** The following formats are audio only .aac or .amr formats **/ /** The following formats are audio only .aac or .amr formats **/
/** @deprecated Deprecated in favor of AMR_NB */ /** @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; public static final int RAW_AMR = 3;
/** @hide AMR NB file format */ /** AMR NB file format */
public static final int AMR_NB = 3; public static final int AMR_NB = 3;
/** @hide AMR WB file format */ /** AMR WB file format */
public static final int AMR_WB = 4; public static final int AMR_WB = 4;
/** @hide AAC ADIF file format */ /** @hide AAC ADIF file format */
public static final int AAC_ADIF = 5; public static final int AAC_ADIF = 5;
@@ -208,9 +209,9 @@ public class MediaRecorder
public static final int DEFAULT = 0; public static final int DEFAULT = 0;
/** AMR (Narrowband) audio codec */ /** AMR (Narrowband) audio codec */
public static final int AMR_NB = 1; public static final int AMR_NB = 1;
/** @hide AMR (Wideband) audio codec */ /** AMR (Wideband) audio codec */
public static final int AMR_WB = 2; public static final int AMR_WB = 2;
/** @hide AAC audio codec */ /** AAC audio codec */
public static final int AAC = 3; public static final int AAC = 3;
/** @hide enhanced AAC audio codec */ /** @hide enhanced AAC audio codec */
public static final int AAC_PLUS = 4; public static final int AAC_PLUS = 4;