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

Commit 881fc5c6 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by Android (Google) Code Review
Browse files

Merge "Clone fence inside QueueBufferInput on retrieval."

parents 5a98d6e0 8b13a008

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

+12 −3
Original line number Original line Diff line number Diff line
@@ -1018,7 +1018,7 @@ inline status_t unflattenFence(hidl_handle* fence, native_handle_t** nh, 
        if (*nh == nullptr) {

        if (*nh == nullptr) {

            return NO_MEMORY;

            return NO_MEMORY;

        }

        }

        *fence = hidl_handle(*nh);

        *fence = *nh;

        ++fds;

        ++fds;

        --numFds;

        --numFds;

    } else {

    } else {
@@ -1264,6 +1264,7 @@ inline status_t unflatten( 
        return NO_MEMORY;

        return NO_MEMORY;

    }

    }





    *nh = nullptr;

    ::android::FenceTime::Snapshot::State state;

    ::android::FenceTime::Snapshot::State state;

    FlattenableUtils::read(buffer, size, state);

    FlattenableUtils::read(buffer, size, state);

    switch (state) {

    switch (state) {
@@ -1865,6 +1866,7 @@ inline size_t getFdCount( 
 * \brief Flatten `IOmxBufferProducer::QueueBufferInput`.

 * \brief Flatten `IOmxBufferProducer::QueueBufferInput`.

 *

 *

 * \param[in] t The source `IOmxBufferProducer::QueueBufferInput`.

 * \param[in] t The source `IOmxBufferProducer::QueueBufferInput`.

 * \param[out] nh The native handle cloned from `t.fence`.

 * \param[in,out] buffer The pointer to the flat non-fd buffer.

 * \param[in,out] buffer The pointer to the flat non-fd buffer.

 * \param[in,out] size The size of the flat non-fd buffer.

 * \param[in,out] size The size of the flat non-fd buffer.

 * \param[in,out] fds The pointer to the flat fd buffer.

 * \param[in,out] fds The pointer to the flat fd buffer.
@@ -1873,6 +1875,7 @@ inline size_t getFdCount( 
 *

 *

 * This function will duplicate the file descriptor in `t.fence`. */

 * This function will duplicate the file descriptor in `t.fence`. */

inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t,

inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t,

        native_handle_t** nh,

        void*& buffer, size_t& size, int*& fds, size_t& numFds) {

        void*& buffer, size_t& size, int*& fds, size_t& numFds) {

    if (size < getFlattenedSize(t)) {

    if (size < getFlattenedSize(t)) {

        return NO_MEMORY;

        return NO_MEMORY;
@@ -1892,7 +1895,9 @@ inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t, 
    FlattenableUtils::write(buffer, size, t.stickyTransform);

    FlattenableUtils::write(buffer, size, t.stickyTransform);

    FlattenableUtils::write(buffer, size, t.getFrameTimestamps);

    FlattenableUtils::write(buffer, size, t.getFrameTimestamps);





    status_t status = flattenFence(t.fence, buffer, size, fds, numFds);

    *nh = t.fence.getNativeHandle() == nullptr ?

            nullptr : native_handle_clone(t.fence);

    status_t status = flattenFence(hidl_handle(*nh), buffer, size, fds, numFds);

    if (status != NO_ERROR) {

    if (status != NO_ERROR) {

        return status;

        return status;

    }

    }
@@ -2034,7 +2039,8 @@ inline bool convertTo( 
    size_t size = baseSize;

    size_t size = baseSize;

    int* fds = baseFds.get();

    int* fds = baseFds.get();

    size_t numFds = baseNumFds;

    size_t numFds = baseNumFds;

    if (flatten(t, buffer, size, fds, numFds) != NO_ERROR) {

    native_handle_t* nh;

    if (flatten(t, &nh, buffer, size, fds, numFds) != NO_ERROR) {

        return false;

        return false;

    }

    }
@@ -2043,9 +2049,12 @@ inline bool convertTo( 
    int const* constFds = static_cast<int const*>(baseFds.get());

    int const* constFds = static_cast<int const*>(baseFds.get());

    numFds = baseNumFds;

    numFds = baseNumFds;

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

        native_handle_close(nh);

        native_handle_delete(nh);

        return false;

        return false;

    }

    }





    native_handle_delete(nh);

    return true;

    return true;

}

}

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

+12 −3
Original line number Original line Diff line number Diff line
@@ -1018,7 +1018,7 @@ inline status_t unflattenFence(hidl_handle* fence, native_handle_t** nh, 
        if (*nh == nullptr) {

        if (*nh == nullptr) {

            return NO_MEMORY;

            return NO_MEMORY;

        }

        }

        *fence = hidl_handle(*nh);

        *fence = *nh;

        ++fds;

        ++fds;

        --numFds;

        --numFds;

    } else {

    } else {
@@ -1264,6 +1264,7 @@ inline status_t unflatten( 
        return NO_MEMORY;

        return NO_MEMORY;

    }

    }





    *nh = nullptr;

    ::android::FenceTime::Snapshot::State state;

    ::android::FenceTime::Snapshot::State state;

    FlattenableUtils::read(buffer, size, state);

    FlattenableUtils::read(buffer, size, state);

    switch (state) {

    switch (state) {
@@ -1865,6 +1866,7 @@ inline size_t getFdCount( 
 * \brief Flatten `IOmxBufferProducer::QueueBufferInput`.

 * \brief Flatten `IOmxBufferProducer::QueueBufferInput`.

 *

 *

 * \param[in] t The source `IOmxBufferProducer::QueueBufferInput`.

 * \param[in] t The source `IOmxBufferProducer::QueueBufferInput`.

 * \param[out] nh The native handle cloned from `t.fence`.

 * \param[in,out] buffer The pointer to the flat non-fd buffer.

 * \param[in,out] buffer The pointer to the flat non-fd buffer.

 * \param[in,out] size The size of the flat non-fd buffer.

 * \param[in,out] size The size of the flat non-fd buffer.

 * \param[in,out] fds The pointer to the flat fd buffer.

 * \param[in,out] fds The pointer to the flat fd buffer.
@@ -1873,6 +1875,7 @@ inline size_t getFdCount( 
 *

 *

 * This function will duplicate the file descriptor in `t.fence`. */

 * This function will duplicate the file descriptor in `t.fence`. */

inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t,

inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t,

        native_handle_t** nh,

        void*& buffer, size_t& size, int*& fds, size_t& numFds) {

        void*& buffer, size_t& size, int*& fds, size_t& numFds) {

    if (size < getFlattenedSize(t)) {

    if (size < getFlattenedSize(t)) {

        return NO_MEMORY;

        return NO_MEMORY;
@@ -1892,7 +1895,9 @@ inline status_t flatten(IOmxBufferProducer::QueueBufferInput const& t, 
    FlattenableUtils::write(buffer, size, t.stickyTransform);

    FlattenableUtils::write(buffer, size, t.stickyTransform);

    FlattenableUtils::write(buffer, size, t.getFrameTimestamps);

    FlattenableUtils::write(buffer, size, t.getFrameTimestamps);





    status_t status = flattenFence(t.fence, buffer, size, fds, numFds);

    *nh = t.fence.getNativeHandle() == nullptr ?

            nullptr : native_handle_clone(t.fence);

    status_t status = flattenFence(hidl_handle(*nh), buffer, size, fds, numFds);

    if (status != NO_ERROR) {

    if (status != NO_ERROR) {

        return status;

        return status;

    }

    }
@@ -2034,7 +2039,8 @@ inline bool convertTo( 
    size_t size = baseSize;

    size_t size = baseSize;

    int* fds = baseFds.get();

    int* fds = baseFds.get();

    size_t numFds = baseNumFds;

    size_t numFds = baseNumFds;

    if (flatten(t, buffer, size, fds, numFds) != NO_ERROR) {

    native_handle_t* nh;

    if (flatten(t, &nh, buffer, size, fds, numFds) != NO_ERROR) {

        return false;

        return false;

    }

    }
@@ -2043,9 +2049,12 @@ inline bool convertTo( 
    int const* constFds = static_cast<int const*>(baseFds.get());

    int const* constFds = static_cast<int const*>(baseFds.get());

    numFds = baseNumFds;

    numFds = baseNumFds;

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

    if (l->unflatten(constBuffer, size, constFds, numFds) != NO_ERROR) {

        native_handle_close(nh);

        native_handle_delete(nh);

        return false;

        return false;

    }

    }





    native_handle_delete(nh);

    return true;

    return true;

}

}