1 files changed, 2 insertions, 41 deletions

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index c234013..a040343 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -265,12 +265,6 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
         }
     }
 
-    mBitrate = totalBitrate;
-
-    return OK;
-}
-
-status_t NuPlayer::GenericSource::startSources() {
     // Start the selected A/V tracks now before we start buffering.
     // Widevine sources might re-initialize crypto when starting, if we delay
     // this to start(), all data buffered during prepare would be wasted.
@@ -285,6 +279,8 @@ status_t NuPlayer::GenericSource::startSources() {
         return UNKNOWN_ERROR;
     }
 
+    mBitrate = totalBitrate;
+
     return OK;
 }
 
@@ -419,32 +415,6 @@ void NuPlayer::GenericSource::onPrepareAsync() {
             | FLAG_CAN_SEEK_FORWARD
             | FLAG_CAN_SEEK);
 
-    if (mIsSecure) {
-        // secure decoders must be instantiated before starting widevine source
-        sp<AMessage> reply = new AMessage(kWhatSecureDecodersInstantiated, id());
-        notifyInstantiateSecureDecoders(reply);
-    } else {
-        finishPrepareAsync();
-    }
-}
-
-void NuPlayer::GenericSource::onSecureDecodersInstantiated(status_t err) {
-    if (err != OK) {
-        ALOGE("Failed to instantiate secure decoders!");
-        notifyPreparedAndCleanup(err);
-        return;
-    }
-    finishPrepareAsync();
-}
-
-void NuPlayer::GenericSource::finishPrepareAsync() {
-    status_t err = startSources();
-    if (err != OK) {
-        ALOGE("Failed to init start data source!");
-        notifyPreparedAndCleanup(err);
-        return;
-    }
-
     if (mIsStreaming) {
         mPrepareBuffering = true;
 
@@ -460,7 +430,6 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
         mDataSource.clear();
         mCachedSource.clear();
         mHttpSource.clear();
-        mBitrate = -1;
 
         cancelPollBuffering();
     }
@@ -836,14 +805,6 @@ void NuPlayer::GenericSource::onMessageReceived(const sp<AMessage> &msg) {
           break;
       }
 
-      case kWhatSecureDecodersInstantiated:
-      {
-          int32_t err;
-          CHECK(msg->findInt32("err", &err));
-          onSecureDecodersInstantiated(err);
-          break;
-      }
-
       case kWhatStopWidevine:
       {
           // mStopRead is only used for Widevine to prevent the video source