diff options
| -rw-r--r-- | media/libmediaplayerservice/Android.mk | 9 | ||||
| -rwxr-xr-x | media/libstagefright/Android.mk | 5 | ||||
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 4 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 5 |
4 files changed, 16 insertions, 7 deletions
diff --git a/media/libmediaplayerservice/Android.mk b/media/libmediaplayerservice/Android.mk index d978e90..1683db2 100644 --- a/media/libmediaplayerservice/Android.mk +++ b/media/libmediaplayerservice/Android.mk @@ -53,8 +53,13 @@ LOCAL_C_INCLUDES := \ $(TOP)/external/tremolo/Tremolo ifeq ($(BOARD_USES_QCOM_HARDWARE),true) -LOCAL_C_INCLUDES += \ - $(TOP)/hardware/qcom/media/mm-core/inc + ifeq ($(TARGET_QCOM_MEDIA_VARIANT),caf) + LOCAL_C_INCLUDES += \ + $(TOP)/hardware/qcom/media-caf/mm-core/inc + else + LOCAL_C_INCLUDES += \ + $(TOP)/hardware/qcom/media/mm-core/inc + endif endif LOCAL_MODULE:= libmediaplayerservice diff --git a/media/libstagefright/Android.mk b/media/libstagefright/Android.mk index 766cf5e..a859e4a 100755 --- a/media/libstagefright/Android.mk +++ b/media/libstagefright/Android.mk @@ -95,8 +95,13 @@ LOCAL_SRC_FILES += \ ExtendedExtractor.cpp \ QCUtilityClass.cpp +ifeq ($(TARGET_QCOM_MEDIA_VARIANT),caf) +LOCAL_C_INCLUDES += \ + $(TOP)/hardware/qcom/media-caf/mm-core/inc +else LOCAL_C_INCLUDES += \ $(TOP)/hardware/qcom/media/mm-core/inc +endif ifeq ($(TARGET_QCOM_AUDIO_VARIANT),caf) ifeq ($(call is-board-platform-in-list,msm8660 msm7x27a msm7x30),true) diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index efb5f26..91ba093 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -5432,7 +5432,11 @@ status_t QueryCodec( // Color format query OMX_VIDEO_PARAM_PORTFORMATTYPE portFormat; InitOMXParams(&portFormat); +#ifdef OMAP_ENHANCEMENT + portFormat.nPortIndex = !isEncoder ? 0 : 1; +#else portFormat.nPortIndex = !isEncoder ? 1 : 0; +#endif for (OMX_U32 index = 0;;index++) { portFormat.nIndex = index; err = omx->getParameter( diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 0c3cb14..228dbfc 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -6531,7 +6531,6 @@ int64_t AudioFlinger::DirectAudioTrack::getTimeStamp() { } void AudioFlinger::DirectAudioTrack::postEOS(int64_t delayUs) { -#ifdef QCOM_HARDWARE if (delayUs == 0 ) { ALOGV("Notify Audio Track of EOS event"); mClient->notify(DIRECT_TRACK_EOS); @@ -6539,10 +6538,6 @@ void AudioFlinger::DirectAudioTrack::postEOS(int64_t delayUs) { ALOGV("Notify Audio Track of hardware failure event"); mClient->notify(DIRECT_TRACK_HW_FAIL); } -#else - ALOGV("Notify Audio Track of EOS event"); - mClient->notify(DIRECT_TRACK_EOS); -#endif } void AudioFlinger::DirectAudioTrack::allocateBufPool() { |