History

avcodec/mpegvideo: Move loop_filter to {H263Dec,MPVEnc,VC1}Context

Andreas Rheinhardt committed 1 year ago

Commit abc54c21 parent 60f51bd21 files · +47 −45Browse files

Unified · Split

21 files
  1. libavcodec/dxva2_vc1.c +2 −2
  2. libavcodec/h261enc.c +2 −2
  3. libavcodec/h263dec.c +2 −2
  4. libavcodec/h263dec.h +1 −0
  5. libavcodec/intelh263dec.c +1 −1
  6. libavcodec/ituh263dec.c +4 −4
  7. libavcodec/ituh263enc.c +1 −1
  8. libavcodec/mpegvideo.h +0 −1
  9. libavcodec/mpegvideo_enc.c +5 −5
  10. libavcodec/mpegvideoenc.h +1 −0
  11. libavcodec/mss2.c +1 −1
  12. libavcodec/nvdec_vc1.c +1 −1
  13. libavcodec/rv10.c +3 −3
  14. libavcodec/rv20enc.c +1 −1
  15. libavcodec/vaapi_vc1.c +1 −1
  16. libavcodec/vc1.c +8 −8
  17. libavcodec/vc1.h +1 −0
  18. libavcodec/vc1_block.c +7 −7
  19. libavcodec/vdpau_vc1.c +1 −1
  20. libavcodec/wmv2dec.c +3 −3
  21. libavcodec/wmv2enc.c +1 −1
