diff options
| author | Lajos Molnar <lajos@google.com> | 2015-05-02 02:23:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-02 02:23:11 +0000 |
| commit | 4971de2a2efe448171b87471ad65e986c3608c21 (patch) | |
| tree | 8070b4260c8902c56bd0dd9bca4c16e44cfb3ece /media/java | |
| parent | 039cd7ffaa28376fe00396b92dc77716bfa6e42e (diff) | |
| parent | 5e02ba977ede1e38c9f206057ec3f0f1e89ba943 (diff) | |
| download | frameworks_base-4971de2a2efe448171b87471ad65e986c3608c21.zip frameworks_base-4971de2a2efe448171b87471ad65e986c3608c21.tar.gz frameworks_base-4971de2a2efe448171b87471ad65e986c3608c21.tar.bz2 | |
Merge "media: hook up MediaCodec.setSurface" into mnc-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index f4a5bc3..8220a74 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -664,11 +664,11 @@ final public class MediaCodec { if (!mHasSurface) { throw new IllegalStateException("codec was not configured for an output surface"); } - - // TODO implement this - throw new IllegalArgumentException("codec does not support this surface"); + native_setSurface(surface); } + private native void native_setSurface(@NonNull Surface surface); + /** * Create a persistent input surface that can be used with codecs that normally have an input * surface, such as video encoders. A persistent input can be reused by subsequent |