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

Commit 663aa9d6 authored by Byeongjo Park's avatar Byeongjo Park Committed by Automerger Merge Worker
Browse files

RTSP: Do not close a rtsp socket before rtsp:teardown sent. am: 6a45b8b9 am: fc9ade90 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15250156

Change-Id: I21bcb8c35e30bae3bfec13c5536af0b1e307747c
parents 9fa8914c fc9ade90

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

+7 −5
Original line number Diff line number Diff line
@@ -145,15 +145,17 @@ void NuPlayer::RTSPSource::stop() { 
        return;

    }



    // Close socket before posting message to RTSPSource message handler.

    if (mHandler != NULL) {

        close(mHandler->getARTSPConnection()->getSocket());

    }



    sp<AMessage> msg = new AMessage(kWhatDisconnect, this);



    sp<AMessage> dummy;

    msg->postAndAwaitResponse(&dummy);



    // Close socket after posting message to RTSPSource message handler.

    if (mHandler != NULL && mHandler->getARTSPConnection()->getSocket() >= 0) {

        ALOGD("closing rtsp socket if not closed yet.");

        close(mHandler->getARTSPConnection()->getSocket());

    }



}



status_t NuPlayer::RTSPSource::feedMoreTSData() {