diff options
| author | Ravi Kumar Alamanda <ralama@codeaurora.org> | 2011-02-18 16:25:40 +0530 |
|---|---|---|
| committer | Ricardo Cerqueira <github@cerqueira.org> | 2012-03-27 17:00:50 +0100 |
| commit | a253734423f1c998349f90a106acc613365e1844 (patch) | |
| tree | f9367697eca149b7971dcdc09ae87a8f3cbbb5df /api | |
| parent | 256fcc6a18ed092ab97b4b2f092c16daaa48f72c (diff) | |
| download | frameworks_base-a253734423f1c998349f90a106acc613365e1844.zip frameworks_base-a253734423f1c998349f90a106acc613365e1844.tar.gz frameworks_base-a253734423f1c998349f90a106acc613365e1844.tar.bz2 | |
frameworks/base: Add support for QCELP/EVRC non-tunnel encoding in SF
Add support for QCELP and EVRC formats non-tunnel mode encoding
in StageFright using hardware accelerated encoders.
Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix ifdef derp.
Patchset 3: Fix endif derp, change omx-core include to vendor/qcom.
Conflicts:
media/libstagefright/Android.mk
media/libstagefright/OMXCodec.cpp
Change-Id: I179030d71a9598ddddcf754e963fbed1e1357024
Signed-off-by: Evan McClain <aeroevan@gmail.com>
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b7ad1d6..7b79054 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10851,9 +10851,13 @@ package android.media { public final class MediaRecorder.AudioEncoder { field public static final int AAC = 3; // 0x3 + field public static final int AAC_PLUS = 4; // 0x4 field public static final int AMR_NB = 1; // 0x1 field public static final int AMR_WB = 2; // 0x2 field public static final int DEFAULT = 0; // 0x0 + field public static final int EAAC_PLUS = 5; // 0x5 + field public static final int EVRC = 6; // 0x6 + field public static final int QCELP = 7; // 0x7 } public final class MediaRecorder.AudioSource { @@ -10880,8 +10884,10 @@ package android.media { field public static final int AMR_WB = 4; // 0x4 field public static final int DEFAULT = 0; // 0x0 field public static final int MPEG_4 = 2; // 0x2 + field public static final int QCP = 9; // 0x9 field public static final int RAW_AMR = 3; // 0x3 field public static final int THREE_GPP = 1; // 0x1 + field public static final int THREE_GPP2 = 10; // 0xa } public final class MediaRecorder.VideoEncoder { |