[ingex-commits] ingex/studio ffmpeg-0.5-mpeg2-closed-gop-b-frames.patch, NONE, 1.1 ffmpeg-0.5-x264-require-check.patch, NONE, 1.1

[John F. <jo...@us...>]

Update of /cvsroot/ingex/ingex/studio
In directory vz-cvs-4.sog:/tmp/cvs-serv16288

Added Files:
	ffmpeg-0.5-mpeg2-closed-gop-b-frames.patch 
	ffmpeg-0.5-x264-require-check.patch 
Log Message:
Further patches to ffmpeg


--- NEW FILE: ffmpeg-0.5-mpeg2-closed-gop-b-frames.patch ---
diff -Naur ./libavcodec/mpeg12.c ../ffmpeg-0.5-mod//libavcodec/mpeg12.c
--- ./libavcodec/mpeg12.c	2009-03-02 05:20:00.000000000 +0000
+++ ../ffmpeg-0.5-mod//libavcodec/mpeg12.c	2010-12-26 12:20:34.000000000 +0000
@@ -30,6 +30,7 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "mpegvideo.h"
+#include "mpegvideo_common.h"
 
 #include "mpeg12.h"
 #include "mpeg12data.h"
@@ -2169,7 +2170,7 @@
     int drop_frame_flag;
     int time_code_hours, time_code_minutes;
     int time_code_seconds, time_code_pictures;
-    int closed_gop, broken_link;
+    int broken_link;
 
     init_get_bits(&s->gb, buf, buf_size*8);
 
@@ -2181,7 +2182,7 @@
     time_code_seconds = get_bits(&s->gb,6);
     time_code_pictures = get_bits(&s->gb,6);
 
-    closed_gop  = get_bits1(&s->gb);
+    s->closed_gop = get_bits1(&s->gb);
     /*broken_link indicate that after editing the
       reference frames of the first B-Frames after GOP I-Frame
       are missing (open gop)*/
@@ -2190,7 +2191,7 @@
     if(s->avctx->debug & FF_DEBUG_PICT_INFO)
         av_log(s->avctx, AV_LOG_DEBUG, "GOP (%2d:%02d:%02d.[%02d]) closed_gop=%d broken_link=%d\n",
             time_code_hours, time_code_minutes, time_code_seconds,
-            time_code_pictures, closed_gop, broken_link);
+            time_code_pictures, s->closed_gop, broken_link);
 }
 /**
  * Finds the end of the current frame in the bitstream.
@@ -2379,8 +2380,17 @@
                 int mb_y= start_code - SLICE_MIN_START_CODE;
 
                 if(s2->last_picture_ptr==NULL){
-                /* Skip B-frames if we do not have reference frames. */
-                    if(s2->pict_type==FF_B_TYPE) break;
+                /* Skip B-frames if we do not have reference frames and gop is not closed */
+                    if(s2->pict_type==FF_B_TYPE){
+                        int i;
+                        if(!s2->closed_gop)
+                            break;
+                        /* Allocate a dummy frame */
+                        i= ff_find_unused_picture(s2, 0);
+                        s2->last_picture_ptr= &s2->picture[i];
+                        if(alloc_picture(s2, s2->last_picture_ptr, 0) < 0)
+                            return -1;
+                    }
                 }
                 if(s2->next_picture_ptr==NULL){
                 /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
diff -Naur ./libavcodec/mpegvideo.c ../ffmpeg-0.5-mod//libavcodec/mpegvideo.c
--- ./libavcodec/mpegvideo.c	2009-02-27 15:51:15.000000000 +0000
+++ ../ffmpeg-0.5-mod//libavcodec/mpegvideo.c	2010-12-26 12:20:34.000000000 +0000
@@ -2074,6 +2074,7 @@
     s->current_picture_ptr = s->last_picture_ptr = s->next_picture_ptr = NULL;
 
     s->mb_x= s->mb_y= 0;
+    s->closed_gop= 0;
 
     s->parse_context.state= -1;
     s->parse_context.frame_start_found= 0;
diff -Naur ./libavcodec/mpegvideo.h ../ffmpeg-0.5-mod//libavcodec/mpegvideo.h
--- ./libavcodec/mpegvideo.h	2009-03-02 05:41:55.000000000 +0000
+++ ../ffmpeg-0.5-mod//libavcodec/mpegvideo.h	2010-12-26 12:20:34.000000000 +0000
@@ -311,6 +311,7 @@
     int *lambda_table;
     int adaptive_quant;         ///< use adaptive quantization
     int dquant;                 ///< qscale difference to prev qscale
+    int closed_gop;             ///< MPEG1/2 GOP is closed
     int pict_type;              ///< FF_I_TYPE, FF_P_TYPE, FF_B_TYPE, ...
     int last_pict_type; //FIXME removes
     int last_non_b_pict_type;   ///< used for mpeg4 gmc b-frames & ratecontrol

--- NEW FILE: ffmpeg-0.5-x264-require-check.patch ---
--- configure	2009-03-01 17:57:14.000000000 +0000
+++ ../ffmpeg-0.5-updated//configure	2011-01-10 15:44:23.000000000 +0000
@@ -1993,7 +1993,7 @@
 enabled libspeex   && require  libspeex speex/speex.h speex_decoder_init -lspeex
 enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
-enabled libx264    && require  libx264 x264.h x264_encoder_open -lx264 -lm &&
+enabled libx264    && require  libx264 x264.h x264_encoder_encode -lx264 -lm &&
                       { check_cpp_condition x264.h "X264_BUILD >= 65" ||
                         die "ERROR: libx264 version must be >= 0.65."; }
 enabled libxvid    && require  libxvid xvid.h xvid_global -lxvidcore