avcodec/ituh263enc: Inline value of h263_flv

It is always two when we encode FLV1.

Andreas Rheinhardt committed 1 year ago

Commit 532ae5d1 parent c660f453 files · +5 −10Browse files

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

Unified · Split

3 files

@@ -33,7 +33,7 @@ int ff_flv_encode_picture_header(MPVMainEncContext *const m) · 32 unmodified lines
33		33
34	put_bits(&s->pb, 17, 1);	34	put_bits(&s->pb, 17, 1);
35	/* 0: H.263 escape codes 1: 11-bit escape codes */	35	/* 0: H.263 escape codes 1: 11-bit escape codes */
36	put_bits(&s->pb, 5, (s->c.h263_flv - 1));	36	put_bits(&s->pb, 5, 1);
37	put_bits(&s->pb, 8,	37	put_bits(&s->pb, 8,
38	(((int64_t) s->c.picture_number * 30 * s->c.avctx->time_base.num) / // FIXME use timestamp	38	(((int64_t) s->c.picture_number * 30 * s->c.avctx->time_base.num) / // FIXME use timestamp
39	s->c.avctx->time_base.den) & 0xff); /* TemporalReference */	39	s->c.avctx->time_base.den) & 0xff); /* TemporalReference */

             code = get_rl_index(rl, last, run, level);
             put_bits(&s->pb, rl->table_vlc[code][1], rl->table_vlc[code][0]);
             if (code == rl->n) {
-                if (!CONFIG_FLV_ENCODER || s->c.h263_flv <= 1) {
+                if (!CONFIG_FLV_ENCODER || s->c.codec_id != AV_CODEC_ID_FLV1) {
                     put_bits(&s->pb, 1, last);
                     put_bits(&s->pb, 6, run);
 #if CONFIG_FLV_ENCODER
     case AV_CODEC_ID_FLV1:
         m->encode_picture_header = ff_flv_encode_picture_header;
-        if (s->c.h263_flv > 1) {
+        /* format = 1; 11-bit codes */
-            s->min_qcoeff= -1023;
+        s->min_qcoeff = -1023;
-            s->max_qcoeff=  1023;
+        s->max_qcoeff =  1023;
-        } else {
-            s->min_qcoeff= -127;
-            s->max_qcoeff=  127;
-        }
         break;
 #endif
     default: //nothing needed - default table already set in mpegvideo.c

@@ -936,7 +936,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) · 935 unmodified lines
936	break;	936	break;
937	case AV_CODEC_ID_FLV1:	937	case AV_CODEC_ID_FLV1:
938	s->c.out_format = FMT_H263;	938	s->c.out_format = FMT_H263;
939	s->c.h263_flv = 2; /* format = 1; 11-bit codes */
940	s->me.unrestricted_mv = 1;	939	s->me.unrestricted_mv = 1;
941	s->rtp_mode = 0; /* don't allow GOB */	940	s->rtp_mode = 0; /* don't allow GOB */
942	avctx->delay = 0;	941	avctx->delay = 0;

Keyboard shortcuts