From d5f85fd1314927c043fd5e965bb8b2e06503134e Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Fri, 28 Jun 2013 08:05:37 -0700
Subject: [PATCH] Really fix stop() in samplePlayer when using MediaCodec mode

Make getBufferPercentage() and getPosition() work when the
media is reset.

Change-Id: I7d696fd9b5c62b42aa0d29348e73f1f5755eb075
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9516405
---
 .../src/com/widevine/demo/MediaCodecView.java             | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java b/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
index 73c2bd59..4853d01e 100644
--- a/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
+++ b/proprietary/samplePlayer/src/com/widevine/demo/MediaCodecView.java
@@ -649,6 +649,10 @@ class MediaCodecView extends SurfaceView
     }
 
     public int getCurrentPosition() {
+        if (mCodecStates == null) {
+            return 0;
+        }
+
         long positionUs = 0;
 
         for (CodecState state : mCodecStates.values()) {
@@ -683,6 +687,10 @@ class MediaCodecView extends SurfaceView
     }
 
     public int getBufferPercentage() {
+        if (mExtractor == null) {
+            return 0;
+        }
+
         long cachedDurationUs = mExtractor.getCachedDuration();
 
         if (cachedDurationUs < 0 || mDurationUs < 0) {