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

Commit dd68a083 authored by Ashish Jain's avatar Ashish Jain Committed by Haynes Mathew George
Browse files

frameworks/av: Compilation fixes for DS2 

Compilation fixes for DS2.

CRs-Fixed: 761339
Change-Id: I12e12e36a376aeef1b44223f8d05593ebd6c2f6f
parent 1b243e0c

media/libstagefright/MPEG4Extractor.cpp

+2 −0
Original line number Diff line number Diff line
@@ -1787,7 +1787,9 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) { 


        case FOURCC('d', 'd', 't', 's'):

        case FOURCC('d', 'a', 'c', '3'):

#ifndef DOLBY_UDC

        case FOURCC('d', 'e', 'c', '3'):

#endif

        {

            //no information need to be passed here, just log and end

            ALOGV("ddts/dac3/dec3 pass from mpeg4 extractor");

media/libstagefright/MediaDefs.cpp

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ const char *MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; 
const char *MEDIA_MIMETYPE_TEXT_VTT = "text/vtt";

const char *MEDIA_MIMETYPE_TEXT_CEA_608 = "text/cea-608";

#ifdef DOLBY_UDC

const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

#endif // DOLBY_END

services/audioflinger/AudioFlinger.h

+14 −0
Original line number Diff line number Diff line
@@ -809,6 +809,20 @@ private: 
    uint32_t    mPrimaryOutputSampleRate;   // sample rate of the primary output, or zero if none

                                            // protected by mHardwareLock

#ifdef DOLBY_DAP

#ifdef DOLBY_DAP_FAST_API

     enum ds_profile {

         PROFILE_MOVIE = 0x0,

         PROFILE_MUSIC,

         PROFILE_GAME,

         PROFILE_VOICE,

         PROFILE_CUSTOM_1,

         PROFILE_CUSTOM_2

     };

     status_t    setDsProfile(ds_profile profileId);

     status_t    setDsEnabled(bool enabled);

     status_t    setDsProfile_l(ds_profile profileId);

    status_t    setDsEnabled_l(bool enabled);

#endif

#include "EffectDapController.h"

#endif // DOLBY_END

};

services/audioflinger/Effects.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1619,6 +1619,7 @@ status_t AudioFlinger::EffectChain::addEffect_l(const sp<EffectModule>& effect) 
#else // DOLBY_END

    effect->configure();

    return NO_ERROR;

#endif

}



// removeEffect_l() must be called with PlaybackThread::mLock held