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

Commit 4a0ec3fd authored by Andreas Huber's avatar Andreas Huber
Browse files

Initial checkin of software AVC video decoder based on PV source code.

parent f2f68760

media/libstagefright/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -56,10 +56,14 @@ ifeq ($(BUILD_WITH_FULL_STAGEFRIGHT),true) 
LOCAL_STATIC_LIBRARIES := \

        libstagefright_aacdec \

        libstagefright_amrnbdec \

        libstagefright_amrnb_common \

        libstagefright_amrwbdec \

        libstagefright_avcdec \

        libstagefright_mp3dec



LOCAL_SHARED_LIBRARIES += \

        libstagefright_amrnb_common \

        libstagefright_avc_common



endif



ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

media/libstagefright/OMXCodec.cpp

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "include/AACDecoder.h"

#include "include/AMRNBDecoder.h"

#include "include/AMRWBDecoder.h"

#include "include/AVCDecoder.h"

#include "include/MP3Decoder.h"

#endif
@@ -300,6 +301,9 @@ sp<MediaSource> OMXCodec::Create( 
        return new AMRWBDecoder(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) {

        return new MP3Decoder(source);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_VIDEO_AVC)

                && (flags & kPreferSoftwareCodecs)) {

        return new AVCDecoder(source);

    }

#endif

media/libstagefright/codecs/aacdec/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -149,10 +149,6 @@ LOCAL_CFLAGS := -DAAC_PLUS -DHQ_SBR -DPARAMETRICSTEREO -DOSCL_IMPORT_REF= -DOSCL 


LOCAL_C_INCLUDES := frameworks/base/media/libstagefright/include



LOCAL_SHARED_LIBRARIES := \

        libstagefright \

        libutils



LOCAL_MODULE := libstagefright_aacdec



include $(BUILD_STATIC_LIBRARY)

media/libstagefright/codecs/amrnb/common/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS := \

        -DOSCL_UNUSED_ARG= -DOSCL_IMPORT_REF= -DOSCL_EXPORT_REF=



LOCAL_PRELINK_MODULE:= false



LOCAL_MODULE := libstagefright_amrnb_common



include $(BUILD_STATIC_LIBRARY)
 
include $(BUILD_SHARED_LIBRARY)

media/libstagefright/codecs/amrnb/dec/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -49,10 +49,6 @@ LOCAL_C_INCLUDES := \ 
LOCAL_CFLAGS := \

        -DOSCL_UNUSED_ARG= -DOSCL_IMPORT_REF=



LOCAL_SHARED_LIBRARIES := \

        libstagefright \

        libutils



LOCAL_MODULE := libstagefright_amrnbdec



include $(BUILD_STATIC_LIBRARY)