commit bc9357f513a9578fa776d660bb5e1e4d035343d3
author Dichen Zhang <dichenzhang@google.com> Wed Apr 17 10:56:32 2019 -0700
committer Dichen Zhang <dichenzhang@google.com> Sat Apr 20 00:09:16 2019 +0000
tree 58fd8c446e86b3885b0bf0e941c4b443590e7fb3
parent 6a3e785a3e8e6852c57b1bcc95a9de29ba42fde8

NuPlayer: Fix ANR while resetting RTSP playback

- When network is poor, the response of RTSP teardown won't be received
  in time, so ANR will happen.
- With this patch, a teardown message will be sent when timeout expires,
  in order to avoid ANR.

Bug: 123862808
Test: rtsp://107.178.217.141:1935/vod/avatar-movie-trailer.mp4

Author: lubiny <lubiny@codeaurora.org>
CRs-Fixed: 650866

Change-Id: I3f9efd9fefa66104ad452559ced5ff5218d73a66

media/libstagefright/rtsp/MyHandler.h

diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h
index b4515e4..48bc8ce 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -75,6 +75,8 @@
 // a new sequence.
 static int32_t kMaxAllowedStaleAccessUnits = 20;
 
+static int64_t kTearDownTimeoutUs = 3000000ll;
+
 namespace android {
 
 static bool GetAttribute(const char *s, const char *key, AString *value) {
@@ -930,6 +932,14 @@
                 request.append("\r\n");
 
                 mConn->sendRequest(request.c_str(), reply);
+
+                // If the response of teardown hasn't been received in 3 seconds,
+                // post 'tear' message to avoid ANR.
+                if (!msg->findInt32("reconnect", &reconnect) || !reconnect) {
+                    sp<AMessage> teardown = reply->dup();
+                    teardown->setInt32("result", -ECONNABORTED);
+                    teardown->post(kTearDownTimeoutUs);
+                }
                 break;
             }