drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modification for using Software decoder for thumbnail generation in JNI

Browse Source 
Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
This commit is contained in:
Dheeraj Sharma
2011-02-03 21:22:13 -08:00
parent 0d47ac1176
commit b62d78bd0d
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/jni/mediaeditor/Android.mk
View File

@ -66,7 +66,8 @@ LOCAL_CFLAGS += \
-DUSE_STAGEFRIGHT_AUDIOENC \
-DUSE_STAGEFRIGHT_VIDEOENC \
-DUSE_STAGEFRIGHT_READERS \
-DUSE_STAGEFRIGHT_3GPP_READER
-DUSE_STAGEFRIGHT_3GPP_READER \
-DUSE_SOFTWARE_DECODER
LOCAL_LDFLAGS += -fuse-ld=bfd

20
media/jni/mediaeditor/VideoBrowserMain.c
View File

@ -246,9 +246,13 @@ M4OSA_ERR videoBrowserCreate(
pContext->m_pCodecLoaderContext = M4OSA_NULL;
decoderType = M4DECODER_kVideoTypeMPEG4;
err = VideoEditorVideoDecoder_getInterface_MPEG4(
&decoderType, &pContext->m_pDecoder);
#ifdef USE_SOFTWARE_DECODER
err = VideoEditorVideoDecoder_getSoftwareInterface_MPEG4(
&decoderType, &pContext->m_pDecoder);
#else
err = VideoEditorVideoDecoder_getInterface_MPEG4(
&decoderType, &pContext->m_pDecoder);
#endif
CHECK_ERR(videoBrowserCreate, err) ;
err = pContext->m_pDecoder->m_pFctCreate(
@ -267,8 +271,14 @@ M4OSA_ERR videoBrowserCreate(
pContext->m_pCodecLoaderContext = M4OSA_NULL;
decoderType = M4DECODER_kVideoTypeAVC;
err = VideoEditorVideoDecoder_getInterface_H264(
&decoderType, &pContext->m_pDecoder);
#ifdef USE_SOFTWARE_DECODER
err = VideoEditorVideoDecoder_getSoftwareInterface_H264(
&decoderType, &pContext->m_pDecoder);
#else
err = VideoEditorVideoDecoder_getInterface_H264(
&decoderType, &pContext->m_pDecoder);
#endif
CHECK_ERR(videoBrowserCreate, err) ;
err = pContext->m_pDecoder->m_pFctCreate(