avcodec/ffv1enc: Fix slice coding mode 1 with rgb frames

Michael Niedermayer committed 1 year ago

Commit 99f0f6e1 parent 9899da82 files · +4 −5Browse files

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

Unified · Split

2 files

@@ -419,7 +419,7 @@ av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx) · 418 unmodified lines
419	if (f->version == 3) {	419	if (f->version == 3) {
420	f->micro_version = 4;	420	f->micro_version = 4;
421	} else if (f->version == 4)	421	} else if (f->version == 4)
422	f->micro_version = 4;	422	f->micro_version = 5;
423	f->combined_version += f->micro_version;	423	f->combined_version += f->micro_version;
424	put_symbol(&c, state, f->micro_version, 0);	424	put_symbol(&c, state, f->micro_version, 0);
425	}	425	}
@@ -1158,9 +1158,9 @@ retry: · 732 unmodified lines
1158	ret = encode_plane(f, sc, p->data[0] + psx + yp->linesize[0], width, height, p->linesize[0], 0, 2, ac);	1158	ret = encode_plane(f, sc, p->data[0] + psx + yp->linesize[0], width, height, p->linesize[0], 0, 2, ac);
1159	ret \|= encode_plane(f, sc, p->data[0] + 1 + psx + yp->linesize[0], width, height, p->linesize[0], 1, 2, ac);	1159	ret \|= encode_plane(f, sc, p->data[0] + 1 + psx + yp->linesize[0], width, height, p->linesize[0], 1, 2, ac);
1160	} else if (f->use32bit) {	1160	} else if (f->use32bit) {
1161	ret = encode_rgb_frame32(f, sc, planes, width, height, p->linesize);	1161	ret = encode_rgb_frame32(f, sc, planes, width, height, p->linesize, ac);
1162	} else {	1162	} else {
1163	ret = encode_rgb_frame(f, sc, planes, width, height, p->linesize);	1163	ret = encode_rgb_frame(f, sc, planes, width, height, p->linesize, ac);
1164	}	1164	}
1165		1165
1166	if (ac != AC_GOLOMB_RICE) {	1166	if (ac != AC_GOLOMB_RICE) {

 static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc,
                                     const uint8_t *src[4],
-                                    int w, int h, const int stride[4])
+                                    int w, int h, const int stride[4], int ac)
 {
     int x, y, p, i;
     const int ring_size = f->context_model ? 3 : 2;
     TYPE *sample[4][3];
-    const int ac = f->ac;
     const int pass1 = !!(f->avctx->flags & AV_CODEC_FLAG_PASS1);
     int lbd    = f->bits_per_raw_sample <= 8;
     int packed = !src[1];

Keyboard shortcuts