avcodec/mpegvideo_enc: Set gob_index once during init

Andreas Rheinhardt committed 1 year ago

Commit 99187411 parent 7ae20272 files · +8 −13Browse files

Showing the changes to libavcodec (2 of 2 files). Show all

Unified · Split

2 files

@@ -842,6 +842,9 @@ av_cold void ff_h263_encode_init(MPVMainEncContext *const m) · 841 unmodified lines
842	if (s->c.modified_quant)	842	if (s->c.modified_quant)
843	s->c.chroma_qscale_table = ff_h263_chroma_qscale_table;	843	s->c.chroma_qscale_table = ff_h263_chroma_qscale_table;
844		844
		845	// Only used for H.263 and H.263+
		846	s->c.gob_index = H263_GOB_HEIGHT(s->c.height);
		847
845	// use fcodes >1 only for MPEG-4 & H.263 & H.263+ FIXME	848	// use fcodes >1 only for MPEG-4 & H.263 & H.263+ FIXME
846	switch(s->c.codec_id){	849	switch(s->c.codec_id){
847	case AV_CODEC_ID_H263P:	850	case AV_CODEC_ID_H263P:

         s->c.last_dc[0] = 128 * 8 / 13;
         s->c.last_dc[1] = 128 * 8 / 14;
         s->c.last_dc[2] = 128 * 8 / 14;
+#if CONFIG_MPEG4_ENCODER
+    } else if (s->c.partitioned_frame) {
+        av_assert1(s->c.codec_id == AV_CODEC_ID_MPEG4);
+        ff_mpeg4_init_partitions(s);
+#endif
     }
     s->c.mb_skip_run = 0;
     memset(s->c.last_mv, 0, sizeof(s->c.last_mv));
     s->last_mv_dir = 0;
-    switch (s->c.codec_id) {
-    case AV_CODEC_ID_H263:
-    case AV_CODEC_ID_H263P:
-    case AV_CODEC_ID_FLV1:
-        if (CONFIG_H263_ENCODER)
-            s->c.gob_index = H263_GOB_HEIGHT(s->c.height);
-        break;
-    case AV_CODEC_ID_MPEG4:
-        if (CONFIG_MPEG4_ENCODER && s->c.partitioned_frame)
-            ff_mpeg4_init_partitions(s);
-        break;
-    }
     s->c.resync_mb_x = 0;
     s->c.resync_mb_y = 0;
     s->c.first_slice_line = 1;

Keyboard shortcuts