[codec] Use SimpleDecodingSource for decoding on Android 7. Only work…

…s for audio. JB#39144

droidmediacodec.cpp

@@ -35,6 +35,7 @@
 #include <media/stagefright/OMXCodec.h>
 #else
 #include <media/hardware/MetadataBufferType.h>
+#include <media/stagefright/SimpleDecodingSource.h>
 #endif
 
 #include <media/stagefright/MediaSource.h>
@@ -448,8 +449,7 @@ class DroidMediaCodecBuilder {
        src,
        NULL, flags(), window);
 #else
-  // TODO - decoders for Android 7+
-  return NULL;
+  return android::SimpleDecodingSource::Create(src, flags(), window);
 #endif
   }
 
@@ -617,6 +617,12 @@ DroidMediaCodec *droid_media_codec_create(DroidMediaCodecBuilder& builder)
   } else {
     queue = new DroidMediaBufferQueue("DroidMediaCodecBufferQueue");
     window = queue->window();
+#if ANDROID_MAJOR >= 7
+    if (!queue->connectListener()) {
+      ALOGE("Failed to connect buffer queue listener");
+    return NULL;
+#endif
+    }
   }
 
 #if ANDROID_MAJOR >= 5
@@ -664,10 +670,12 @@ DroidMediaCodec *droid_media_codec_create_encoder(DroidMediaCodecEncoderMetaData
 bool droid_media_codec_start(DroidMediaCodec *codec)
 {
     if (codec->m_queue.get() != NULL) {
+#if ANDROID_MAJOR < 7
         if (!codec->m_queue->connectListener()) {
 	    ALOGE("Failed to connect buffer queue listener");
 	    return false;
 	}
+#endif
 
 	android::status_t err = native_window_api_connect(codec->m_window.get(),
 							  NATIVE_WINDOW_API_MEDIA);