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

Commit 52df71c2 authored by Linus Nilsson's avatar Linus Nilsson
Browse files

Transcoder: Add HDR -> SDR unit test using sample plugin. 

This commits adds a unit test that force enables loading
sample HDR plugin loading and tries to transcode and HDR10
video. If the codec supports the conversion the test checks
that the transcoded video is SDR. If the codec does not
support the conversion the test checks that transcoding
returns unsupported.

Bug: 180011717
Test: atest HdrTranscodeTests
Change-Id: I9cb26589d320744670b619faa4b35ce5c0541e91
parent fd945ef4

media/libmediatranscoding/tests/assets/TranscodingTestAssets/video_1280x720_hevc_hdr10_static_3mbps.mp4

0 → 100644
+579 KiB

File added.

No diff preview for this file type.

View file

media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp

+25 −6
Original line number Diff line number Diff line
@@ -171,12 +171,12 @@ struct AsyncCodecCallbackDispatch { 
        VideoTrackTranscoder::CodecWrapper* wrapper =

                static_cast<VideoTrackTranscoder::CodecWrapper*>(userdata);

        if (auto transcoder = wrapper->getTranscoder()) {

            const char* kCodecName = (codec == transcoder->mDecoder ? "Decoder" : "Encoder");

            const bool isDecoder = codec == transcoder->mDecoder;

            const char* kCodecName = (isDecoder ? "Decoder" : "Encoder");

            LOG(DEBUG) << kCodecName << " format changed: " << AMediaFormat_toString(format);

            if (codec == transcoder->mEncoder->getCodec()) {

                transcoder->mCodecMessageQueue.push(

                        [transcoder, format] { transcoder->updateTrackFormat(format); });

            }

            transcoder->mCodecMessageQueue.push([transcoder, format, isDecoder] {

                transcoder->updateTrackFormat(format, isDecoder);

            });

        }

    }
@@ -533,7 +533,25 @@ void VideoTrackTranscoder::dequeueOutputSample(int32_t bufferIndex, 
    }

}



void VideoTrackTranscoder::updateTrackFormat(AMediaFormat* outputFormat) {

void VideoTrackTranscoder::updateTrackFormat(AMediaFormat* outputFormat, bool fromDecoder) {

    if (fromDecoder) {

        static const AMediaFormatUtils::EntryCopier kValuesToCopy[] = {

                ENTRY_COPIER(AMEDIAFORMAT_KEY_COLOR_RANGE, Int32),

                ENTRY_COPIER(AMEDIAFORMAT_KEY_COLOR_STANDARD, Int32),

                ENTRY_COPIER(AMEDIAFORMAT_KEY_COLOR_TRANSFER, Int32),

        };

        AMediaFormat* params = AMediaFormat_new();

        if (params != nullptr) {

            AMediaFormatUtils::CopyFormatEntries(outputFormat, params, kValuesToCopy,

                                                 std::size(kValuesToCopy));

            if (AMediaCodec_setParameters(mEncoder->getCodec(), params) != AMEDIA_OK) {

                LOG(WARNING) << "Unable to update encoder with color information";

            }

            AMediaFormat_delete(params);

        }

        return;

    }



    if (mActualOutputFormat != nullptr) {

        LOG(WARNING) << "Ignoring duplicate format change.";

        return;
@@ -597,6 +615,7 @@ void VideoTrackTranscoder::updateTrackFormat(AMediaFormat* outputFormat) { 
    // TODO: transfer other fields as required.



    mActualOutputFormat = std::shared_ptr<AMediaFormat>(formatCopy, &AMediaFormat_delete);

    LOG(DEBUG) << "Actual output format: " << AMediaFormat_toString(formatCopy);



    notifyTrackFormatAvailable();

}

media/libmediatranscoding/transcoder/include/media/VideoTrackTranscoder.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ private: 
    // Dequeues an encoded buffer from the encoder and adds it to the output queue.

    void dequeueOutputSample(int32_t bufferIndex, AMediaCodecBufferInfo bufferInfo);



    // Updates the video track's actual format based on encoder output format.

    void updateTrackFormat(AMediaFormat* outputFormat);

    // Updates the video track's actual format based on encoder and decoder output format.

    void updateTrackFormat(AMediaFormat* outputFormat, bool fromDecoder);



    AMediaCodec* mDecoder = nullptr;

    std::shared_ptr<CodecWrapper> mEncoder;

media/libmediatranscoding/transcoder/setloglevel.sh

+15 −5
Original line number Diff line number Diff line
@@ -2,19 +2,29 @@ 


if [ $# -ne 1 ]

then

    echo Usage: $0 loglevel

    echo "Usage 1: $0 <loglevel>"

    echo "  Set all transcoder log tags to <loglevel>"

    echo "Usage 2: $0 -l"

    echo "  List all transcoder log tags and exit"

    exit 1

fi



level=$1

echo Setting transcoder log level to $level



# List all log tags

declare -a tags=(

  MediaTranscoder MediaTrackTranscoder VideoTrackTranscoder PassthroughTrackTranscoder

  MediaSampleWriter MediaSampleReader MediaSampleQueue MediaTranscoderTests

  MediaTrackTranscoderTests VideoTrackTranscoderTests PassthroughTrackTranscoderTests

  MediaSampleWriterTests MediaSampleReaderNDKTests MediaSampleQueueTests)

  MediaSampleWriterTests MediaSampleReaderNDKTests MediaSampleQueueTests HdrTranscodeTests)



if [ "$1" == "-l" ]; then

  echo "Transcoder log tags:"

  for tag in "${tags[@]}"; do echo -n "$tag "; done

  echo

  exit 0

fi



level=$1

echo Setting transcoder log level to $level



# Set log level for all tags

for tag in "${tags[@]}"

media/libmediatranscoding/transcoder/tests/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -89,6 +89,13 @@ cc_test { 
    srcs: ["MediaSampleWriterTests.cpp"],

}



// HDR Transcode unit test

cc_test {

    name: "HdrTranscodeTests",

    defaults: ["testdefaults"],

    srcs: ["HdrTranscodeTests.cpp"],

}



// MediaTranscoder unit test

cc_test {

    name: "MediaTranscoderTests",