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

Commit ba9be9f4 authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "A reference to the psi section data could become invalid if more"

parents 4e2a359b 4b4bb11b

media/libstagefright/mpeg2ts/ATSParser.cpp

+5 −3
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ status_t ATSParser::parsePID( 
    ssize_t sectionIndex = mPSISections.indexOfKey(PID);



    if (sectionIndex >= 0) {

        const sp<PSISection> &section = mPSISections.valueAt(sectionIndex);

        sp<PSISection> section = mPSISections.valueAt(sectionIndex);



        if (payload_unit_start_indicator) {

            CHECK(section->isEmpty());
@@ -1068,7 +1068,6 @@ status_t ATSParser::parsePID( 
            br->skipBits(skip * 8);

        }





        CHECK((br->numBitsLeft() % 8) == 0);

        status_t err = section->append(br->data(), br->numBitsLeft() / 8);
@@ -1103,10 +1102,13 @@ status_t ATSParser::parsePID( 


            if (!handled) {

                mPSISections.removeItem(PID);

                section.clear();

            }

        }



        if (section != NULL) {

            section->clear();

        }



        return OK;

    }