virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpegvideo: Move mb_skip_run to {RV34Dec,MPVEnc}Context

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-20 12:21:20 +02:00
parent d5fa282936
commit 2089d39735
8 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/h261enc.c
View File

@ -92,7 +92,7 @@ static int h261_encode_picture_header(MPVMainEncContext *const m)
put_bits(&s->pb, 1, 0); /* no PEI */
h->gob_number = h->format - 1;
s->c.mb_skip_run = 0;
s->mb_skip_run = 0;
return 0;
}
@ -112,7 +112,7 @@ static void h261_encode_gob_header(MPVEncContext *const s, int mb_line)
put_bits(&s->pb, 4, h->gob_number); /* GN */
put_bits(&s->pb, 5, s->c.qscale); /* GQUANT */
put_bits(&s->pb, 1, 0); /* no GEI */
s->c.mb_skip_run = 0;
s->mb_skip_run = 0;
s->c.last_mv[0][0][0] = 0;
s->c.last_mv[0][0][1] = 0;
}
@ -248,7 +248,7 @@ static void h261_encode_mb(MPVEncContext *const s, int16_t block[6][64],
if ((cbp | mvd) == 0) {
/* skip macroblock */
s->c.mb_skip_run++;
s->mb_skip_run++;
s->c.last_mv[0][0][0] = 0;
s->c.last_mv[0][0][1] = 0;
s->c.qscale -= s->dquant;
@ -258,9 +258,9 @@ static void h261_encode_mb(MPVEncContext *const s, int16_t block[6][64],
/* MB is not skipped, encode MBA */
put_bits(&s->pb,
ff_h261_mba_bits[s->c.mb_skip_run],
ff_h261_mba_code[s->c.mb_skip_run]);
s->c.mb_skip_run = 0;
ff_h261_mba_bits[s->mb_skip_run],
ff_h261_mba_code[s->mb_skip_run]);
s->mb_skip_run = 0;
/* calculate MTYPE */
if (!s->c.mb_intra) {

8
libavcodec/mpeg12enc.c
View File

@ -688,7 +688,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *const s,
((s->c.mv_dir & MV_DIR_BACKWARD)
? ((s->c.mv[1][0][0] - s->c.last_mv[1][0][0]) |
(s->c.mv[1][0][1] - s->c.last_mv[1][0][1])) : 0)) == 0))) {
s->c.mb_skip_run++;
s->mb_skip_run++;
s->c.qscale -= s->dquant;
s->misc_bits++;
s->last_bits++;
@ -700,10 +700,10 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *const s,
}
} else {
if (first_mb) {
av_assert0(s->c.mb_skip_run == 0);
av_assert0(s->mb_skip_run == 0);
encode_mb_skip_run(s, s->c.mb_x);
} else {
encode_mb_skip_run(s, s->c.mb_skip_run);
encode_mb_skip_run(s, s->mb_skip_run);
}
if (s->c.pict_type == AV_PICTURE_TYPE_I) {
@ -925,7 +925,7 @@ static av_always_inline void mpeg1_encode_mb_internal(MPVEncContext *const s,
for (i = 0; i < mb_block_count; i++)
if (cbp & (1 << (mb_block_count - 1 - i)))
mpeg1_encode_block(s, block[i], i);
s->c.mb_skip_run = 0;
s->mb_skip_run = 0;
if (s->c.mb_intra)
s->i_tex_bits += get_bits_diff(s);
else

1
libavcodec/mpegvideo.h
View File

@ -196,7 +196,6 @@ typedef struct MpegEncContext {
/* macroblock layer */
int mb_x, mb_y;
int mb_skip_run;
int mb_intra;
int block_index[6]; ///< index to current MB in block based arrays with edges

11
libavcodec/mpegvideo_enc.c
View File

@ -2647,11 +2647,12 @@ typedef struct MBBackup {
int last_mv[2][2][2];
int mv_type, mv_dir;
int last_dc[3];
int mb_intra, mb_skipped, mb_skip_run;
int mb_intra, mb_skipped;
int qscale;
int block_last_index[8];
int interlaced_dct;
} c;
int mb_skip_run;
int mv_bits, i_tex_bits, p_tex_bits, i_count, misc_bits, last_bits;
int dquant;
int esc3_level_length;
@ -2667,7 +2668,7 @@ static inline void BEFORE ##_context_before_encode(DST_TYPE *const d, \
memcpy(d->c.last_mv, s->c.last_mv, 2*2*2*sizeof(int)); \
\
/* MPEG-1 */ \
d->c.mb_skip_run = s->c.mb_skip_run; \
d->mb_skip_run = s->mb_skip_run; \
for (int i = 0; i < 3; i++) \
d->c.last_dc[i] = s->c.last_dc[i]; \
\
@ -2695,7 +2696,7 @@ static inline void AFTER ## _context_after_encode(DST_TYPE *const d, \
memcpy(d->c.last_mv, s->c.last_mv, 2*2*2*sizeof(int)); \
\
/* MPEG-1 */ \
d->c.mb_skip_run = s->c.mb_skip_run; \
d->mb_skip_run = s->mb_skip_run; \
for (int i = 0; i < 3; i++) \
d->c.last_dc[i] = s->c.last_dc[i]; \
\
@ -3029,7 +3030,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
ff_mpeg4_init_partitions(s);
#endif
}
s->c.mb_skip_run = 0;
s->mb_skip_run = 0;
memset(s->c.last_mv, 0, sizeof(s->c.last_mv));
s->last_mv_dir = 0;
@ -3108,7 +3109,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
if (s->c.mb_x == 0 && s->c.mb_y != 0) is_gob_start = 1;
case AV_CODEC_ID_MPEG1VIDEO:
if (s->c.codec_id == AV_CODEC_ID_MPEG1VIDEO && s->c.mb_y >= 175 ||
s->c.mb_skip_run)
s->mb_skip_run)
is_gob_start=0;
break;
case AV_CODEC_ID_MJPEG:

2
libavcodec/mpegvideoenc.h
View File

@ -136,6 +136,8 @@ typedef struct MPVEncContext {
int misc_bits; ///< cbp, mb_type
int last_bits; ///< temp var used for calculating the above vars
int mb_skip_run;
/* H.263 specific */
int mb_info; ///< interval for outputting info about mb offsets as side data
int prev_mb_info, last_mb_info;

4
libavcodec/rv34.c
View File

@ -1364,7 +1364,7 @@ static int check_slice_end(RV34DecContext *r, MpegEncContext *s)
return 1;
if (!r->mb_num_left)
return 1;
if(r->s.mb_skip_run > 1)
if (r->mb_skip_run > 1)
return 0;
bits = get_bits_left(&r->gb);
if (bits <= 0 || (bits < 8 && !show_bits(&r->gb, bits)))
@ -1447,7 +1447,7 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
r->si.end = end;
s->qscale = r->si.quant;
r->mb_num_left = r->si.end - r->si.start;
r->s.mb_skip_run = 0;
r->mb_skip_run = 0;
mb_pos = s->mb_x + s->mb_y * s->mb_width;
if(r->si.start != mb_pos){

1
libavcodec/rv34.h
View File

@ -99,6 +99,7 @@ typedef struct RV34DecContext{
SliceInfo si; ///< current slice information
int mb_num_left; ///< number of MBs left in this video packet
int mb_skip_run;
int *mb_type; ///< internal macroblock types
int block_type; ///< current block type

8
libavcodec/rv40.c
View File

@ -231,13 +231,13 @@ static int rv40_decode_mb_info(RV34DecContext *r)
int prev_type = 0;
int mb_pos = s->mb_x + s->mb_y * s->mb_stride;
if(!r->s.mb_skip_run) {
r->s.mb_skip_run = get_interleaved_ue_golomb(gb) + 1;
if(r->s.mb_skip_run > (unsigned)s->mb_num)
if (!r->mb_skip_run) {
r->mb_skip_run = get_interleaved_ue_golomb(gb) + 1;
if (r->mb_skip_run > (unsigned)s->mb_num)
return -1;
}
if(--r->s.mb_skip_run)
if (--r->mb_skip_run)
return RV34_MB_SKIP;
if(r->avail_cache[6-4]){