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

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

Merge "transcoding: Make TranscodingTestConfig to be nullable."

parents d190dcf1 34915b1b

media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ parcelable TranscodingRequestParcel { 
    boolean isForTesting = false;



    /**

     * Test configuration. This is only valid when isForTesting is set to true.

     * Test configuration. This will be available only when isForTesting is set to true.

     */

    TranscodingTestConfig testConfig;

     @nullable TranscodingTestConfig testConfig;

}

services/mediatranscoding/SimulatedTranscoder.cpp

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ void SimulatedTranscoder::setCallback(const std::shared_ptr<TranscoderCallbackIn 
void SimulatedTranscoder::start(

        ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,

        const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) {

    if (request.testConfig.processingTotalTimeMs > 0) {

        mJobProcessingTimeMs = request.testConfig.processingTotalTimeMs;

    if (request.testConfig.has_value() && request.testConfig->processingTotalTimeMs > 0) {

        mJobProcessingTimeMs = request.testConfig->processingTotalTimeMs;

    }

    ALOGV("%s: job {%d}: processingTime: %lld", __FUNCTION__, jobId,

          (long long)mJobProcessingTimeMs);