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

Commit a447bc78 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "NuPlayer: Add support for QTI FLAC solution""

parents a4be615d c80e2f54

media/libmediaplayerservice/nuplayer/Android.mk

+0 −9
Original line number Diff line number Diff line
@@ -22,15 +22,6 @@ LOCAL_C_INCLUDES := \ 
	$(TOP)/frameworks/av/media/libmediaplayerservice              \

	$(TOP)/frameworks/native/include/media/openmax



#QTI FLAC Decoder

ifeq ($(call is-vendor-board-platform,QCOM),true)

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER)),true)

LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/audio-flac

LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio

LOCAL_CFLAGS := -DQTI_FLAC_DECODER

endif

endif



LOCAL_MODULE:= libstagefright_nuplayer



LOCAL_MODULE_TAGS := eng

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+0 −8
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
#include "../../libstagefright/include/NuCachedSource2.h"

#include "../../libstagefright/include/WVMExtractor.h"

#include "../../libstagefright/include/HTTPBase.h"

#ifdef QTI_FLAC_DECODER

#include "../../libstagefright/include/FLACDecoder.h"

#endif



namespace android {
@@ -188,11 +185,6 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 
                mAudioTrack.mPackets =

                    new AnotherPacketSource(mAudioTrack.mSource->getFormat());



#ifdef QTI_FLAC_DECODER

                if (!strncasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC, 10)) {

                     mAudioTrack.mSource = new FLACDecoder(track);

                }

#endif

                if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_VORBIS)) {

                    mAudioIsVorbis = true;

                } else {