diff options
| author | Andreas Huber <andih@google.com> | 2010-08-04 14:15:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-04 14:15:23 -0700 |
| commit | 1f513d8821670a33d6361ea521b6756163a3f9bf (patch) | |
| tree | adb82131ff0630ac76a8d0c62f1140bc81bd7c60 /media/java | |
| parent | 1cd6340a72d81c81630d6374ed46211497520897 (diff) | |
| parent | c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444 (diff) | |
| download | frameworks_base-1f513d8821670a33d6361ea521b6756163a3f9bf.zip frameworks_base-1f513d8821670a33d6361ea521b6756163a3f9bf.tar.gz frameworks_base-1f513d8821670a33d6361ea521b6756163a3f9bf.tar.bz2 | |
am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread
Merge commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444' into gingerbread-plus-aosp
* commit 'c17f35dd927570c5c8d0c00b25a5bfaa1d4f1444':
Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 47a8cfc..34a86ec 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -188,6 +188,9 @@ public class MediaRecorder public static final int AAC_ADIF = 5; /** @hide AAC ADTS file format */ public static final int AAC_ADTS = 6; + + /** @hide Stream over a socket, limited to a single stream */ + public static final int OUTPUT_FORMAT_RTP_AVP = 7; }; /** |