diff options
author | Andreas Huber <andih@google.com> | 2010-08-05 11:46:04 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 11:46:04 -0700 |
commit | 982a93173bc84f005172152d823cbb59dfcbeb12 (patch) | |
tree | 2ef94049c4daadc6b4da5a3d6c93c04d99d08d05 /media/libmediaplayerservice/StagefrightRecorder.h | |
parent | aa68b49a53a874a1813e65752663f19d18149e2c (diff) | |
parent | 347d3c1dabd7ae9c998a024c685de2001e0ff369 (diff) | |
download | frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.zip frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.tar.gz frameworks_av-982a93173bc84f005172152d823cbb59dfcbeb12.tar.bz2 |
am 1f513d88: 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 '1f513d8821670a33d6361ea521b6756163a3f9bf'
* commit '1f513d8821670a33d6361ea521b6756163a3f9bf':
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/libmediaplayerservice/StagefrightRecorder.h')
-rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h index 03f0b61..a8be27d 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.h +++ b/media/libmediaplayerservice/StagefrightRecorder.h @@ -105,10 +105,11 @@ private: status_t startMPEG4Recording(); status_t startAMRRecording(); status_t startAACRecording(); + status_t startRTPRecording(); sp<MediaSource> createAudioSource(); status_t setupCameraSource(); status_t setupAudioEncoder(const sp<MediaWriter>& writer); - status_t setupVideoEncoder(const sp<MediaWriter>& writer); + status_t setupVideoEncoder(sp<MediaSource> *source); // Encoding parameter handling utilities status_t setParameter(const String8 &key, const String8 &value); |