diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-30 12:45:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 12:45:27 -0700 |
| commit | 4c9cd95b27a638701be2ffa1713273ba2f624770 (patch) | |
| tree | c7f5f7820aa39c965706b7ea504d9b53f5147688 /media/libmediaplayerservice | |
| parent | 0c0abd4ad26971b5fba94734137fe0bb1a590ab6 (diff) | |
| parent | f60c660f048d5f5e2458cff243c20400d73757a7 (diff) | |
| download | frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.zip frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.tar.gz frameworks_av-4c9cd95b27a638701be2ffa1713273ba2f624770.tar.bz2 | |
Merge "Added support for HE-AAC recording" into jb-dev
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index b676cc7..727fd0d 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -820,10 +820,15 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() { mime = MEDIA_MIMETYPE_AUDIO_AAC; encMeta->setInt32(kKeyAACProfile, OMX_AUDIO_AACObjectLC); break; + case AUDIO_ENCODER_HE_AAC: + mime = MEDIA_MIMETYPE_AUDIO_AAC; + encMeta->setInt32(kKeyAACProfile, OMX_AUDIO_AACObjectHE); + break; case AUDIO_ENCODER_AAC_ELD: mime = MEDIA_MIMETYPE_AUDIO_AAC; encMeta->setInt32(kKeyAACProfile, OMX_AUDIO_AACObjectELD); break; + default: ALOGE("Unknown audio encoder: %d", mAudioEncoder); return NULL; @@ -844,7 +849,6 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() { OMXClient client; CHECK_EQ(client.connect(), (status_t)OK); - sp<MediaSource> audioEncoder = OMXCodec::Create(client.interface(), encMeta, true /* createEncoder */, audioSource); @@ -859,6 +863,7 @@ status_t StagefrightRecorder::startAACRecording() { CHECK_EQ(mOutputFormat, OUTPUT_FORMAT_AAC_ADTS); CHECK(mAudioEncoder == AUDIO_ENCODER_AAC || + mAudioEncoder == AUDIO_ENCODER_HE_AAC || mAudioEncoder == AUDIO_ENCODER_AAC_ELD); CHECK(mAudioSource != AUDIO_SOURCE_CNT); @@ -977,7 +982,9 @@ status_t StagefrightRecorder::startMPEG2TSRecording() { sp<MediaWriter> writer = new MPEG2TSWriter(mOutputFd); if (mAudioSource != AUDIO_SOURCE_CNT) { - if (mAudioEncoder != AUDIO_ENCODER_AAC) { + if (mAudioEncoder != AUDIO_ENCODER_AAC && + mAudioEncoder != AUDIO_ENCODER_HE_AAC && + mAudioEncoder != AUDIO_ENCODER_AAC_ELD) { return ERROR_UNSUPPORTED; } @@ -1442,6 +1449,7 @@ status_t StagefrightRecorder::setupAudioEncoder(const sp<MediaWriter>& writer) { case AUDIO_ENCODER_AMR_NB: case AUDIO_ENCODER_AMR_WB: case AUDIO_ENCODER_AAC: + case AUDIO_ENCODER_HE_AAC: case AUDIO_ENCODER_AAC_ELD: break; |