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

Commit c2f9e9d2 authored by Suyog Pawar's avatar Suyog Pawar
Browse files

C2SoftMpeg2Dec: Fix KEEP_THREADS_ACTIVE issue 

Ensures proper handling of threads and mutex locks

Bug: 343793479
Test: atest MctsMediaV2TestCases
      atest MctsMediaDecoderTestCases
      atest MctsMediaCodecTestCases
      atest VtsHalMediaC2V1_0TargetVideoDecTest

Change-Id: I80a5d57b8942ac3a5d968de6df9e983191fa221d
parent 78e3c8ad

media/codec2/components/mpeg2/C2SoftMpeg2Dec.cpp

+19 −0
Original line number Original line Diff line number Diff line
@@ -743,6 +743,25 @@ void C2SoftMpeg2Dec::resetPlugin() { 
}

}





status_t C2SoftMpeg2Dec::deleteDecoder() {

status_t C2SoftMpeg2Dec::deleteDecoder() {

    // API call to IV_CMD_RETRIEVE_MEMREC not only retrieves the memory records

    // but also joins active threads and destroys conditional thread variables and

    // mutex locks for each thread.

    iv_retrieve_mem_rec_ip_t s_retrieve_mem_ip;

    iv_retrieve_mem_rec_op_t s_retrieve_mem_op;



    s_retrieve_mem_ip.pv_mem_rec_location = (iv_mem_rec_t *)mMemRecords;

    s_retrieve_mem_ip.e_cmd = IV_CMD_RETRIEVE_MEMREC;

    s_retrieve_mem_ip.u4_size = sizeof(iv_retrieve_mem_rec_ip_t);

    s_retrieve_mem_op.u4_size = sizeof(iv_retrieve_mem_rec_op_t);



    IV_API_CALL_STATUS_T status = ivdec_api_function(mDecHandle,

                                                    &s_retrieve_mem_ip,

                                                    &s_retrieve_mem_op);

    if (IV_SUCCESS != status) {

        ALOGE("error in %s: 0x%x", __func__, s_retrieve_mem_op.u4_error_code);

        return UNKNOWN_ERROR;

    }



    if (mMemRecords) {

    if (mMemRecords) {

        iv_mem_rec_t *ps_mem_rec = mMemRecords;

        iv_mem_rec_t *ps_mem_rec = mMemRecords;