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

Commit 7f3bb5ad authored by Robert Shih's avatar Robert Shih
Browse files

HLS: preserve old format in onChangeConfiguration2 

`onChangeConfiguration2` is only called during seek.

Bug: 22698650
Change-Id: I715fa51d04d503f49d678eaea08f2b63dce4e01e
parent 6134ad6f

media/libstagefright/httplive/LiveSession.cpp

+10 −1
Original line number Diff line number Diff line
@@ -1657,7 +1657,16 @@ void LiveSession::onChangeConfiguration2(const sp<AMessage> &msg) { 
        mLastDequeuedTimeUs = timeUs;



        for (size_t i = 0; i < mPacketSources.size(); i++) {

            mPacketSources.editValueAt(i)->clear();

            sp<AnotherPacketSource> packetSource = mPacketSources.editValueAt(i);

            sp<MetaData> format = packetSource->getFormat();

            packetSource->clear();

            // Set a tentative format here such that HTTPLiveSource will always have

            // a format available when NuPlayer queries. Without an available video

            // format when setting a surface NuPlayer might disable video decoding

            // altogether. The tentative format will be overwritten by the

            // authoritative (and possibly same) format once content from the new

            // position is dequeued.

            packetSource->setFormat(format);

        }



        for (size_t i = 0; i < kMaxStreams; ++i) {