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

Commit defb1b0b authored by Mathias Agopian's avatar Mathias Agopian
Browse files

fix circular dependency libnativewindow <-> libui 

Bug: 37647680, 37648355
Test: compile, manual
Change-Id: I9cb8a1320d7c73299fb2b081a054eafb8ef086c8
parent f7e2da4c

camera/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ cc_library_shared { 
        "libbinder",

        "libgui",

        "libcamera_metadata",

        "libnativewindow",

    ],



    include_dirs: [

media/libmedia/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ cc_library { 
        "-Wall",

    ],

    shared: {

      shared_libs: ["libutils", "liblog"],

      shared_libs: ["libutils", "liblog", "libgui"],

    },

    clang: true,

}

media/libmedia/include/media/OMXBuffer.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


#include <cutils/native_handle.h>

#include <media/IOMX.h>

#include <system/window.h>

#include <utils/StrongPointer.h>

#include <hidl/HidlSupport.h>

media/libstagefright/MediaSync.cpp

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 


#include <ui/GraphicBuffer.h>



#include <system/window.h>



// Maximum late time allowed for a video frame to be rendered. When a video

// frame arrives later than this number, it will be discarded without rendering.

static const int64_t kMaxAllowedVideoLateTimeUs = 40000ll;

media/libstagefright/SimpleDecodingSource.cpp

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,12 @@ using namespace android; 
const int64_t kTimeoutWaitForOutputUs = 500000; // 0.5 seconds

const int64_t kTimeoutWaitForInputUs = 5000; // 5 milliseconds



//static

sp<SimpleDecodingSource> SimpleDecodingSource::Create(

        const sp<IMediaSource> &source, uint32_t flags) {

    return SimpleDecodingSource::Create(source, flags, nullptr, nullptr);

}



//static

sp<SimpleDecodingSource> SimpleDecodingSource::Create(

        const sp<IMediaSource> &source, uint32_t flags, const sp<ANativeWindow> &nativeWindow,