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

Commit 0ff81c1a authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Michael W
Browse files

libstagefright_wfd: libmediaplayer2: 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>
parent dd1b374c

media/libmedia/Android.bp

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

        "libmediaextractor",

        "libgui",

        "libui",

        "libdl",

        "libaudioutils",

        "libaudioclient",

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

+0 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,6 @@ sp<ABuffer> NuPlayer2::GenericSource2::mediaBufferToABuffer( 
        // If ref>0, there must be an observer, or it'll crash at release().

        // TODO: MediaBuffer might need to be revised to ease such need.

        mb->setObserver(this);

        // setMediaBufferBase() interestingly doesn't increment the ref count on its own.

        // Extra increment (since we want to keep mb alive and attached to ab beyond this function

        // call. This is to counter the effect of mb->release() towards the end.

        mb->add_ref();

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

+1 −1
Original line number Diff line number Diff line
@@ -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/wifi-display/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ cc_library_shared { 
        "libcutils",

        "liblog",

        "libmedia",

        "libmedia_omx",

        "libmediaextractor",

        "libstagefright",

        "libstagefright_foundation",

        "libui",