Ticket #13186: 007_avpicture_plugins.patch

mythplugins/mytharchive/mytharchive/thumbfinder.cpp

@@ -56 +56 @@
 #include <mythimage.h>
 #include <mythconfig.h>
 
+extern "C" {
+#include "libavutil/imgutils.h"
+}
+
 #ifndef INT64_C    // Used in FFmpeg headers to define some constants
 #define INT64_C(v)   (v ## LL)
 #endif
@@ -788 +792 @@
 bool ThumbFinder::getFrameImage(bool needKeyFrame, int64_t requiredPTS)
 {
     AVPacket pkt;
-    AVPicture orig;
-    AVPicture retbuf;
-    memset(&orig, 0, sizeof(AVPicture));
-    memset(&retbuf, 0, sizeof(AVPicture));
+    AVFrame orig;
+    AVFrame retbuf;
+    memset(&orig, 0, sizeof(AVFrame));
+    memset(&retbuf, 0, sizeof(AVFrame));
 
     av_init_packet(&pkt);
 
@@ -840 +844 @@
 
     if (frameFinished)
     {
-        avpicture_fill(&retbuf, m_outputbuf, AV_PIX_FMT_RGB32, m_frameWidth, m_frameHeight);
-        AVPicture *tmp = m_frame;
+        // avpicture_fill(&retbuf, m_outputbuf, AV_PIX_FMT_RGB32, m_frameWidth, m_frameHeight);
+        av_image_fill_arrays(retbuf.data, retbuf.linesize, m_outputbuf,
+            AV_PIX_FMT_RGB32, m_frameWidth, m_frameHeight, IMAGE_ALIGN);
+        AVFrame *tmp = m_frame;
 
         m_deinterlacer->DeinterlaceSingle(tmp, tmp);
 

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -71 +71 @@
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include "external/pxsup2dast.h"
+#include "libavutil/imgutils.h"
 }
 
 // mytharchive headers
@@ -1634 +1635 @@
         return 1;
     }
     AVPacket pkt;
-    AVPicture orig;
-    AVPicture retbuf;
-    memset(&orig, 0, sizeof(AVPicture));
-    memset(&retbuf, 0, sizeof(AVPicture));
+    AVFrame orig;
+    AVFrame retbuf;
+    memset(&orig, 0, sizeof(AVFrame));
+    memset(&retbuf, 0, sizeof(AVFrame));
     MythAVCopy copyframe;
     MythPictureDeinterlacer deinterlacer(codecCtx->pix_fmt, width, height);
 
@@ -1693 +1694 @@
                         else if (filename.contains("%1"))
                             filename = filename.arg(thumbCount);
 
-                        avpicture_fill(&retbuf, outputbuf,
-                                       AV_PIX_FMT_RGB32, width, height);
+                        // avpicture_fill(&retbuf, outputbuf,
+                        //     AV_PIX_FMT_RGB32, width, height);
+                        av_image_fill_arrays(retbuf.data, retbuf.linesize, outputbuf,
+                            AV_PIX_FMT_RGB32, width, height, IMAGE_ALIGN);
 
                         AVFrame *tmp = frame;
-                        deinterlacer.DeinterlaceSingle((AVPicture*)tmp,
-                                                       (AVPicture*)tmp);
+                        deinterlacer.DeinterlaceSingle((AVFrame*)tmp,
+                                                       (AVFrame*)tmp);
 
                         copyframe.Copy(&retbuf, AV_PIX_FMT_RGB32,
-                                       (AVPicture*) tmp,
+                                       (AVFrame*) tmp,
                                        codecCtx->pix_fmt, width, height);
 
                         QImage img(outputbuf, width, height,