diff options
| author | James Dong <jdong@google.com> | 2012-02-03 11:09:48 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-02-03 11:11:36 -0800 |
| commit | 8c31ae07a170746f408445b1c23937f14c19ec51 (patch) | |
| tree | bb6061b59d1d427473316bf4dc321e4ea56bf257 /libvideoeditor | |
| parent | a789d6c0560d85fca51ba7d806527212aa6337c9 (diff) | |
| download | frameworks_av-8c31ae07a170746f408445b1c23937f14c19ec51.zip frameworks_av-8c31ae07a170746f408445b1c23937f14c19ec51.tar.gz frameworks_av-8c31ae07a170746f408445b1c23937f14c19ec51.tar.bz2 | |
Use AACEncoder instead of OMX-based AAC software encoder to workaround issues in the video editor engine
o related-to-bug: 5947347
Change-Id: I8eae8166e87e5809e2f3699f760f3a3e57895b4f
Diffstat (limited to 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp index 631177b..6526651 100755 --- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp +++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp @@ -443,9 +443,16 @@ M4OSA_ERR VideoEditorAudioEncoder_open(M4OSA_Context pContext, #ifdef VIDEOEDITOR_FORCECODEC codecFlags |= OMXCodec::VIDEOEDITOR_FORCECODEC; #endif /* VIDEOEDITOR_FORCECODEC */ + // FIXME: + // We are moving away to use software AACEncoder and instead use OMX-based + // software AAC audio encoder. We want to use AACEncoder for now. After we + // fix the interface issue with the OMX-based AAC audio encoder, we should + // then set the component name back to NULL to allow the system to pick up + // the right AAC audio encoder. pEncoderContext->mEncoder = OMXCodec::Create( - pEncoderContext->mClient.interface(), encoderMetadata, true, - pEncoderContext->mEncoderSource, NULL, codecFlags); + pEncoderContext->mClient.interface(), encoderMetadata, true, + pEncoderContext->mEncoderSource, "AACEncoder" /* component name */, + codecFlags); VIDEOEDITOR_CHECK(NULL != pEncoderContext->mEncoder.get(), M4ERR_STATE); // Start the graph |