ADD: [amc] API21+ buffer handling

Author: koying

xbmc/android/jni/MediaCodec.cpp

@@ -162,18 +162,30 @@ const CJNIMediaFormat CJNIMediaCodec::getOutputFormat()
     "getOutputFormat", "()Landroid/media/MediaFormat;");
 }
 
-std::vector<CJNIByteBuffer> CJNIMediaCodec::getInputBuffers()
+std::vector<CJNIByteBuffer> CJNIMediaCodec::getInputBuffers()  // Deprecated as of API 21
 {
   return jcast<CJNIByteBuffers>(call_method<jhobjectArray>(m_object,
     "getInputBuffers", "()[Ljava/nio/ByteBuffer;"));
 }
 
-std::vector<CJNIByteBuffer> CJNIMediaCodec::getOutputBuffers()
+std::vector<CJNIByteBuffer> CJNIMediaCodec::getOutputBuffers()  // Deprecated as of API 21
 {
   return jcast<CJNIByteBuffers>(call_method<jhobjectArray>(m_object,
     "getOutputBuffers", "()[Ljava/nio/ByteBuffer;"));
 }
 
+const CJNIByteBuffer CJNIMediaCodec::getInputBuffer(int index) // API 21+
+{
+  return call_method<jhobject>(m_object,
+    "getInputBuffer", "(I)Ljava/nio/ByteBuffer;", index);
+}
+
+const CJNIByteBuffer CJNIMediaCodec::getOutputBuffer(int index)  // API 21+
+{
+  return call_method<jhobject>(m_object,
+    "getOutputBuffer", "(I)Ljava/nio/ByteBuffer;", index);
+}
+
 void CJNIMediaCodec::setVideoScalingMode(int mode)
 {
   call_method<void>(m_object,

xbmc/android/jni/MediaCodec.h

@@ -46,8 +46,10 @@ class CJNIMediaCodec : public CJNIBase
   int   dequeueOutputBuffer(const CJNIMediaCodecBufferInfo &info, int64_t timeoutUs);
   void  releaseOutputBuffer(int index, bool render);
   const CJNIMediaFormat getOutputFormat();
-  std::vector<CJNIByteBuffer> getInputBuffers();
-  std::vector<CJNIByteBuffer> getOutputBuffers();
+  std::vector<CJNIByteBuffer> getInputBuffers(); // Deprecated as of API 21
+  std::vector<CJNIByteBuffer> getOutputBuffers(); // Deprecated as of API 21
+  const CJNIByteBuffer getInputBuffer(int index); // API 21+
+  const CJNIByteBuffer getOutputBuffer(int index); // API 21+
   void  setVideoScalingMode(int mode);
 
   static void  PopulateStaticFields();

xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp

@@ -741,10 +741,11 @@ int CDVDVideoCodecAndroidMediaCodec::Decode(uint8_t *pData, int iSize, double dt
     }
     else if (index >= 0)
     {
+      // Deprecated as of API 21:
       // docs lie, getInputBuffers should be good after
       // m_codec->start() but the internal refs are not
       // setup until much later on some devices.
-      if (m_input.empty())
+      if (CJNIBase::GetSDKVersion() < 21 && m_input.empty())
       {
         m_input = m_codec->getInputBuffers();
         if (xbmc_jnienv()->ExceptionCheck())
@@ -763,14 +764,15 @@ int CDVDVideoCodecAndroidMediaCodec::Decode(uint8_t *pData, int iSize, double dt
         iSize = m_bitstream->GetConvertSize();
         pData = m_bitstream->GetConvertBuffer();
       }
-      int size = m_input[index].capacity();
+      CJNIByteBuffer buffer = (CJNIBase::GetSDKVersion() < 21 ? m_input[index] : m_codec->getInputBuffer(index));
+      int size = buffer.capacity();
       if (iSize > size)
       {
         CLog::Log(LOGERROR, "CDVDVideoCodecAndroidMediaCodec::Decode, iSize(%d) > size(%d)", iSize, size);
         iSize = size;
       }
       // fetch a pointer to the ByteBuffer backing store
-      uint8_t *dst_ptr = (uint8_t*)xbmc_jnienv()->GetDirectBufferAddress(m_input[index].get_raw());
+      uint8_t *dst_ptr = (uint8_t*)xbmc_jnienv()->GetDirectBufferAddress(buffer.get_raw());
       if (dst_ptr)
       {
         // Codec specifics
@@ -949,7 +951,7 @@ void CDVDVideoCodecAndroidMediaCodec::FlushInternal()
   }
   m_inflight.clear();
 
-  for (size_t i = 0; i < m_output.size(); i++)
+  for (size_t i = 0; i < m_output.size(); i++)  // Deprecated as of API 21
   {
     m_inflight.push_back(
       new CDVDMediaCodecInfo(i, m_textureId, m_codec, m_surfaceTexture, m_frameAvailable)
@@ -1070,10 +1072,11 @@ int CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(void)
       return 0;
     }
 
+    // Deprecated as of API 21
     // some devices will return a valid index
     // before signaling INFO_OUTPUT_BUFFERS_CHANGED which
     // is used to setup m_output, D'uh. setup m_output here.
-    if (m_output.empty())
+    if (CJNIBase::GetSDKVersion() < 21 && m_output.empty())
     {
       m_output = m_codec->getOutputBuffers();
       if (xbmc_jnienv()->ExceptionCheck())
@@ -1109,20 +1112,32 @@ int CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(void)
 
     if (!m_render_sw)
     {
-      m_videobuffer.mediacodec = m_inflight[index]->Retain();
+      size_t i = 0;
+      for (; i < m_inflight.size(); ++i)
+      {
+        if (m_inflight[i]->GetIndex() == index)
+          break;
+      }
+      if (i == m_inflight.size())
+        m_inflight.push_back(
+          new CDVDMediaCodecInfo(index, m_textureId, m_codec, m_surfaceTexture, m_frameAvailable)
+        );
+      m_videobuffer.mediacodec = m_inflight[i]->Retain();
       m_videobuffer.mediacodec->Validate(true);
     }
     else
     {
       int size = bufferInfo.size();
       int offset = bufferInfo.offset();
 
-      if (!m_output[index].isDirect())
+      CJNIByteBuffer buffer = (CJNIBase::GetSDKVersion() < 21 ? m_output[index] : m_codec->getOutputBuffer(index));
+
+      if (!buffer.isDirect())
         CLog::Log(LOGWARNING, "CDVDVideoCodecAndroidMediaCodec:: m_output[index].isDirect == false");
 
-      if (size && m_output[index].capacity())
+      if (size && buffer.capacity())
       {
-        uint8_t *src_ptr = (uint8_t*)xbmc_jnienv()->GetDirectBufferAddress(m_output[index].get_raw());
+        uint8_t *src_ptr = (uint8_t*)xbmc_jnienv()->GetDirectBufferAddress(buffer.get_raw());
         src_ptr += offset;
 
         int loop_end = 0;
@@ -1176,14 +1191,17 @@ int CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(void)
   }
   else if (index == CJNIMediaCodec::INFO_OUTPUT_BUFFERS_CHANGED)
   {
-    m_output = m_codec->getOutputBuffers();
-    if (xbmc_jnienv()->ExceptionCheck())
+    if (CJNIBase::GetSDKVersion() < 21)
     {
-      CLog::Log(LOGERROR, "CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(INFO_OUTPUT_BUFFERS_CHANGED) ExceptionCheck: getOutputBuffers");
-      xbmc_jnienv()->ExceptionDescribe();
-      xbmc_jnienv()->ExceptionClear();
+      m_output = m_codec->getOutputBuffers();
+      if (xbmc_jnienv()->ExceptionCheck())
+      {
+        CLog::Log(LOGERROR, "CDVDVideoCodecAndroidMediaCodec::GetOutputPicture(INFO_OUTPUT_BUFFERS_CHANGED) ExceptionCheck: getOutputBuffers");
+        xbmc_jnienv()->ExceptionDescribe();
+        xbmc_jnienv()->ExceptionClear();
+      }
+      FlushInternal();
     }
-    FlushInternal();
   }
   else if (index == CJNIMediaCodec::INFO_OUTPUT_FORMAT_CHANGED)
   {