Ticket #2602: ffmpeg-telecine.diff

libavcodec/mpeg12enc.c

@@ -228 +228 @@
         s->timecode_frame_start = 0; // default is -1
     }
 
+    if (s->telecine) {
+        if (s->frame_rate_index != 1 && s->frame_rate_index != 2) {
+          av_log( avctx, AV_LOG_ERROR, "Telecine is only allowed with 24000/1001 or 24 fps input\n" );
+          return AVERROR(EINVAL);
+        }
+        if (!s->progressive_sequence) {
+          av_log( avctx, AV_LOG_ERROR, "Telecine is only allowed with progressive input\n" );
+          return AVERROR(EINVAL);
+        }
+    }
+
     return 0;
 }
 
@@ -275 +286 @@
         }
 
         put_bits(&s->pb, 4, s->aspect_ratio_info);
-        put_bits(&s->pb, 4, s->frame_rate_index);
+        put_bits(&s->pb, 4, s->frame_rate_index + (s->telecine ? 3 : 0));
 
         if (s->avctx->rc_max_rate) {
             v = (s->avctx->rc_max_rate + 399) / 400;
@@ -328 +339 @@
             put_bits(&s->pb, 3, s->avctx->profile); // profile
             put_bits(&s->pb, 4, s->avctx->level);   // level
 
-            put_bits(&s->pb, 1, s->progressive_sequence);
+            put_bits(&s->pb, 1, s->telecine ? 0 : s->progressive_sequence);
             put_bits(&s->pb, 2, s->chroma_format);
             put_bits(&s->pb, 2, s->width  >> 12);
             put_bits(&s->pb, 2, s->height >> 12);
@@ -463 +474 @@
 
     s->frame_pred_frame_dct = 1;
     if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
+        if (s->telecine) {
+            static const int
+                tff[4] = { 1, 0, 0, 1 },
+                rff[4] = { 1, 0, 1, 0 };
+            const size_t mod = picture_number & 0x3;
+            s->top_field_first = tff[mod];
+            s->repeat_first_field = rff[mod];
+        }
         put_header(s, EXT_START_CODE);
         put_bits(&s->pb, 4, 8);                 /* pic ext */
         if (s->pict_type == AV_PICTURE_TYPE_P ||
@@ -483 +502 @@
         av_assert0(s->picture_structure == PICT_FRAME);
         put_bits(&s->pb, 2, s->picture_structure);
         if (s->progressive_sequence)
-            put_bits(&s->pb, 1, 0);             /* no repeat */
+            put_bits(&s->pb, 1, s->telecine ? s->top_field_first : 0); /* no repeat */
         else
             put_bits(&s->pb, 1, s->current_picture_ptr->f->top_field_first);
         /* XXX: optimize the generation of this flag with entropy measures */
@@ -1175 +1194 @@
 #undef LEVEL
     FF_MPV_COMMON_OPTS
     FF_MPEG2_PROFILE_OPTS
+    { "telecine", "Apply 3:2 pulldown (soft telecine)", OFFSET(telecine), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
     { NULL },
 };
 

libavcodec/mpegvideo_enc.c

@@ -2001 +2001 @@
                 av_log(avctx, AV_LOG_ERROR,
                        "Internal error, negative bits\n");
 
-            av_assert1(s->repeat_first_field == 0);
+            av_assert1(s->repeat_first_field == 0 || s->telecine);
 
             vbv_delay = bits * 90000 / avctx->rc_max_rate;
             min_delay = (minbits * 90000LL + avctx->rc_max_rate - 1) /

libavcodec/mpegvideo.h

@@ -582 +582 @@
     int noise_reduction;
 
     int intra_penalty;
+    
+    int telecine;
 } MpegEncContext;
 
 /* mpegvideo_enc common options */