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

Commit 0d3a5edf authored by Pawin Vongmasa's avatar Pawin Vongmasa
Browse files

Remove the dependency on passthrough IOmx in media.codec. 

Also clean up some other dependencies.

Test: Manual testing with Camera, YouTube and Play Movies apps.
Bug: 35445903
Change-Id: I28562b5fbcc7054cf45c4ec2530bbe2ab4b5645f
parent 92a4bab4

cmds/stagefright/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -10,8 +10,9 @@ LOCAL_SRC_FILES:= \ 
LOCAL_SHARED_LIBRARIES := \

        libstagefright libmedia libutils libbinder libstagefright_foundation \

        libjpeg libgui libcutils liblog \

        libhidlmemory \

        android.hardware.media.omx@1.0 \

        android.hardware.media.omx@1.0-utils

        android.hardware.media.omx@1.0-utils \



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

media/libstagefright/omx/hal/1.0/impl/Android.mk

+4 −7
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ LOCAL_PATH := $(call my-dir) 


include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.media.omx@1.0-impl

LOCAL_MODULE_RELATIVE_PATH := hw

LOCAL_SRC_FILES := \

    WGraphicBufferSource.cpp \

    WOmx.cpp \
@@ -34,12 +33,10 @@ LOCAL_SHARED_LIBRARIES := \ 
    android.hidl.base@1.0 \



LOCAL_C_INCLUDES += \

        $(TOP) \

        $(TOP)/frameworks/av/include/media \

        $(TOP)/frameworks/av/media/libstagefright/include \

        $(TOP)/frameworks/av/media/libstagefright/omx \

        $(TOP)/frameworks/native/include/media/hardware \

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

        $(TOP)/frameworks/av/include \

        $(TOP)/frameworks/av/media/libstagefright \

        $(TOP)/frameworks/native/include \

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

        $(TOP)/frameworks/native/include/media/hardware \



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/omx/hal/1.0/impl/Conversion.h

+11 −11
Original line number Diff line number Diff line
@@ -17,29 +17,26 @@ 
#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0__CONVERSION_H

#define ANDROID_HARDWARE_MEDIA_OMX_V1_0__CONVERSION_H



#include <vector>

#include <list>



#include <unistd.h>



#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>

#include <hidlmemory/mapping.h>

#include <android/hidl/memory/1.0/IMemory.h>



#include <unistd.h>

#include <vector>

#include <list>



#include <binder/Binder.h>

#include <binder/Status.h>

#include <ui/FenceTime.h>



#include <OMXFenceParcelable.h>

#include <media/OMXFenceParcelable.h>

#include <cutils/native_handle.h>

#include <gui/IGraphicBufferProducer.h>



#include <IOMX.h>

#include <media/OMXBuffer.h>

#include <VideoAPI.h>

#include <OMXBuffer.h>

#include <android/IOMXBufferSource.h>

#include <android/IGraphicBufferSource.h>



#include <android/hidl/memory/1.0/IMemory.h>

#include <android/hardware/media/omx/1.0/types.h>

#include <android/hardware/media/omx/1.0/IOmx.h>

#include <android/hardware/media/omx/1.0/IOmxNode.h>
@@ -49,6 +46,9 @@ 
#include <android/hardware/media/omx/1.0/IOmxProducerListener.h>

#include <android/hardware/media/omx/1.0/IGraphicBufferSource.h>



#include <android/IGraphicBufferSource.h>

#include <android/IOMXBufferSource.h>



namespace android {

namespace hardware {

namespace media {

media/libstagefright/omx/hal/1.0/impl/Omx.cpp

+7 −7
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ 


#include <list>



#include "Omx.h"

#include <IOMX.h>

#include <OMXMaster.h>

#include <OMXNodeInstance.h>

#include <GraphicBufferSource.h>

#include <gui/IGraphicBufferProducer.h>



#include <OMX_Core.h>

#include <OMX_AsString.h>

#include <OMXUtils.h>



#include "../../../OMXUtils.h"

#include "../../../OMXMaster.h"

#include "../../../GraphicBufferSource.h"



#include "WOmxNode.h"

#include "WOmxObserver.h"
@@ -32,6 +30,8 @@ 
#include "WGraphicBufferSource.h"

#include "Conversion.h"



#include "Omx.h"



namespace android {

namespace hardware {

namespace media {

media/libstagefright/omx/hal/1.0/impl/Omx.h

+3 −4
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 
#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0_OMX_H

#define ANDROID_HARDWARE_MEDIA_OMX_V1_0_OMX_H



#include <android/hardware/media/omx/1.0/IOmx.h>

#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>



#include <utils/threads.h>

#include <utils/KeyedVector.h>

#include <OmxNodeOwner.h>

#include "../../../../include/OMXNodeInstance.h"



#include <android/hardware/media/omx/1.0/IOmx.h>



namespace android {