libavcodec/dxva2_vc1.c+2−2
@@ -108,7 +108,7 @@ void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx, · 107 unmodified lines
108108 pp->bRcontrol = v->rnd;
109109 pp->bPicSpatialResid8 = (v->panscanflag << 7) |
110110 (v->refdist_flag << 6) |
111− (s->loop_filter << 5) |
111+ (v->loop_filter << 5) |
112112 (v->fastuvmc << 4) |
113113 (v->extended_mv << 3) |
114114 (v->dquant << 1) |
@@ -121,7 +121,7 @@ void ff_dxva2_vc1_fill_picture_parameters(AVCodecContext *avctx, · 6 unmodified lines
121121 pp->bPicExtrapolation = (!v->interlace || v->fcm == PROGRESSIVE) ? 1 : 2;
122122 pp->bPicDeblocked = ((!pp->bPicBackwardPrediction && v->overlap) << 6) |
123123 ((v->profile != PROFILE_ADVANCED && v->rangeredfrm) << 5) |
124− (s->loop_filter << 1);
124+ (v->loop_filter << 1);
125125 pp->bPicDeblockConfined = (v->postprocflag << 7) |
126126 (v->broadcast << 6) |
127127 (v->interlace << 5) |
libavcodec/h261enc.c+2−2
@@ -266,9 +266,9 @@ static void h261_encode_mb(MPVEncContext *const s, int16_t block[6][64], · 265 unmodified lines
266266 if (!s->c.mb_intra) {
267267 com->mtype++;
268268
269− if (mvd || s->c.loop_filter)
269+ if (mvd || s->loop_filter)
270270 com->mtype += 3;
271− if (s->c.loop_filter)
271+ if (s->loop_filter)
272272 com->mtype += 3;
273273 if (cbp)
274274 com->mtype++;
libavcodec/h263dec.c+2−2
@@ -280,7 +280,7 @@ static int decode_slice(H263DecContext *const h) · 279 unmodified lines
280280 const int xy = h->c.mb_x + h->c.mb_y * h->c.mb_stride;
281281 if (ret == SLICE_END) {
282282 ff_mpv_reconstruct_mb(&h->c, h->block);
283− if (h->c.loop_filter)
283+ if (h->loop_filter)
284284 ff_h263_loop_filter(&h->c);
285285
286286 ff_er_add_slice(&h->c.er, h->c.resync_mb_x, h->c.resync_mb_y,
@@ -313,7 +313,7 @@ static int decode_slice(H263DecContext *const h) · 26 unmodified lines
313313 }
314314
315315 ff_mpv_reconstruct_mb(&h->c, h->block);
316− if (h->c.loop_filter)
316+ if (h->loop_filter)
317317 ff_h263_loop_filter(&h->c);
318318 }
319319
libavcodec/h263dec.h+1−0
@@ -66,6 +66,7 @@ typedef struct H263DecContext { · 65 unmodified lines
6666 int umvplus; ///< == H.263+ && unrestricted_mv
6767 int h263_slice_structured;
6868 int alt_inter_vlc; ///< alternative inter vlc
69+ int loop_filter;
6970 int modified_quant;
7071
7172 /* MPEG-4 specific */
libavcodec/intelh263dec.c+1−1
@@ -82,7 +82,7 @@ int ff_intel_h263_decode_picture_header(H263DecContext *const h) · 81 unmodified lines
8282 }
8383 if (get_bits(&h->gb, 2))
8484 av_log(h->c.avctx, AV_LOG_ERROR, "Bad value for reserved field\n");
85− h->c.loop_filter = get_bits1(&h->gb) * !h->c.avctx->lowres;
85+ h->loop_filter = get_bits1(&h->gb) * !h->c.avctx->lowres;
8686 if (get_bits1(&h->gb))
8787 av_log(h->c.avctx, AV_LOG_ERROR, "Bad value for reserved field\n");
8888 if (get_bits1(&h->gb))
libavcodec/ituh263dec.c+4−4
@@ -90,7 +90,7 @@ void ff_h263_show_pict_info(H263DecContext *const h, int h263_plus) · 89 unmodified lines
9090 h->c.h263_aic ? " AIC" : "",
9191 h->alt_inter_vlc ? " AIV" : "",
9292 h->modified_quant ? " MQ" : "",
93− h->c.loop_filter ? " LOOP" : "",
93+ h->loop_filter ? " LOOP" : "",
9494 h->h263_slice_structured ? " SS" : "",
9595 h->c.avctx->framerate.num, h->c.avctx->framerate.den);
9696 }
@@ -798,7 +798,7 @@ int ff_h263_decode_mb(H263DecContext *const h) · 701 unmodified lines
798798 h->c.cur_pic.mb_type[xy] = MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_FORWARD_MV;
799799 h->c.mv[0][0][0] = 0;
800800 h->c.mv[0][0][1] = 0;
801− h->c.mb_skipped = !(h->c.obmc | h->c.loop_filter);
801+ h->c.mb_skipped = !(h->c.obmc | h->loop_filter);
802802 goto end;
803803 }
804804 cbpc = get_vlc2(&h->gb, ff_h263_inter_MCBPC_vlc, INTER_MCBPC_VLC_BITS, 2);
@@ -1181,9 +1181,9 @@ int ff_h263_decode_picture_header(H263DecContext *const h) · 376 unmodified lines
11811181 }
11821182 h->c.obmc = get_bits1(&h->gb); /* Advanced prediction mode */
11831183 h->c.h263_aic = get_bits1(&h->gb); /* Advanced Intra Coding (AIC) */
1184− h->c.loop_filter = get_bits1(&h->gb);
1184+ h->loop_filter = get_bits1(&h->gb);
11851185 if (h->c.avctx->lowres)
1186− h->c.loop_filter = 0;
1186+ h->loop_filter = 0;
11871187
11881188 h->h263_slice_structured = get_bits1(&h->gb);
11891189 if (get_bits1(&h->gb) != 0) {
libavcodec/ituh263enc.c+1−1
@@ -285,7 +285,7 @@ static int h263_encode_picture_header(MPVMainEncContext *const m) · 284 unmodified lines
285285 put_bits(&s->pb,1,0); /* SAC: off */
286286 put_bits(&s->pb,1,s->c.obmc); /* Advanced Prediction Mode */
287287 put_bits(&s->pb,1,s->c.h263_aic); /* Advanced Intra Coding */
288− put_bits(&s->pb,1,s->c.loop_filter); /* Deblocking Filter */
288+ put_bits(&s->pb,1,s->loop_filter); /* Deblocking Filter */
289289 put_bits(&s->pb,1,s->h263_slice_structured); /* Slice Structured */
290290 put_bits(&s->pb,1,0); /* Reference Picture Selection: off */
291291 put_bits(&s->pb,1,0); /* Independent Segment Decoding: off */
libavcodec/mpegvideo.h+0−1
@@ -215,7 +215,6 @@ typedef struct MpegEncContext { · 214 unmodified lines
215215
216216 /* H.263+ specific */
217217 int h263_aic_dir; ///< AIC direction: 0 = left, 1 = top
218− int loop_filter;
219218
220219 /* MPEG-4 specific */
221220 int studio_profile;
libavcodec/mpegvideo_enc.c+5−5
@@ -654,7 +654,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) · 653 unmodified lines
654654 (s->mpv_flags & FF_MPV_FLAG_QP_RD)) &&
655655 !m->fixed_qscale;
656656
657− s->c.loop_filter = !!(avctx->flags & AV_CODEC_FLAG_LOOP_FILTER);
657+ s->loop_filter = !!(avctx->flags & AV_CODEC_FLAG_LOOP_FILTER);
658658
659659 if (avctx->rc_max_rate && !avctx->rc_buffer_size) {
660660 switch(avctx->codec_id) {
@@ -925,8 +925,8 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) · 264 unmodified lines
925925 /* Fx */
926926 s->c.h263_aic = (avctx->flags & AV_CODEC_FLAG_AC_PRED) ? 1 : 0;
927927 s->modified_quant = s->c.h263_aic;
928− s->c.loop_filter = (avctx->flags & AV_CODEC_FLAG_LOOP_FILTER) ? 1 : 0;
929− s->me.unrestricted_mv = s->c.obmc || s->c.loop_filter || s->umvplus;
928+ s->loop_filter = !!(avctx->flags & AV_CODEC_FLAG_LOOP_FILTER);
929+ s->me.unrestricted_mv = s->c.obmc || s->loop_filter || s->umvplus;
930930 s->flipflop_rounding = 1;
931931
932932 /* /Fx */
@@ -959,7 +959,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) · 26 unmodified lines
959959 // Set here to force allocation of dc_val;
960960 // will be set later on a per-frame basis.
961961 s->c.h263_aic = 1;
962− s->c.loop_filter = 1;
962+ s->loop_filter = 1;
963963 s->me.unrestricted_mv = 0;
964964 break;
965965 #endif
@@ -3603,7 +3603,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 2637 unmodified lines
36033603 s, s->new_pic->data[2] + s->c.mb_x*8 + s->c.mb_y*s->c.uvlinesize*chr_h,
36043604 s->c.dest[2], w>>1, h>>s->c.chroma_y_shift, s->c.uvlinesize);
36053605 }
3606− if (s->c.loop_filter) {
3606+ if (s->loop_filter) {
36073607 if (CONFIG_H263_ENCODER && s->c.out_format == FMT_H263)
36083608 ff_h263_loop_filter(&s->c);
36093609 }
libavcodec/mpegvideoenc.h+1−0
@@ -152,6 +152,7 @@ typedef struct MPVEncContext { · 151 unmodified lines
152152 int h263_slice_structured;
153153 int alt_inter_vlc; ///< alternative inter vlc
154154 int modified_quant;
155+ int loop_filter;
155156
156157 /* MJPEG specific */
157158 struct MJpegContext *mjpeg_ctx;
libavcodec/mss2.c+1−1
@@ -390,7 +390,7 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, · 389 unmodified lines
390390 if ((ret = init_get_bits8(&v->gb, buf, buf_size)) < 0)
391391 return ret;
392392
393− s->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL;
393+ v->loop_filter = avctx->skip_loop_filter < AVDISCARD_ALL;
394394
395395 if (ff_vc1_parse_frame_header(v, &v->gb) < 0) {
396396 av_log(v->s.avctx, AV_LOG_ERROR, "header error\n");
libavcodec/nvdec_vc1.c+1−1
@@ -94,7 +94,7 @@ static int nvdec_vc1_start_frame(AVCodecContext *avctx, · 93 unmodified lines
9494 .extended_mv = v->extended_mv,
9595 .dquant = v->dquant,
9696 .vstransform = v->vstransform,
97− .loopfilter = v->s.loop_filter,
97+ .loopfilter = v->loop_filter,
9898 .fastuvmc = v->fastuvmc,
9999 .overlap = v->overlap,
100100 .quantizer = v->quantizer_mode,
libavcodec/rv10.c+3−3
@@ -186,7 +186,7 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size) · 185 unmodified lines
186186 }
187187
188188 if (RV_GET_MINOR_VER(rv->sub_id) >= 2)
189− h->c.loop_filter = get_bits1(&h->gb) && !h->c.avctx->lowres;
189+ h->loop_filter = get_bits1(&h->gb) && !h->c.avctx->lowres;
190190
191191 if (RV_GET_MINOR_VER(rv->sub_id) <= 1)
192192 seq = get_bits(&h->gb, 8) << 7;
@@ -292,7 +292,7 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size) · 99 unmodified lines
292292 h->c.c_dc_scale_table = ff_mpeg1_dc_scale_table;
293293 }
294294 if (!h->c.avctx->lowres)
295− h->c.loop_filter = 1;
295+ h->loop_filter = 1;
296296
297297 if (h->c.avctx->debug & FF_DEBUG_PICT_INFO) {
298298 av_log(h->c.avctx, AV_LOG_INFO,
@@ -517,7 +517,7 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, · 218 unmodified lines
517517 if (h->c.pict_type != AV_PICTURE_TYPE_B)
518518 ff_h263_update_motion_val(&h->c);
519519 ff_mpv_reconstruct_mb(&h->c, h->block);
520− if (h->c.loop_filter)
520+ if (h->loop_filter)
521521 ff_h263_loop_filter(&h->c);
522522
523523 if (++h->c.mb_x == h->c.mb_width) {
libavcodec/rv20enc.c+1−1
@@ -55,7 +55,7 @@ int ff_rv20_encode_picture_header(MPVMainEncContext *const m) · 54 unmodified lines
5555 av_assert1(!s->alt_inter_vlc);
5656 av_assert1(!s->umvplus);
5757 av_assert1(s->modified_quant == 1);
58− av_assert1(s->c.loop_filter == 1);
58+ av_assert1(s->loop_filter == 1);
5959
6060 s->c.h263_aic = s->c.pict_type == AV_PICTURE_TYPE_I;
6161 if (s->c.h263_aic) {
libavcodec/vaapi_vc1.c+1−1
@@ -285,7 +285,7 @@ static int vaapi_vc1_start_frame(AVCodecContext *avctx, · 284 unmodified lines
285285 .broken_link = v->broken_link,
286286 .closed_entry = v->closed_entry,
287287 .panscan_flag = v->panscanflag,
288− .loopfilter = s->loop_filter,
288+ .loopfilter = v->loop_filter,
289289 },
290290 .conditional_overlap_flag = v->condover,
291291 .fast_uvmc_flag = v->fastuvmc,
libavcodec/vc1.c+8−8
@@ -300,13 +300,13 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo · 299 unmodified lines
300300 v->frmrtq_postproc = get_bits(gb, 3); //common
301301 // (bitrate-32kbps)/64kbps
302302 v->bitrtq_postproc = get_bits(gb, 5); //common
303− v->s.loop_filter = get_bits1(gb); //common
304− if (v->s.loop_filter == 1 && v->profile == PROFILE_SIMPLE) {
303+ v->loop_filter = get_bits1(gb); //common
304+ if (v->loop_filter == 1 && v->profile == PROFILE_SIMPLE) {
305305 av_log(avctx, AV_LOG_ERROR,
306306 "LOOPFILTER shall not be enabled in Simple Profile\n");
307307 }
308308 if (v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
309− v->s.loop_filter = 0;
309+ v->loop_filter = 0;
310310
311311 v->res_x8 = get_bits1(gb); //reserved
312312 v->multires = get_bits1(gb);
@@ -376,7 +376,7 @@ int ff_vc1_decode_sequence_header(AVCodecContext *avctx, VC1Context *v, GetBitCo · 63 unmodified lines
376376 "Rangered=%i, VSTransform=%i, Overlap=%i, SyncMarker=%i\n"
377377 "DQuant=%i, Quantizer mode=%i, Max B-frames=%i\n",
378378 v->profile, v->frmrtq_postproc, v->bitrtq_postproc,
379− v->s.loop_filter, v->multires, v->fastuvmc, v->extended_mv,
379+ v->loop_filter, v->multires, v->fastuvmc, v->extended_mv,
380380 v->rangered, v->vstransform, v->overlap, v->resync_marker,
381381 v->dquant, v->quantizer_mode, avctx->max_b_frames);
382382 return 0;
@@ -415,7 +415,7 @@ static int decode_sequence_header_adv(VC1Context *v, GetBitContext *gb) · 32 unmodified lines
415415 "LoopFilter=%i, ChromaFormat=%i, Pulldown=%i, Interlace: %i\n"
416416 "TFCTRflag=%i, FINTERPflag=%i\n",
417417 v->level, v->frmrtq_postproc, v->bitrtq_postproc,
418− v->s.loop_filter, v->chromaformat, v->broadcast, v->interlace,
418+ v->loop_filter, v->chromaformat, v->broadcast, v->interlace,
419419 v->tfcntrflag, v->finterpflag);
420420
421421 v->psf = get_bits1(gb);
@@ -501,9 +501,9 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex · 79 unmodified lines
501501 v->closed_entry = get_bits1(gb);
502502 v->panscanflag = get_bits1(gb);
503503 v->refdist_flag = get_bits1(gb);
504− v->s.loop_filter = get_bits1(gb);
504+ v->loop_filter = get_bits1(gb);
505505 if (v->s.avctx->skip_loop_filter >= AVDISCARD_ALL)
506− v->s.loop_filter = 0;
506+ v->loop_filter = 0;
507507 v->fastuvmc = get_bits1(gb);
508508 v->extended_mv = get_bits1(gb);
509509 v->dquant = get_bits(gb, 2);
@@ -544,7 +544,7 @@ int ff_vc1_decode_entry_point(AVCodecContext *avctx, VC1Context *v, GetBitContex · 34 unmodified lines
544544 "BrokenLink=%i, ClosedEntry=%i, PanscanFlag=%i\n"
545545 "RefDist=%i, Postproc=%i, FastUVMC=%i, ExtMV=%i\n"
546546 "DQuant=%i, VSTransform=%i, Overlap=%i, Qmode=%i\n",
547− v->broken_link, v->closed_entry, v->panscanflag, v->refdist_flag, v->s.loop_filter,
547+ v->broken_link, v->closed_entry, v->panscanflag, v->refdist_flag, v->loop_filter,
548548 v->fastuvmc, v->extended_mv, v->dquant, v->vstransform, v->overlap, v->quantizer_mode);
549549
550550 return 0;
libavcodec/vc1.h+1−0
@@ -220,6 +220,7 @@ typedef struct VC1Context{ · 219 unmodified lines
220220 int profile; ///< 2 bits, Profile
221221 int frmrtq_postproc; ///< 3 bits,
222222 int bitrtq_postproc; ///< 5 bits, quantized framerate-based postprocessing strength
223+ int loop_filter;
223224 int max_coded_width, max_coded_height;
224225 int fastuvmc; ///< Rounding of qpel vector to hpel ? (not in Simple)
225226 int extended_mv; ///< Ext MV in P/B (not in Simple)
libavcodec/vc1_block.c+7−7
@@ -2595,7 +2595,7 @@ static void vc1_decode_i_blocks(VC1Context *v) · 2594 unmodified lines
25952595 vc1_put_blocks_clamped(v, 0);
25962596 }
25972597
2598− if (v->s.loop_filter)
2598+ if (v->loop_filter)
25992599 ff_vc1_i_loop_filter(v);
26002600
26012601 if (get_bits_left(&v->gb) < 0) {
@@ -2733,7 +2733,7 @@ static int vc1_decode_i_blocks_adv(VC1Context *v) · 131 unmodified lines
27332733 if (v->overlap && (v->pq >= 9 || v->condover != CONDOVER_NONE))
27342734 ff_vc1_i_overlap_filter(v);
27352735 vc1_put_blocks_clamped(v, 1);
2736− if (v->s.loop_filter)
2736+ if (v->loop_filter)
27372737 ff_vc1_i_loop_filter(v);
27382738
27392739 if (get_bits_left(gb) < 0) {
@@ -2787,7 +2787,7 @@ static void vc1_decode_p_blocks(VC1Context *v) · 47 unmodified lines
27872787 break;
27882788 }
27892789
2790− apply_loop_filter = s->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY);
2790+ apply_loop_filter = v->loop_filter && !(s->avctx->skip_loop_filter >= AVDISCARD_NONKEY);
27912791 s->first_slice_line = 1;
27922792 memset(v->cbp_base, 0, sizeof(v->cbp_base[0]) * 3 * s->mb_stride);
27932793 for (s->mb_y = s->start_mb_y; s->mb_y < s->end_mb_y; s->mb_y++) {
@@ -2889,15 +2889,15 @@ static void vc1_decode_b_blocks(VC1Context *v) · 95 unmodified lines
28892889
28902890 if (v->fcm == ILACE_FIELD) {
28912891 vc1_decode_b_mb_intfi(v);
2892− if (v->s.loop_filter)
2892+ if (v->loop_filter)
28932893 ff_vc1_b_intfi_loop_filter(v);
28942894 } else if (v->fcm == ILACE_FRAME) {
28952895 vc1_decode_b_mb_intfr(v);
2896− if (v->s.loop_filter)
2896+ if (v->loop_filter)
28972897 ff_vc1_p_intfr_loop_filter(v);
28982898 } else {
28992899 vc1_decode_b_mb(v);
2900− if (v->s.loop_filter)
2900+ if (v->loop_filter)
29012901 ff_vc1_i_loop_filter(v);
29022902 }
29032903 if (get_bits_left(&v->gb) < 0 || get_bits_count(&v->gb) < 0) {
@@ -2951,7 +2951,7 @@ void ff_vc1_decode_blocks(VC1Context *v) · 47 unmodified lines
29512951 ff_intrax8_decode_picture(&v->x8, v->s.cur_pic.ptr,
29522952 &v->gb, &v->s.mb_x, &v->s.mb_y,
29532953 2 * v->pq + v->halfpq, v->pq * !v->pquantizer,
2954− v->s.loop_filter, v->s.low_delay);
2954+ v->loop_filter, v->s.low_delay);
29552955
29562956 ff_er_add_slice(&v->s.er, 0, 0,
29572957 (v->s.mb_x >> 1) - 1, (v->s.mb_y >> 1) - 1,
libavcodec/vdpau_vc1.c+1−1
@@ -83,7 +83,7 @@ static int vdpau_vc1_start_frame(AVCodecContext *avctx, · 82 unmodified lines
8383 info->extended_dmv = v->extended_dmv;
8484 info->overlap = v->overlap;
8585 info->vstransform = v->vstransform;
86− info->loopfilter = v->s.loop_filter;
86+ info->loopfilter = v->loop_filter;
8787 info->fastuvmc = v->fastuvmc;
8888 info->range_mapy_flag = v->range_mapy_flag;
8989 info->range_mapy = v->range_mapy;
libavcodec/wmv2dec.c+3−3
@@ -178,7 +178,7 @@ static int decode_ext_header(WMV2DecContext *w) · 177 unmodified lines
178178 fps = get_bits(&gb, 5);
179179 w->ms.bit_rate = get_bits(&gb, 11) * 1024;
180180 w->mspel_bit = get_bits1(&gb);
181− h->c.loop_filter = get_bits1(&gb);
181+ h->loop_filter = get_bits1(&gb);
182182 w->abt_flag = get_bits1(&gb);
183183 w->j_type_bit = get_bits1(&gb);
184184 w->top_left_mv_flag = get_bits1(&gb);
@@ -196,7 +196,7 @@ static int decode_ext_header(WMV2DecContext *w) · 11 unmodified lines
196196 "tl_mv_flag:%d, mbrl_bit:%d, code:%d, loop_filter:%d, "
197197 "slices:%d\n",
198198 fps, w->ms.bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit,
199− w->top_left_mv_flag, w->per_mb_rl_bit, code, h->c.loop_filter,
199+ w->top_left_mv_flag, w->per_mb_rl_bit, code, h->loop_filter,
200200 code);
201201 return 0;
202202 }
@@ -333,7 +333,7 @@ int ff_wmv2_decode_secondary_picture_header(H263DecContext *const h) · 130 unmodified lines
333333 ff_intrax8_decode_picture(&w->x8, h->c.cur_pic.ptr,
334334 &h->gb, &h->c.mb_x, &h->c.mb_y,
335335 2 * h->c.qscale, (h->c.qscale - 1) | 1,
336− h->c.loop_filter, h->c.low_delay);
336+ h->loop_filter, h->c.low_delay);
337337
338338 ff_er_add_slice(&h->c.er, 0, 0,
339339 (h->c.mb_x >> 1) - 1, (h->c.mb_y >> 1) - 1,
libavcodec/wmv2enc.c+1−1
@@ -59,7 +59,7 @@ static int encode_ext_header(WMV2EncContext *w) · 58 unmodified lines
5959 put_bits(&pb, 11, FFMIN(w->msmpeg4.m.bit_rate / 1024, 2047));
6060
6161 put_bits(&pb, 1, w->mspel_bit = 1);
62− put_bits(&pb, 1, s->c.loop_filter);
62+ put_bits(&pb, 1, s->loop_filter);
6363 put_bits(&pb, 1, w->abt_flag = 1);
6464 put_bits(&pb, 1, w->j_type_bit = 1);
6565 put_bits(&pb, 1, w->top_left_mv_flag = 0);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t