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

Commit b5adce51 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "bufferpool2.0: change invalidation FMQ to unsync"

parents 8f8fbb09 ae729465

media/bufferpool/2.0/Accessor.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ Return<void> Accessor::connect(connect_cb _hidl_cb) { 
    ResultStatus status = connect(&connection, &connectionId, &fmqDesc, false);

    ResultStatus status = connect(&connection, &connectionId, &fmqDesc, false);

    if (status == ResultStatus::OK) {

    if (status == ResultStatus::OK) {

        _hidl_cb(status, connection, connectionId, *fmqDesc,

        _hidl_cb(status, connection, connectionId, *fmqDesc,

                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(

                 android::hardware::MQDescriptorUnsync<BufferInvalidationMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */));

                         nullptr /* nhandle */, 0 /* size */));

    } else {

    } else {
@@ -130,7 +130,7 @@ Return<void> Accessor::connect(connect_cb _hidl_cb) { 
                 android::hardware::MQDescriptorSync<BufferStatusMessage>(

                 android::hardware::MQDescriptorSync<BufferStatusMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */),

                         nullptr /* nhandle */, 0 /* size */),

                 android::hardware::MQDescriptorSync<BufferInvalidationMessage>(

                 android::hardware::MQDescriptorUnsync<BufferInvalidationMessage>(

                         std::vector<android::hardware::GrantorDescriptor>(),

                         std::vector<android::hardware::GrantorDescriptor>(),

                         nullptr /* nhandle */, 0 /* size */));

                         nullptr /* nhandle */, 0 /* size */));

    }

    }

media/bufferpool/2.0/include/bufferpool/BufferPoolTypes.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ namespace V2_0 { 
namespace implementation {

namespace implementation {





using ::android::hardware::kSynchronizedReadWrite;

using ::android::hardware::kSynchronizedReadWrite;

using ::android::hardware::kUnsynchronizedWrite;





typedef uint32_t BufferId;

typedef uint32_t BufferId;

typedef uint64_t TransactionId;

typedef uint64_t TransactionId;
@@ -60,7 +61,7 @@ enum : ConnectionId { 
typedef android::hardware::MessageQueue<BufferStatusMessage, kSynchronizedReadWrite> BufferStatusQueue;

typedef android::hardware::MessageQueue<BufferStatusMessage, kSynchronizedReadWrite> BufferStatusQueue;

typedef BufferStatusQueue::Descriptor StatusDescriptor;

typedef BufferStatusQueue::Descriptor StatusDescriptor;





typedef android::hardware::MessageQueue<BufferInvalidationMessage, kSynchronizedReadWrite>

typedef android::hardware::MessageQueue<BufferInvalidationMessage, kUnsynchronizedWrite>

        BufferInvalidationQueue;

        BufferInvalidationQueue;

typedef BufferInvalidationQueue::Descriptor InvalidationDescriptor;

typedef BufferInvalidationQueue::Descriptor InvalidationDescriptor;