From 8c31ae07a170746f408445b1c23937f14c19ec51 Mon Sep 17 00:00:00 2001 From: James Dong Date: Fri, 3 Feb 2012 11:09:48 -0800 Subject: 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 --- .../vss/stagefrightshells/src/VideoEditorAudioEncoder.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'libvideoeditor') 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 -- cgit v1.1