Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b62d78bd authored by Dheeraj Sharma's avatar Dheeraj Sharma
Browse files

Modification for using Software decoder for thumbnail generation in JNI 

Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
parent 0d47ac11

media/jni/mediaeditor/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

media/jni/mediaeditor/VideoBrowserMain.c

+15 −5
Original line number Diff line number Diff line
@@ -246,9 +246,13 @@ M4OSA_ERR videoBrowserCreate( 
                    pContext->m_pCodecLoaderContext = M4OSA_NULL;

                    decoderType = M4DECODER_kVideoTypeMPEG4;



#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;



#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(