Ticket #12954: t.patch

mythtv/libs/libmythtv/recorders/NuppelVideoRecorder.cpp

@@ -930 +930 @@
 
     if (!video_buffer_size)
     {
-        video_buffer_size =
-            buffersize(picture_format == AV_PIX_FMT_YUV422P ? FMT_YUV422P : FMT_YV12,
-                       w_out, h_out);
+        if (picture_format == AV_PIX_FMT_YUV422P)
+            video_buffer_size = w_out * h_out * 2;
+        else
+            video_buffer_size = w_out * h_out * 3 / 2;
     }
 
     if (width >= 480 || height > 288)
@@ -2877 +2878 @@
     lzo_uint out_len = OUT_LEN;
     struct rtframeheader frameheader;
     int raw = 0, compressthis = compression;
-    uint8_t *planes[3] = {
-        frame->buf + frame->offsets[0],
-        frame->buf + frame->offsets[1],
-        frame->buf + frame->offsets[2] };
+    uint8_t *planes[3];
+    int len = frame->size;
     int fnum = frame->frameNumber;
     long long timecode = frame->timecode;
+    unsigned char *buf = frame->buf;
 
     memset(&frameheader, 0, sizeof(frameheader));
 
+    planes[0] = buf;
+    planes[1] = planes[0] + frame->width * frame->height;
+    planes[2] = planes[1] + (frame->width * frame->height) /
+                            (picture_format == AV_PIX_FMT_YUV422P ? 2 : 4);
+
     if (lf == 0)
     {   // this will be triggered every new file
         lf = fnum;
@@ -2944 +2949 @@
     if (useavcodec)
     {
         MythAVFrame mpa_picture;
-        AVPictureFill(mpa_picture, frame);
+
+        switch (picture_format)
+        {
+            case AV_PIX_FMT_YUV420P:
+            case AV_PIX_FMT_YUV422P:
+            case AV_PIX_FMT_YUVJ420P:
+                mpa_picture->linesize[0] = w_out;
+                mpa_picture->linesize[1] = w_out / 2;
+                mpa_picture->linesize[2] = w_out / 2;
+                break;
+        }
+        mpa_picture->data[0] = planes[0];
+        mpa_picture->data[1] = planes[1];
+        mpa_picture->data[2] = planes[2];
+        mpa_picture->linesize[0] = frame->width;
+        mpa_picture->linesize[1] = frame->width / 2;
+        mpa_picture->linesize[2] = frame->width / 2;
 
         if (wantkeyframe)
             mpa_picture->pict_type = AV_PICTURE_TYPE_I;
@@ -2956 +2977 @@
             AVPacket packet;
             av_init_packet(&packet);
             packet.data = (uint8_t *)strm;
-            packet.size = frame->size;
+            packet.size = len;
 
             int got_packet = 0;
 
@@ -3000 +3021 @@
             tmp = rtjc->Compress(strm, planes);
         }
         else
-            tmp = frame->size;
+            tmp = len;
 
         // here is lzo compression afterwards
         if (compressthis)
         {
             int r = 0;
             if (raw)
-                r = lzo1x_1_compress((unsigned char*)frame->buf, frame->size,
+                r = lzo1x_1_compress((unsigned char*)buf, len,
                                      out, &out_len, wrkmem);
             else
                 r = lzo1x_1_compress((unsigned char *)strm, tmp, out,
@@ -3031 +3052 @@
         if (mpa_vidcodec->id == AV_CODEC_ID_RAWVIDEO)
         {
             frameheader.comptype = '0';
-            frameheader.packetlength = frame->size;
+            frameheader.packetlength = len;
             WriteFrameheader(&frameheader);
-            ringBuffer->Write(frame->buf, frame->size);
+            ringBuffer->Write(buf, len);
         }
         else if (hardware_encode)
         {
             frameheader.comptype = '4';
-            frameheader.packetlength = frame->size;
+            frameheader.packetlength = len;
             WriteFrameheader(&frameheader);
-            ringBuffer->Write(frame->buf, frame->size);
+            ringBuffer->Write(buf, len);
         }
         else
         {
@@ -3062 +3083 @@
         else
         {
             frameheader.comptype  = '0'; // raw YUV420
-            frameheader.packetlength = frame->size;
+            frameheader.packetlength = len;
             WriteFrameheader(&frameheader);
-            ringBuffer->Write(frame->buf, frame->size); // we write buf directly
+            ringBuffer->Write(buf, len); // we write buf directly
         }
     }
     else