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

Commit 6d6a821f authored by Sungtak Lee's avatar Sungtak Lee Committed by Gerrit Code Review
Browse files

Merge "Adding traces to codec framework" into main

parents 9b59b065 7ba67075

media/codec2/hal/client/client.cpp

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "Codec2Client"

#define ATRACE_TAG  ATRACE_TAG_VIDEO

#include <android-base/logging.h>



#include <utils/Trace.h>

#include <codec2/hidl/client.h>

#include <C2Debug.h>

#include <C2BufferPriv.h>
@@ -2324,6 +2325,7 @@ status_t Codec2Client::Component::queueToOutputSurface( 
        const C2ConstGraphicBlock& block,

        const QueueBufferInput& input,

        QueueBufferOutput* output) {

    ScopedTrace trace(ATRACE_TAG,"Codec2Client::Component::queueToOutputSurface");

    return mOutputBufferQueue->outputBuffer(block, input, output);

}

media/codec2/hal/client/output.cpp

+3 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "Codec2-OutputBufferQueue"

#define ATRACE_TAG  ATRACE_TAG_VIDEO

#include <android-base/logging.h>

#include <utils/Trace.h>



#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>

#include <codec2/hidl/output.h>
@@ -404,6 +406,7 @@ status_t OutputBufferQueue::outputBuffer( 
    uint32_t generation;

    uint64_t bqId;

    int32_t bqSlot;

    ScopedTrace trace(ATRACE_TAG,"Codec2-OutputBufferQueue::outputBuffer");

    bool display = V1_0::utils::displayBufferQueueBlock(block);

    if (!getBufferQueueAssignment(block, &generation, &bqId, &bqSlot) ||

        bqId == 0) {

media/codec2/sfplugin/CCodecBufferChannel.cpp

+2 −0
Original line number Diff line number Diff line
@@ -598,6 +598,8 @@ status_t CCodecBufferChannel::queueSecureInputBuffer( 
    size_t bufferSize = 0;

    c2_status_t blockRes = C2_OK;

    bool copied = false;

    ScopedTrace trace(ATRACE_TAG, android::base::StringPrintf(

            "CCodecBufferChannel::decrypt(%s)", mName).c_str());

    if (mSendEncryptedInfoBuffer) {

        static const C2MemoryUsage kDefaultReadWriteUsage{

            C2MemoryUsage::CPU_READ, C2MemoryUsage::CPU_WRITE};

media/codec2/vndk/C2Buffer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "C2Buffer"

#define ATRACE_TAG  ATRACE_TAG_VIDEO

#include <utils/Log.h>

#include <utils/Trace.h>



#include <list>

#include <map>
@@ -33,6 +35,7 @@ 


namespace {



using android::ScopedTrace;

using android::C2AllocatorBlob;

using android::C2AllocatorGralloc;

using android::C2AllocatorIon;
@@ -1159,6 +1162,7 @@ c2_status_t C2PooledBlockPool::fetchLinearBlock( 
        uint32_t capacity,

        C2MemoryUsage usage,

        std::shared_ptr<C2LinearBlock> *block /* nonnull */) {

    ScopedTrace trace(ATRACE_TAG,"C2PooledBlockPool::fetchLinearBlock");

    if (mBufferPoolVer == VER_HIDL && mImpl) {

        return mImpl->fetchLinearBlock(capacity, usage, block);

    }
@@ -1174,6 +1178,7 @@ c2_status_t C2PooledBlockPool::fetchGraphicBlock( 
        uint32_t format,

        C2MemoryUsage usage,

        std::shared_ptr<C2GraphicBlock> *block) {

    ScopedTrace trace(ATRACE_TAG,"C2PooledBlockPool::fetchGraphicBlock");

    if (mBufferPoolVer == VER_HIDL && mImpl) {

        return mImpl->fetchGraphicBlock(width, height, format, usage, block);

    }

media/codec2/vndk/platform/C2BqBuffer.cpp

+4 −0
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "C2BqBuffer"

#define ATRACE_TAG  ATRACE_TAG_VIDEO

#include <android/hardware_buffer.h>

#include <utils/Log.h>

#include <utils/Trace.h>



#include <ui/BufferQueueDefs.h>

#include <ui/GraphicBuffer.h>
@@ -37,6 +39,7 @@ 
#include <map>

#include <mutex>



using ::android::ScopedTrace;

using ::android::BufferQueueDefs::NUM_BUFFER_SLOTS;

using ::android::C2AllocatorGralloc;

using ::android::C2AndroidMemoryUsage;
@@ -1063,6 +1066,7 @@ c2_status_t C2BufferQueueBlockPool::fetchGraphicBlock( 
        uint32_t format,

        C2MemoryUsage usage,

        std::shared_ptr<C2GraphicBlock> *block /* nonnull */) {

    ScopedTrace trace(ATRACE_TAG,"C2BufferQueueBlockPool::fetchGraphicBlock");

    if (mImpl) {

        return mImpl->fetchGraphicBlock(width, height, format, usage, block, nullptr);

    }