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

Commit ac7d4125 authored by Pawin Vongmasa's avatar Pawin Vongmasa
Browse files

Use tokens for IOmxNode. 

Test: Mirroring, Camera, Photos, YouTube and Play Movies apps.
Bug: 35442034
Change-Id: I0e43ec57d0f37c71d41652fd9883b72650433e20
parent 881fc5c6

cmds/stagefright/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ 
        libjpeg libgui libcutils liblog \

        libhidlmemory \

        android.hardware.media.omx@1.0 \

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



LOCAL_C_INCLUDES:= \

        frameworks/av/media/libstagefright \

cmds/stagefright/stagefright.cpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
#include <gui/SurfaceComposerClient.h>



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

#include <omx/hal/1.0/utils/WOmx.h>

#include <media/omx/1.0/WOmx.h>



using namespace android;

media/libstagefright/omx/hal/1.0/utils/Conversion.h→include/media/omx/1.0/Conversion.h

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ 
#include <binder/Binder.h>

#include <binder/Status.h>

#include <ui/FenceTime.h>

#include <media/OMXFenceParcelable.h>

#include <cutils/native_handle.h>

#include <gui/IGraphicBufferProducer.h>



#include <media/OMXFenceParcelable.h>

#include <media/OMXBuffer.h>

#include <VideoAPI.h>

#include <media/hardware/VideoAPI.h>



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

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

media/libstagefright/omx/hal/1.0/utils/WGraphicBufferSource.h→include/media/omx/1.0/WGraphicBufferSource.h

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>



#include <media/IOMX.h>

#include <binder/Binder.h>

#include <media/IOMX.h>



#include <android/hardware/graphics/common/1.0/types.h>

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

media/libstagefright/omx/hal/1.0/utils/WOmx.h→include/media/omx/1.0/WOmx.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <hidl/MQDescriptor.h>

#include <hidl/Status.h>



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

#include <media/IOMX.h>



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