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

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

Merge changes I51b1e596,I3aece23a into oc-mr1-dev 

* changes:
  bug fix: output colorformat configuration fixed
  bug fix: android list management in dequeueMsg()
parents 0d4252fa bf556d1b

media/omx/1.0/vts/functional/common/Android.bp

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+14 −15
Original line number Diff line number Diff line
@@ -123,20 +123,21 @@ struct CodecObserver : public IOmxObserver { 
        android::Vector<BufferInfo>* iBuffers = nullptr,

        android::Vector<BufferInfo>* oBuffers = nullptr) {

        int64_t finishBy = android::ALooper::GetNowUs() + timeoutUs;

        for (;;) {

        android::Mutex::Autolock autoLock(msgLock);

        for (;;) {

            android::List<Message>::iterator it = msgQueue.begin();

            while (it != msgQueue.end()) {

                if (it->type ==

                    android::hardware::media::omx::V1_0::Message::Type::EVENT) {

                    *msg = *it;

                    msgQueue.erase(it);

                    it = msgQueue.erase(it);

                    // OMX_EventBufferFlag event is sent when the component has

                    // processed a buffer with its EOS flag set. This event is

                    // not sent by soft omx components. Vendor components can

                    // send this. From IOMX point of view, we will ignore this

                    // event.

                    if (msg->data.eventData.event == OMX_EventBufferFlag) break;

                    if (msg->data.eventData.event == OMX_EventBufferFlag)

                        continue;

                    return ::android::hardware::media::omx::V1_0::Status::OK;

                } else if (it->type == android::hardware::media::omx::V1_0::

                                           Message::Type::FILL_BUFFER_DONE) {
@@ -147,7 +148,7 @@ struct CodecObserver : public IOmxObserver { 
                                it->data.bufferData.buffer) {

                                if (callBack) callBack(*it, &(*oBuffers)[i]);

                                oBuffers->editItemAt(i).owner = client;

                                msgQueue.erase(it);

                                it = msgQueue.erase(it);

                                break;

                            }

                        }
@@ -162,24 +163,22 @@ struct CodecObserver : public IOmxObserver { 
                                it->data.bufferData.buffer) {

                                if (callBack) callBack(*it, &(*iBuffers)[i]);

                                iBuffers->editItemAt(i).owner = client;

                                msgQueue.erase(it);

                                it = msgQueue.erase(it);

                                break;

                            }

                        }

                        EXPECT_LE(i, iBuffers->size());

                    }

                }

                } else {

                    EXPECT_TRUE(false) << "Received unexpected message";

                    ++it;

                }

            if (finishBy - android::ALooper::GetNowUs() < 0)

                return toStatus(android::TIMED_OUT);

            android::status_t err =

            }

            int64_t delayUs = finishBy - android::ALooper::GetNowUs();

            if (delayUs < 0) return toStatus(android::TIMED_OUT);

            (timeoutUs < 0)

                ? msgCondition.wait(msgLock)

                    : msgCondition.waitRelative(

                          msgLock,

                          (finishBy - android::ALooper::GetNowUs()) * 1000ll);

            if (err == android::TIMED_OUT) return toStatus(err);

                : msgCondition.waitRelative(msgLock, delayUs * 1000ll);

        }

    }

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+196 −44
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <android/hidl/allocator/1.0/IAllocator.h>

#include <android/hidl/memory/1.0/IMapper.h>

#include <android/hidl/memory/1.0/IMemory.h>

#include <cutils/atomic.h>



using ::android::hardware::graphics::common::V1_0::BufferUsage;

using ::android::hardware::graphics::common::V1_0::PixelFormat;
@@ -47,6 +48,7 @@ using ::android::sp; 


#include <VtsHalHidlTargetTestBase.h>

#include <getopt.h>

#include <media/hardware/HardwareAPI.h>

#include <media_hidl_test_common.h>

#include <media_video_hidl_test_common.h>

