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

Commit 11a46693 authored by huiy's avatar huiy Committed by Steve Kondik
Browse files

RTSP: Return the buffers in source side while the source is disconnected 

There is a race condition, some buffers are held by the source
because of the poor network environment. If the client tries to flush at
this time, the flush operation will be blocked because not all the buffers
are returned to the client.
At this time, sometimes, the source will be disconnected from the server,
then these buffers held by the source won't be returned any more.
Without this patch, flush operation maybe won't finish, and blocks
other operations, causing ANR.

Change-Id: I19581498d17a29b637d5468932438ea862e1c7ff
parent a6d495ee

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+8 −1
Original line number Diff line number Diff line
@@ -546,8 +546,15 @@ void NuPlayer::onMessageReceived(const sp<AMessage> &msg) { 
                        audio, codecRequest);



                if (err == -EWOULDBLOCK) {

                    if (mSource->feedMoreTSData() == OK) {

                    status_t result = mSource->feedMoreTSData();

                    if (result == OK) {

                        msg->post(10000ll);

                    } else if (result == UNKNOWN_ERROR) {

                        // The source has disconnected

                        sp<AMessage> reply;

                        CHECK(codecRequest->findMessage("reply", &reply));

                        reply->setInt32("err", INFO_DISCONTINUITY);

                        reply->post();

                    }

                }

            } else if (what == ACodec::kWhatEOS) {