[MPlayer-cvslog] r36245 - trunk/libmpcodecs/vd_ffmpeg.c

[reimar]

Author: reimar
Date: Tue May  7 22:39:14 2013
New Revision: 36245

Log:
Split init_vo and call only the necessary part from get_buffer.

This unbreaks mencoder which would run into a libavcodec
assert when trying to open the encoder from inside the
open function of the decoder.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Tue May  7 22:39:13 2013	(r36244)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Tue May  7 22:39:14 2013	(r36245)
@@ -494,37 +494,20 @@ static void draw_slice(struct AVCodecCon
     }
 }
 
-
-static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt)
-{
+static void update_configuration(sh_video_t *sh, enum AVPixelFormat pix_fmt) {
     vd_ffmpeg_ctx *ctx = sh->context;
-    AVCodecContext *avctx = ctx->avctx;
-    float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height;
-    int width, height;
-
-    width = avctx->width;
-    height = avctx->height;
-
-    // HACK!
-    // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
-    // use dimensions from BIH to avoid black borders at the right and bottom.
-    if (sh->bih && sh->ImageDesc) {
-        width = sh->bih->biWidth>>lavc_param_lowres;
-        height = sh->bih->biHeight>>lavc_param_lowres;
-    }
-
+    const AVCodecContext *avctx = ctx->avctx;
      // it is possible another vo buffers to be used after vo config()
      // lavc reset its buffers on width/heigh change but not on aspect change!!!
     if (av_cmp_q(avctx->sample_aspect_ratio, ctx->last_sample_aspect_ratio) ||
-        width != sh->disp_w  ||
-        height != sh->disp_h ||
         pix_fmt != ctx->pix_fmt ||
         !ctx->vo_initialized)
     {
+        float aspect= av_q2d(avctx->sample_aspect_ratio) * avctx->width / avctx->height;
         ctx->vo_initialized = 0;
         // this is a special-case HACK for MPEG-1/2 VDPAU that uses neither get_format nor
         // sets the value correctly in avcodec_open.
-        set_format_params(avctx, avctx->pix_fmt);
+        set_format_params(avctx, pix_fmt);
         mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
 
         // Do not overwrite s->aspect on the first call, so that a container
@@ -535,10 +518,35 @@ static int init_vo(sh_video_t *sh, enum 
         if (sh->aspect == 0 || ctx->last_sample_aspect_ratio.den)
             sh->aspect = aspect;
         ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
-        sh->disp_w = width;
-        sh->disp_h = height;
         ctx->pix_fmt = pix_fmt;
         ctx->best_csp = pixfmt2imgfmt(pix_fmt);
+    }
+}
+
+static int init_vo(sh_video_t *sh, enum AVPixelFormat pix_fmt)
+{
+    vd_ffmpeg_ctx *ctx = sh->context;
+    const AVCodecContext *avctx = ctx->avctx;
+    int width, height;
+
+    width = avctx->width;
+    height = avctx->height;
+
+    // HACK!
+    // if sh->ImageDesc is non-NULL, it means we decode QuickTime(tm) video.
+    // use dimensions from BIH to avoid black borders at the right and bottom.
+    if (sh->bih && sh->ImageDesc) {
+        width = sh->bih->biWidth>>lavc_param_lowres;
+        height = sh->bih->biHeight>>lavc_param_lowres;
+    }
+    if (width != sh->disp_w  || height != sh->disp_h)
+        ctx->vo_initialized = 0;
+
+    update_configuration(sh, pix_fmt);
+    if (!ctx->vo_initialized)
+    {
+        sh->disp_w = width;
+        sh->disp_h = height;
         if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, ctx->best_csp))
             return -1;
         ctx->vo_initialized = 1;
@@ -1004,7 +1012,7 @@ static enum AVPixelFormat get_format(str
     selected_format = fmt[i];
     if (selected_format == PIX_FMT_NONE) {
         selected_format = avcodec_default_get_format(avctx, fmt);
-        init_vo(sh, selected_format);
+        update_configuration(sh, selected_format);
     }
     set_format_params(avctx, selected_format);
     return selected_format;