#include <fstream>
@@ -410,7 +412,7 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL, 
void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex,

                            android::Vector<BufferInfo>* buffArray,

                            uint32_t nFrameWidth, uint32_t nFrameHeight,

                            int32_t* nStride, uint32_t count) {

                            int32_t* nStride, int format, uint32_t count) {

    android::hardware::media::omx::V1_0::Status status;

    sp<android::hardware::graphics::allocator::V2_0::IAllocator> allocator =

        android::hardware::graphics::allocator::V2_0::IAllocator::getService();
@@ -427,7 +429,7 @@ void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex, 
    descriptorInfo.width = nFrameWidth;

    descriptorInfo.height = nFrameHeight;

    descriptorInfo.layerCount = 1;

    descriptorInfo.format = PixelFormat::RGBA_8888;

    descriptorInfo.format = static_cast<PixelFormat>(format);

    descriptorInfo.usage = static_cast<uint64_t>(BufferUsage::CPU_READ_OFTEN);

    omxNode->getGraphicBufferUsage(

        portIndex,
@@ -452,6 +454,9 @@ void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex, 
    EXPECT_EQ(error, android::hardware::graphics::mapper::V2_0::Error::NONE);



    EXPECT_EQ(buffArray->size(), count);



    static volatile int32_t nextId = 0;

    uint64_t id = static_cast<uint64_t>(getpid()) << 32;

    allocator->allocate(

        descriptor, count,

        [&](android::hardware::graphics::mapper::V2_0::Error _s, uint32_t _n1,
@@ -475,7 +480,7 @@ void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex, 
                buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.layerCount =

                    descriptorInfo.layerCount;

                buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.id =

                    (*buffArray)[i].id;

                    id | static_cast<uint32_t>(android_atomic_inc(&nextId));

            }

        });

}
@@ -521,12 +526,15 @@ void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 


                // set Port Params

                uint32_t nFrameWidth, nFrameHeight, xFramerate;

                OMX_COLOR_FORMATTYPE eColorFormat =

                    OMX_COLOR_FormatYUV420Planar;

                getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth,

                                    &nFrameHeight, &xFramerate);

                // get configured color format

                OMX_PARAM_PORTDEFINITIONTYPE portDef;

                status = getPortParam(omxNode, OMX_IndexParamPortDefinition,

                                      kPortIndexOutput, &portDef);

                setDefaultPortParam(omxNode, kPortIndexOutput,

                                    OMX_VIDEO_CodingUnused, eColorFormat,

                                    OMX_VIDEO_CodingUnused,

                                    portDef.format.video.eColorFormat,

                                    nFrameWidth, nFrameHeight, 0, xFramerate);



                // If you can disable a port, then you should be able to
@@ -558,6 +566,7 @@ void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
                                           portDef.format.video.nFrameWidth,

                                           portDef.format.video.nFrameHeight,

                                           &portDef.format.video.nStride,

                                           portDef.format.video.eColorFormat,

                                           portDef.nBufferCountActual);

                }

                status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT,
@@ -717,6 +726,116 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer, 
    }

}



// DescribeColorFormatParams Copy Constructor (Borrowed from OMXUtils.cpp)

android::DescribeColorFormatParams::DescribeColorFormatParams(

    const android::DescribeColorFormat2Params& params) {

    eColorFormat = params.eColorFormat;

    nFrameWidth = params.nFrameWidth;

    nFrameHeight = params.nFrameHeight;

    nStride = params.nStride;

    nSliceHeight = params.nSliceHeight;

    bUsingNativeBuffers = params.bUsingNativeBuffers;

};



