From 66bb1a7bccd279ed771e2d70cdb9126ab2f0e8d0 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sun, 23 Feb 2014 15:15:23 +0100
Subject: Fix DXR3 MPEG1 encoding.

Ref. https://bugs.debian.org/739458
---
 src/dxr3/ffmpeg_encoder.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
index 858087a2b..aba8ddbd4 100644
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -47,11 +47,6 @@
 
 #include "../combined/ffmpeg/ffmpeg_compat.h"
 
-/* buffer size for encoded mpeg1 stream; will hold one intra frame
- * at 640x480 typical sizes are <50 kB. 512 kB should be plenty */
-#define DEFAULT_BUFFER_SIZE 512*1024
-
-
 /* functions required by encoder api */
 static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame);
 static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame);
@@ -62,7 +57,6 @@ typedef struct lavc_data_s {
   encoder_data_t     encoder_data;
   AVCodecContext     *context;         /* handle for encoding */
   int                width, height;    /* width and height of the video frame */
-  uint8_t            *ffmpeg_buffer;   /* lavc buffer */
   AVFrame            *picture;         /* picture to be encoded */
   uint8_t            *out[3];          /* aligned buffer for YV12 data */
   uint8_t            *buf;     /* base address of YV12 buffer */
@@ -223,20 +217,13 @@ static int lavc_on_update_format(dxr3_driver_t *drv, dxr3_frame_t *frame)
   }
   lprintf("dxr3_mpeg_encoder: lavc MPEG1 codec opened.\n");
 
-  if (!this->ffmpeg_buffer)
-    this->ffmpeg_buffer = (unsigned char *)malloc(DEFAULT_BUFFER_SIZE); /* why allocate more than needed ?! */
-  if (!this->ffmpeg_buffer) {
-    xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-      "dxr3_mpeg_encoder: Couldn't allocate temp buffer for mpeg data\n");
-    return 0;
-  }
-
   return 1;
 }
 
 static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame)
 {
-  int size;
+  AVPacket pkt = { 0 };
+  int ret, got_output;
   lavc_data_t* this = (lavc_data_t *)drv->enc;
   ssize_t written;
 
@@ -252,25 +239,28 @@ static int lavc_on_display_frame(dxr3_driver_t *drv, dxr3_frame_t *frame)
   lavc_prepare_frame(this, drv, frame);
 
   /* do the encoding */
-  size = avcodec_encode_video(this->context, this->ffmpeg_buffer, DEFAULT_BUFFER_SIZE, this->picture);
+  ret = avcodec_encode_video2(this->context, &pkt, this->picture, &got_output);
 
   frame->vo_frame.free(&frame->vo_frame);
 
-  if (size < 0) {
+  if (ret < 0) {
       xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
         "dxr3_mpeg_encoder: encoding failed\n");
       return 0;
-  }
+  } else if (!got_output)
+      return 1;
 
-  written = write(drv->fd_video, this->ffmpeg_buffer, size);
+  written = write(drv->fd_video, pkt.data, pkt.size);
   if (written < 0) {
+      av_packet_unref(&pkt);
       xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
         "dxr3_mpeg_encoder: video device write failed (%s)\n", strerror(errno));
       return 0;
     }
-  if (written != size)
+  if (written != pkt.size)
       xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-        "dxr3_mpeg_encoder: Could only write %zd of %d mpeg bytes.\n", written, size);
+        "dxr3_mpeg_encoder: Could only write %zd of %d mpeg bytes.\n", written, pkt.size);
+  av_packet_unref(&pkt);
   return 1;
 }
 
-- 
cgit v1.2.3