commit 4d432f1d0b33b54e49fc21fd583f57e1e86966f1
author Robert Shih <robertshih@google.com> Thu Nov 01 12:29:06 2018 -0700
committer Robert Shih <robertshih@google.com> Fri Nov 02 20:04:14 2018 +0000
tree f07a3a595d607b972043218c33337c5a81414b3f
parent 69c9844bed34c367224d5f6219e8410664b2119b

AMediaDataSourceWrapper: keep DataSource sp alive

Bug: 118506674
Test: android.media.cts.MediaPlayer2Test#testConsecutiveSeeks
Change-Id: Iafa26d6a0fa6ad4aa7dee696fff1673075e51624

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
index f795478..1860b0c 100644
--- a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
+++ b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
@@ -34,7 +34,6 @@
 #include <media/stagefright/MetaData.h>
 #include <media/stagefright/NdkUtils.h>
 #include <media/stagefright/Utils.h>
-#include "NdkMediaDataSourceCallbacksPriv.h"
 
 namespace android {
 
@@ -137,8 +136,7 @@
     ALOGV("setDataSource (source: %p)", source.get());
 
     resetDataSource();
-    AMediaDataSource *aSource = convertDataSourceToAMediaDataSource(source);
-    mDataSourceWrapper = new AMediaDataSourceWrapper(aSource);
+    mDataSourceWrapper = new AMediaDataSourceWrapper(source);
     return OK;
 }