bool isColorFormatFlexibleYUV(sp<IOmxNode> omxNode,

                              OMX_COLOR_FORMATTYPE eColorFormat) {

    android::hardware::media::omx::V1_0::Status status;

    unsigned int index = OMX_IndexMax, index2 = OMX_IndexMax;

    omxNode->getExtensionIndex(

        "OMX.google.android.index.describeColorFormat",

        [&index](android::hardware::media::omx::V1_0::Status _s,

                          unsigned int _nl) {

            if (_s == ::android::hardware::media::omx::V1_0::Status::OK)

                index = _nl;

        });

    omxNode->getExtensionIndex(

        "OMX.google.android.index.describeColorFormat2",

        [&index2](android::hardware::media::omx::V1_0::Status _s,

                           unsigned int _nl) {

            if (_s == ::android::hardware::media::omx::V1_0::Status::OK)

                index2 = _nl;

        });



    android::DescribeColorFormat2Params describeParams;

    describeParams.eColorFormat = eColorFormat;

    describeParams.nFrameWidth = 128;

    describeParams.nFrameHeight = 128;

    describeParams.nStride = 128;

    describeParams.nSliceHeight = 128;

    describeParams.bUsingNativeBuffers = OMX_FALSE;

    if (index != OMX_IndexMax) {

        android::DescribeColorFormatParams describeParamsV1(describeParams);

        status = getParam(omxNode, static_cast<OMX_INDEXTYPE>(index),

                          &describeParamsV1);

        if (status == ::android::hardware::media::omx::V1_0::Status::OK) {

            android::MediaImage& img = describeParamsV1.sMediaImage;

            if (img.mType == android::MediaImage::MEDIA_IMAGE_TYPE_YUV) {

                if (img.mNumPlanes == 3 &&

                    img.mPlane[img.Y].mHorizSubsampling == 1 &&

                    img.mPlane[img.Y].mVertSubsampling == 1) {

                    if (img.mPlane[img.U].mHorizSubsampling == 2 &&

                        img.mPlane[img.U].mVertSubsampling == 2 &&

                        img.mPlane[img.V].mHorizSubsampling == 2 &&

                        img.mPlane[img.V].mVertSubsampling == 2) {

                        if (img.mBitDepth <= 8) {

                            return true;

                        }

                    }

                }

            }

        }

    } else if (index2 != OMX_IndexMax) {

        status = getParam(omxNode, static_cast<OMX_INDEXTYPE>(index2),

                          &describeParams);

        android::MediaImage2& img = describeParams.sMediaImage;

        if (img.mType == android::MediaImage2::MEDIA_IMAGE_TYPE_YUV) {

            if (img.mNumPlanes == 3 &&

                img.mPlane[img.Y].mHorizSubsampling == 1 &&

                img.mPlane[img.Y].mVertSubsampling == 1) {

                if (img.mPlane[img.U].mHorizSubsampling == 2 &&

                    img.mPlane[img.U].mVertSubsampling == 2 &&

                    img.mPlane[img.V].mHorizSubsampling == 2 &&

                    img.mPlane[img.V].mVertSubsampling == 2) {

                    if (img.mBitDepth <= 8) {

                        return true;

                    }

                }

            }

        }

    }

    return false;

}



// get default color format for output port

void getDefaultColorFormat(sp<IOmxNode> omxNode, OMX_U32 kPortIndexOutput,

                           PortMode oPortMode,

                           OMX_COLOR_FORMATTYPE* eColorFormat) {

    android::hardware::media::omx::V1_0::Status status;

    OMX_VIDEO_PARAM_PORTFORMATTYPE portFormat;

    *eColorFormat = OMX_COLOR_FormatUnused;

    portFormat.nIndex = 0;

    while (1) {

        status = getPortParam(omxNode, OMX_IndexParamVideoPortFormat,

                              kPortIndexOutput, &portFormat);

        if (status != ::android::hardware::media::omx::V1_0::Status::OK) break;

        EXPECT_EQ(portFormat.eCompressionFormat, OMX_VIDEO_CodingUnused);

        if (oPortMode != PortMode::PRESET_BYTE_BUFFER) {

            *eColorFormat = portFormat.eColorFormat;

            break;

        }

        if (isColorFormatFlexibleYUV(omxNode, portFormat.eColorFormat)) {

            *eColorFormat = portFormat.eColorFormat;

            break;

        }

        if (OMX_COLOR_FormatYUV420SemiPlanar == portFormat.eColorFormat ||

            OMX_COLOR_FormatYUV420Planar == portFormat.eColorFormat) {

            *eColorFormat = portFormat.eColorFormat;

            break;

        }

        portFormat.nIndex++;

    }

}



// set component role

TEST_F(VideoDecHidlTest, SetRole) {

    description("Test Set Component Role");
@@ -806,9 +925,17 @@ TEST_F(VideoDecHidlTest, DecodeTest) { 


    // set Port Params

    uint32_t nFrameWidth, nFrameHeight, xFramerate;

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar;

    getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth, &nFrameHeight,

                        &xFramerate);

    // get default color format

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatUnused;

    getDefaultColorFormat(omxNode, kPortIndexOutput, portMode[1],

                          &eColorFormat);

    ASSERT_NE(eColorFormat, OMX_COLOR_FormatUnused);

    status =

        setVideoPortFormat(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                           eColorFormat, xFramerate);

    EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    setDefaultPortParam(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                        eColorFormat, nFrameWidth, nFrameHeight, 0, xFramerate);

    omxNode->prepareForAdaptivePlayback(kPortIndexOutput, false, 1920, 1080);
@@ -830,7 +957,8 @@ TEST_F(VideoDecHidlTest, DecodeTest) { 
        allocateGraphicBuffers(

            omxNode, kPortIndexOutput, &oBuffer,

            portDef.format.video.nFrameWidth, portDef.format.video.nFrameHeight,

            &portDef.format.video.nStride, portDef.nBufferCountActual);

            &portDef.format.video.nStride, portDef.format.video.eColorFormat,

            portDef.nBufferCountActual);

    }



    // Port Reconfiguration
