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

Commit caa957ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "codec2 vts: Fix handling of codec config flag in decoders" into main

parents 3f6447c2 87cb9127

media/codec2/hal/hidl/1.0/vts/functional/audio/VtsHalMediaC2V1_0TargetAudioDecTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ void decodeNFrames(const std::shared_ptr<android::Codec2Client::Component>& comp 
            ASSERT_TRUE(false) << "Wait for generating C2Work exceeded timeout";

        }

        int64_t timestamp = (*Info)[frameID].timestamp;

        if ((*Info)[frameID].flags) flags = 1u << ((*Info)[frameID].flags - 1);

        flags = ((*Info)[frameID].flags == FLAG_CONFIG_DATA) ? C2FrameData::FLAG_CODEC_CONFIG : 0;

        if (signalEOS && ((frameID == (int)Info->size() - 1) || (frameID == (offset + range - 1))))

            flags |= C2FrameData::FLAG_END_OF_STREAM;

media/codec2/hal/hidl/1.0/vts/functional/common/media_c2_hidl_test_common.h

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <fstream>



#define FLAG_NON_DISPLAY_FRAME (1 << 4)

#define FLAG_CONFIG_DATA (1 << 5)



#define MAX_RETRY 20

#define TIME_OUT 400ms

#define MAX_INPUT_BUFFERS 8

media/codec2/hal/hidl/1.0/vts/functional/video/VtsHalMediaC2V1_0TargetVideoDecTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -460,7 +460,8 @@ void decodeNFrames(const std::shared_ptr<android::Codec2Client::Component>& comp 
            ASSERT_TRUE(false) << "Wait for generating C2Work exceeded timeout";

        }

        int64_t timestamp = (*Info)[frameID].timestamp;

        if ((*Info)[frameID].flags) flags = (1 << ((*Info)[frameID].flags - 1));



        flags = ((*Info)[frameID].flags == FLAG_CONFIG_DATA) ? C2FrameData::FLAG_CODEC_CONFIG : 0;

        if (signalEOS && ((frameID == (int)Info->size() - 1) || (frameID == (offset + range - 1))))

            flags |= C2FrameData::FLAG_END_OF_STREAM;