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

Commit 642d4388 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12888383 from 805a405a to 25Q2-release

Change-Id: I6ca79c04e575d5fdaf3f292dce6dde013587c654
parents 6e1df356 805a405a
Loading
Loading
Loading
Loading
+6 −5
Original line number Diff line number Diff line
@@ -496,8 +496,6 @@ C2SoftApvDec::C2SoftApvDec(const char* name, c2_node_id_t id,
                           const std::shared_ptr<IntfImpl>& intfImpl)
    : SimpleC2Component(std::make_shared<SimpleInterface<IntfImpl>>(name, id, intfImpl)),
      mIntf(intfImpl),
      mDecHandle(nullptr),
      mMetadataHandle(nullptr),
      mOutBufferFlush(nullptr),
      mOutputDelay(kDefaultOutputDelay),
      mOutIndex(0u),
@@ -505,8 +503,11 @@ C2SoftApvDec::C2SoftApvDec(const char* name, c2_node_id_t id,
      mWidth(320),
      mHeight(240),
      mSignalledOutputEos(false),
      mSignalledError(false) {
    mOutCsp = OUTPUT_CSP_P210;
      mSignalledError(false),
      mDecHandle(nullptr),
      mMetadataHandle(nullptr),
      mOutCsp(OUTPUT_CSP_P210) {
    memset(&mOutFrames, 0, sizeof(oapv_frms_t));
}

C2SoftApvDec::~C2SoftApvDec() {
@@ -1109,7 +1110,7 @@ void C2SoftApvDec::getHDRStaticParams(const struct ApvHdrInfo *buffer,
void C2SoftApvDec::getHDR10PlusInfoData(const struct ApvHdrInfo *buffer,
                                         const std::unique_ptr<C2Work> &work) {
    if(!buffer->has_itut_t35) {
        ALOGD("no itu_t_t35 data");
        ALOGV("no itu_t_t35 data");
        return;
    }

+2 −3
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct C2SoftApvDec final : public SimpleC2Component {
    std::shared_ptr<IntfImpl> mIntf;
    uint8_t *mOutBufferFlush;
    uint32_t mOutputDelay;
    bool mHeaderDecoded;
    std::atomic_uint64_t mOutIndex;
    std::shared_ptr<C2GraphicBlock> mOutBlock;

@@ -113,8 +112,8 @@ struct C2SoftApvDec final : public SimpleC2Component {

        ApvHdrInfo()
            : has_hdr_mdcv(false),
            has_hdr_cll(false),
            has_itut_t35(false) { }
            has_itut_t35(false),
            has_hdr_cll(false) { }

        // Master Display Color Volume
        struct HdrMdcv {
+7 −0
Original line number Diff line number Diff line
@@ -659,6 +659,13 @@ status_t StreamHalAidl::sendCommand(
        const ::aidl::android::hardware::audio::core::StreamDescriptor::Command& command,
        ::aidl::android::hardware::audio::core::StreamDescriptor::Reply* reply,
        bool safeFromNonWorkerThread, StatePositions* statePositions) {

    // Add timeCheck only for start command (pause, flush checked at caller).
    std::unique_ptr<mediautils::TimeCheck> timeCheck;
    if (command.getTag() == StreamDescriptor::Command::start) {
        timeCheck = mediautils::makeTimeCheckStatsForClassMethodUniquePtr(
                getClassName(), "sendCommand_start");
    }
    // TIME_CHECK();  // TODO(b/243839867) reenable only when optimized.
    if (!safeFromNonWorkerThread) {
        const pid_t workerTid = mWorkerTid.load(std::memory_order_acquire);
+12 −3
Original line number Diff line number Diff line
@@ -374,9 +374,18 @@ void NuPlayer::Decoder::onConfigure(const sp<AMessage> &format) {
    }
    rememberCodecSpecificData(format);

    // the following should work in configured state
    CHECK_EQ((status_t)OK, mCodec->getOutputFormat(&mOutputFormat));
    CHECK_EQ((status_t)OK, mCodec->getInputFormat(&mInputFormat));
    err = mCodec->getOutputFormat(&mOutputFormat);
    if (err == OK) {
        err = mCodec->getInputFormat(&mInputFormat);
    }
    if (err != OK) {
        ALOGE("Failed to get input/output format from [%s] decoder (err=%d)",
                mComponentName.c_str(), err);
        mCodec->release();
        mCodec.clear();
        handleError(err);
        return;
    }

    {
        Mutex::Autolock autolock(mStatsLock);
+8 −8
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@
        "name": "HEVCUtilsUnitTest"
    },
    {
      "name": "MctsMediaDecoderTestCases",
      "name": "MctsMediaCodecTestCases",
      "options": [
        {
          "include-annotation": "android.platform.test.annotations.Presubmit"
@@ -98,19 +98,15 @@
      ]
    },
    {
      "name": "MctsMediaEncoderTestCases",
      "name": "MctsMediaDecoderTestCases",
      "options": [
        {
          "include-annotation": "android.platform.test.annotations.Presubmit"
        }
      ]
    }
  ],
  "postsubmit": [
    // writerTest fails about 5 out of 66
    // { "name": "writerTest" },
    },
    {
      "name": "MctsMediaCodecTestCases",
      "name": "MctsMediaEncoderTestCases",
      "options": [
        {
          "include-annotation": "android.platform.test.annotations.Presubmit"
@@ -118,4 +114,8 @@
      ]
    }
  ]
  // "postsubmit": [
  //   writerTest fails about 5 out of 66
  //   { "name": "writerTest" },
  // ]
}
Loading