Changeset 8611c6e68 in mythtv

Timestamp:

Sep 24, 2012, 2:09:07 AM (12 years ago)

Author:

Gavin Hurlbut <ghurlbut@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/0.26, fixes/0.27, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

c7f0676059

Parents:

2353ef9ce

git-author:

Gavin Hurlbut <ghurlbut@…> (09/24/12 02:09:07)

git-committer:

Gavin Hurlbut <ghurlbut@…> (09/24/12 06:59:37)

Message:

Fix video encode in MPEG2 "lossless" transcoding

Fixes #11118

It seems that the new video encode API call pipelines the encoding, returning
after each input frame, but not returning a packet the first time around in all
cases. This change makes it encode the packet, and then keep calling the API
until a packet has actually been encoded (flushing the output).

Location:

mythtv/programs/mythtranscode

Files:

• mpeg2fix.cpp (modified) (5 diffs)
• mpeg2fix.h (modified) (1 diff)

mythtv/programs/mythtranscode/mpeg2fix.cpp

@@ -1064 +1064 @@
 }
 
-int MPEG2fixup::BuildFrame(AVPacket *pkt, QString fname)
+bool MPEG2fixup::BuildFrame(AVPacket *pkt, QString fname)
 {
     const mpeg2_info_t *info;
@@ -1075 +1075 @@
     info = mpeg2_info(img_decoder);
     if (!info->display_fbuf)
-        return 1;
+        return true;
 
     outbuf_size = info->sequence->width * info->sequence->height * 2;
@@ -1117 +1117 @@
         free(picture);
         LOG(VB_GENERAL, LOG_ERR, "Couldn't find MPEG2 encoder");
-        return 1;
+        return true;
     }
 
     c = avcodec_alloc_context3(NULL);
-
-    //We disable all optimizations for the time being.  There shouldn't be too
-    //much encoding going on, and the optimizations have been shown to cause
-    //corruption in some cases
-    c->dsp_mask = 0xffff;
 
     //NOTE: The following may seem wrong, but avcodec requires
@@ -1165 +1160 @@
         free(picture);
         LOG(VB_GENERAL, LOG_ERR, "could not open codec");
-        return 1;
+        return true;
     }
 
     int got_packet = 0;
-
-    int ret = avcodec_encode_video2(c, pkt, picture, &got_packet);
-
-    if (ret < 0 || !got_packet)
-    {
-        free(picture);
-        LOG(VB_GENERAL, LOG_ERR,
-            QString("avcodec_encode_video failed (%1)").arg(pkt->size));
-        return 1;
+    int ret;
+    bool initial = true;
+
+    // Need to call this repeatedly as it seems to be pipelined.  The first
+    // call will return no packet, then the second one will flush it.  In case
+    // it becomes more pipelined, just loop until it creates a packet or errors
+    // out.
+    while (!got_packet)
+    {
+        ret = avcodec_encode_video2(c, pkt, (initial ? picture : NULL),
+                                             &got_packet);
+
+        if (ret < 0)
+        {
+            free(picture);
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("avcodec_encode_video2 failed (%1)").arg(ret));
+            return true;
+        }
     }
 
@@ -1199 +1204 @@
     av_freep(&picture);
 
-    return 0;
+    return false;
 }
 

mythtv/programs/mythtranscode/mpeg2fix.h

@@ -172 +172 @@
     void WriteYUV(QString filename, const mpeg2_info_t *info);
     void WriteData(QString filename, uint8_t *data, int size);
-    int BuildFrame(AVPacket *pkt, QString fname);
+    bool BuildFrame(AVPacket *pkt, QString fname);
     MPEG2frame *GetPoolFrame(AVPacket *pkt);
     MPEG2frame *GetPoolFrame(MPEG2frame *f);