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

Unverified Commit f9f0caa0 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Michael Bestas
Browse files

libstagefright_wfd: compilation fixes 



* Among others, adapt to the ABuffer API changes in
  "f03606d9 Move MediaBufferXXX from foundation to libmediaextractor"

Change-Id: Ie92fc035c6430f1458d45995a5b2627d0bc75122
Signed-off-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarDennySPb <dennyspb@gmail.com>

libstagefright_wfd: Adapt to A11 changes

Change-Id: I69f13c93a68b1ad60e085000361331a3fdc98049
Signed-off-by: default avatarDennySPb <dennyspb@gmail.com>

libstagefright: Remove libmediaextractor dependency

Change-Id: Ifb564aafcf6f9bd45010500a589050b6577c0f7a
Signed-off-by: default avatarDennySPb <dennyspb@gmail.com>

Remove libmediaextractor dependency from libstagefright_wfd

Change-Id: I3d417d2f2ce468eb9d45f55f7818bb9a46348667
Signed-off-by: default avatarDennySPb <dennyspb@gmail.com>

libstagefright_wfd: Log MediaExtractor entry point to MediaMetrics

Change-Id: Ic8fac2cd5ee4d3bb59804e69efc1d5c482aa2417

Change-Id: Ie92fc035c6430f1458d45995a5b2627d0bc75122
parent 7dccd35f

media/libmedia/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -375,6 +375,7 @@ cc_library { 
        "libcamera_client",

        "libstagefright_foundation",

        "libgui",

        "libui",

        "libdl",

        "libaudioclient",

        "libmedia_codeclist",

media/libmedia/IHDCP.cpp

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct BpHDCPObserver : public BpInterface<IHDCPObserver> { 
    }

};



IMPLEMENT_META_INTERFACE(HDCPObserver, "android.hardware.IHDCPObserver");

DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(HDCPObserver, "android.hardware.IHDCPObserver");



struct BpHDCP : public BpInterface<IHDCP> {

    explicit BpHDCP(const sp<IBinder> &impl)
@@ -166,7 +166,7 @@ struct BpHDCP : public BpInterface<IHDCP> { 
    }

};



IMPLEMENT_META_INTERFACE(HDCP, "android.hardware.IHDCP");

DO_NOT_DIRECTLY_USE_ME_IMPLEMENT_META_INTERFACE(HDCP, "android.hardware.IHDCP");



status_t BnHDCPObserver::onTransact(

        uint32_t code, const Parcel &data, Parcel *reply, uint32_t flags) {

media/libstagefright/SurfaceMediaSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ status_t SurfaceMediaSource::stop() 


#if DEBUG_PENDING_BUFFERS

        for (size_t i = 0; i < mPendingBuffers.size(); ++i) {

            ALOGI("%d: %p", i, mPendingBuffers.itemAt(i));

            ALOGI("%zu: %p", i, mPendingBuffers.itemAt(i));

        }

#endif
@@ -355,7 +355,7 @@ status_t SurfaceMediaSource::read( 


    (*buffer)->setObserver(this);

    (*buffer)->add_ref();

    (*buffer)->meta_data()->setInt64(kKeyTime, mCurrentTimestamp / 1000);

    (*buffer)->meta_data().setInt64(kKeyTime, mCurrentTimestamp / 1000);

    ALOGV("Frames encoded = %d, timestamp = %" PRId64 ", time diff = %" PRId64,

            mNumFramesEncoded, mCurrentTimestamp / 1000,

            mCurrentTimestamp / 1000 - prevTimeStamp / 1000);

media/libstagefright/include/media/stagefright/SurfaceMediaSource.h

+3 −3
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ 


#include <utils/threads.h>

#include <utils/Vector.h>

#include <media/MediaSource.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MediaBuffer.h>



#include <media/hardware/MetadataBufferType.h>



#include "foundation/ABase.h"

#include <media/stagefright/foundation/ABase.h>



namespace android {

// ----------------------------------------------------------------------------
@@ -187,7 +187,7 @@ private: 
    size_t mNumPendingBuffers;



#if DEBUG_PENDING_BUFFERS

    Vector<MediaBuffer *> mPendingBuffers;

    Vector<MediaBufferBase *> mPendingBuffers;

#endif



    // mCurrentTimestamp is the timestamp for the current texture. It

media/libstagefright/tests/DummyRecorder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define LOG_TAG "DummyRecorder"

// #define LOG_NDEBUG 0



#include <media/MediaSource.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MediaBuffer.h>

#include "DummyRecorder.h"