Ticket #13186: 004_avcodec_decode_video2.patch

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -3581 +3581 @@
     else
     {
         context->reordered_opaque = pkt->pts;
-        ret = avcodec_decode_video2(context, mpa_pic, &gotpicture, pkt);
+        //  SUGGESTION
+        //  Now that avcodec_decode_video2 is deprecated and replaced
+        //  by 2 calls (receive frame and send packet), this could be optimized
+        //  into separate routines or separate threads.
+        //  Also now that it always consumes a whole buffer some code
+        //  in the caller may be able to be optimized.
+        ret = avcodec_receive_frame(context, mpa_pic);
+        if (ret == 0)
+            gotpicture = 1;
+        if (ret == AVERROR(EAGAIN))
+            ret = 0;
+        if (ret == 0)
+            ret = avcodec_send_packet(context, pkt);
+        // The code assumes that there is always space to add a new
+        // packet. This seems risky but has always worked.
+        // It should actually check if (ret == AVERROR(EAGAIN)) and then keep
+        // the packet around and try it again after processing the frame
+        // received here.
     }
     avcodeclock->unlock();
 
     if (ret < 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "Unknown decoding error");
+        char error[AV_ERROR_MAX_STRING_SIZE];
+        LOG(VB_GENERAL, LOG_ERR, LOC +
+            QString("video decode error: %1 (%2)")
+            .arg(av_make_error_string(error, sizeof(error), ret))
+            .arg(gotpicture));
         return false;
     }
 

mythtv/libs/libmythtv/mhi.cpp

@@ -1873 +1873 @@
     MythAVFrame picture;
     AVPacket pkt;
     uint8_t *buff = NULL;
-    int gotPicture = 0, len;
+    bool gotPicture = false;
+    int len;
     m_image = QImage();
 
     // Find the mpeg2 video decoder.
@@ -1895 +1896 @@
     memcpy(pkt.data, data, length);
     buff = pkt.data;
 
-    while (pkt.size > 0 && ! gotPicture)
+    // Get a picture from the packet. Allow 9 loops for
+    // packet to be decoded. It should take only 2-3 loops
+    for (int limit=0; limit<10 && !gotPicture; limit++)
     {
-        len = avcodec_decode_video2(c, picture, &gotPicture, &pkt);
-        if (len < 0) // Error
-            goto Close;
-        pkt.data += len;
-        pkt.size -= len;
-    }
-
-    if (!gotPicture)
-    {
-        pkt.data = NULL;
-        pkt.size = 0;
-        // Process any buffered data
-        if (avcodec_decode_video2(c, picture, &gotPicture, &pkt) < 0)
+        len = avcodec_receive_frame(c, picture);
+        if (len == 0)
+            gotPicture = true;
+        if (len == AVERROR(EAGAIN))
+            len = 0;
+        if (len == 0)
+            len = avcodec_send_packet(c, &pkt);
+        if (len == AVERROR(EAGAIN) || len == AVERROR_EOF)
+            len = 0;
+        else if (len < 0) // Error
+        {
+            char error[AV_ERROR_MAX_STRING_SIZE];
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("[mhi] video decode error: %1 (%2)")
+                .arg(av_make_error_string(error, sizeof(error), len))
+                .arg(gotPicture));
             goto Close;
+        }
+        else
+        {
+            pkt.data = NULL;
+            pkt.size = 0;
+        }
     }
 
     if (gotPicture)

mythtv/libs/libmythtv/nuppeldecoder.cpp

@@ -923 +923 @@
         {
             QMutexLocker locker(avcodeclock);
             // if directrendering, writes into buf
-            int gotpicture = 0;
-            int ret = avcodec_decode_video2(mpa_vidctx, mpa_pic, &gotpicture,
-                                            &pkt);
+            bool gotpicture = false;
+            //  SUGGESTION
+            //  Now that avcodec_decode_video2 is deprecated and replaced
+            //  by 2 calls (receive frame and send packet), this could be optimized
+            //  into separate routines or separate threads.
+            //  Also now that it always consumes a whole buffer some code
+            //  in the caller may be able to be optimized.
+            int ret = avcodec_receive_frame(mpa_vidctx, mpa_pic);
+            if (ret == 0)
+                gotpicture = true;
+            if (ret == AVERROR(EAGAIN))
+                ret = 0;
+            if (ret == 0)
+                ret = avcodec_send_packet(mpa_vidctx, &pkt);
             directframe = NULL;
+            // The code assumes that there is always space to add a new
+            // packet. This seems risky but has always worked.
+            // It should actually check if (ret == AVERROR(EAGAIN)) and then keep
+            // the packet around and try it again after processing the frame
+            // received here.
             if (ret < 0)
             {
-                LOG(VB_PLAYBACK, LOG_ERR, LOC +
-                    QString("avcodec_decode_video returned: %1").arg(ret));
-                return false;
+                char error[AV_ERROR_MAX_STRING_SIZE];
+                LOG(VB_GENERAL, LOG_ERR, LOC +
+                    QString("video decode error: %1 (%2)")
+                    .arg(av_make_error_string(error, sizeof(error), ret))
+                    .arg(gotpicture));
             }
-            else if (!gotpicture)
+            if (!gotpicture)
             {
                 return false;
             }