summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaCodec.cpp
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-07-10 19:17:45 -0700
committerLajos Molnar <lajos@google.com>2015-07-13 16:33:59 -0700
commita81c6229638a4db56752dd77a6610e0f0971e877 (patch)
treeb43408970894d5a5979ed0087ab1ee213144ac7c /media/libstagefright/MediaCodec.cpp
parent4b33e0838fdb1b5e545449add02005916b512c99 (diff)
downloadframeworks_av-a81c6229638a4db56752dd77a6610e0f0971e877.zip
frameworks_av-a81c6229638a4db56752dd77a6610e0f0971e877.tar.gz
frameworks_av-a81c6229638a4db56752dd77a6610e0f0971e877.tar.bz2
nuplayer: use codec->setSurface when possible to avoid seeking
Bug: 22414719 Change-Id: I0442e12af960f86a0fc090b4a469c62ba638a1a0
Diffstat (limited to 'media/libstagefright/MediaCodec.cpp')
-rw-r--r--media/libstagefright/MediaCodec.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 69f44ed..fb32d3a 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -2528,6 +2528,7 @@ status_t MediaCodec::connectToSurface(const sp<Surface> &surface) {
err = native_window_api_connect(surface.get(), NATIVE_WINDOW_API_MEDIA);
if (err == BAD_VALUE) {
ALOGI("native window already connected. Assuming no change of surface");
+ return err;
} else if (err == OK) {
// Require a fresh set of buffers after each connect by using a unique generation
// number. Rely on the fact that max supported process id by Linux is 2^22.