diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-09-29 18:32:24 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-29 18:32:24 -0700 |
| commit | 0a537b78d3fb4db86411d745b2696459d6b98ef6 (patch) | |
| tree | a53f6729d19ac5bb3e412b531acabed506255407 /voip/java | |
| parent | 2365b78e64feaa9527efb15bf4ac207a837f2b45 (diff) | |
| parent | f88fc1fa907f720df4a3e915509e688e9e4cf1f8 (diff) | |
| download | frameworks_base-0a537b78d3fb4db86411d745b2696459d6b98ef6.zip frameworks_base-0a537b78d3fb4db86411d745b2696459d6b98ef6.tar.gz frameworks_base-0a537b78d3fb4db86411d745b2696459d6b98ef6.tar.bz2 | |
Merge "RTP: Enable AMR codec." into gingerbread
Diffstat (limited to 'voip/java')
| -rw-r--r-- | voip/java/android/net/rtp/AudioCodec.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/voip/java/android/net/rtp/AudioCodec.java b/voip/java/android/net/rtp/AudioCodec.java index f171806..3877aeb 100644 --- a/voip/java/android/net/rtp/AudioCodec.java +++ b/voip/java/android/net/rtp/AudioCodec.java @@ -80,8 +80,7 @@ public class AudioCodec { */ public static final AudioCodec AMR = new AudioCodec(97, "AMR/8000", null); - // TODO: add rest of the codecs when the native part is done. - private static final AudioCodec[] sCodecs = {GSM_EFR, GSM, PCMU, PCMA}; + private static final AudioCodec[] sCodecs = {GSM_EFR, AMR, GSM, PCMU, PCMA}; private AudioCodec(int type, String rtpmap, String fmtp) { this.type = type; |