@@ -868,22 +996,28 @@ TEST_F(VideoDecHidlTest, EOSTest_M) { 
        kPortIndexOutput = kPortIndexInput + 1;

    }



    // set port mode

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    // set Port Params

    uint32_t nFrameWidth, nFrameHeight, xFramerate;

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar;

    getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth, &nFrameHeight,

                        &xFramerate);

    // get default color format

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatUnused;

    getDefaultColorFormat(omxNode, kPortIndexOutput, portMode[1],

                          &eColorFormat);

    ASSERT_NE(eColorFormat, OMX_COLOR_FormatUnused);

    status =

        setVideoPortFormat(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                           eColorFormat, xFramerate);

    EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    setDefaultPortParam(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                        eColorFormat, nFrameWidth, nFrameHeight, 0, xFramerate);



    // set port mode

    PortMode portMode[2];

    portMode[0] = portMode[1] = PortMode::PRESET_BYTE_BUFFER;

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    android::Vector<BufferInfo> iBuffer, oBuffer;



    // set state to idle
@@ -944,22 +1078,28 @@ TEST_F(VideoDecHidlTest, ThumbnailTest) { 
    }

    eleInfo.close();



    // set port mode

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    // set Port Params

    uint32_t nFrameWidth, nFrameHeight, xFramerate;

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar;

    getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth, &nFrameHeight,

                        &xFramerate);

    // get default color format

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatUnused;

    getDefaultColorFormat(omxNode, kPortIndexOutput, portMode[1],

                          &eColorFormat);

    ASSERT_NE(eColorFormat, OMX_COLOR_FormatUnused);

    status =

        setVideoPortFormat(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                           eColorFormat, xFramerate);

    EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    setDefaultPortParam(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                        eColorFormat, nFrameWidth, nFrameHeight, 0, xFramerate);



    // set port mode

    PortMode portMode[2];

    portMode[0] = portMode[1] = PortMode::PRESET_BYTE_BUFFER;

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    android::Vector<BufferInfo> iBuffer, oBuffer;



    // set state to idle
@@ -1045,22 +1185,28 @@ TEST_F(VideoDecHidlTest, SimpleEOSTest) { 
    }

    eleInfo.close();



    // set port mode

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    // set Port Params

    uint32_t nFrameWidth, nFrameHeight, xFramerate;

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar;

    getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth, &nFrameHeight,

                        &xFramerate);

    // get default color format

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatUnused;

    getDefaultColorFormat(omxNode, kPortIndexOutput, portMode[1],

                          &eColorFormat);

    ASSERT_NE(eColorFormat, OMX_COLOR_FormatUnused);

    status =

        setVideoPortFormat(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                           eColorFormat, xFramerate);

    EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    setDefaultPortParam(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                        eColorFormat, nFrameWidth, nFrameHeight, 0, xFramerate);



    // set port mode

    PortMode portMode[2];

    portMode[0] = portMode[1] = PortMode::PRESET_BYTE_BUFFER;

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    android::Vector<BufferInfo> iBuffer, oBuffer;



    // set state to idle
@@ -1128,22 +1274,28 @@ TEST_F(VideoDecHidlTest, FlushTest) { 
    }

    eleInfo.close();



    // set port mode

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    // set Port Params

    uint32_t nFrameWidth, nFrameHeight, xFramerate;

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatYUV420Planar;

    getInputChannelInfo(omxNode, kPortIndexInput, &nFrameWidth, &nFrameHeight,

                        &xFramerate);

    // get default color format

    OMX_COLOR_FORMATTYPE eColorFormat = OMX_COLOR_FormatUnused;

    getDefaultColorFormat(omxNode, kPortIndexOutput, portMode[1],

                          &eColorFormat);

    ASSERT_NE(eColorFormat, OMX_COLOR_FormatUnused);

    status =

        setVideoPortFormat(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                           eColorFormat, xFramerate);

    EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    setDefaultPortParam(omxNode, kPortIndexOutput, OMX_VIDEO_CodingUnused,

                        eColorFormat, nFrameWidth, nFrameHeight, 0, xFramerate);



    // set port mode

    PortMode portMode[2];

    portMode[0] = portMode[1] = PortMode::PRESET_BYTE_BUFFER;

    status = omxNode->setPortMode(kPortIndexInput, portMode[0]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

    status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);

    ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);



    android::Vector<BufferInfo> iBuffer, oBuffer;



    // set state to idle

media/res/bbb_aac_stereo_128kbps_48000hz.aac

100755 → 100644
(155 KiB)

File mode changed from 100755 to 100644.

View file