Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec/motion_est: fix penalty_factor for b frames

Browse Source 
In direct_search() and ff_estimate_b_frame_motion(), penalty_factor
would be used before being initialized in estimate_motion_b(). Also,
the initialization would happen more than once unnecessarily.
release/7.1
Ramiro Polla 9 months ago
parent ceace488ff
commit 713c6eba8d
7 changed files with 26 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      libavcodec/motion_est.c
  2. 6
      tests/ref/vsynth/vsynth1-mpeg4-thread
  3. 6
      tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
  4. 8
      tests/ref/vsynth/vsynth2-mpeg4-adap
  5. 6
      tests/ref/vsynth/vsynth2-mpeg4-qprd
  6. 6
      tests/ref/vsynth/vsynth2-mpeg4-thread
  7. 4
      tests/ref/vsynth/vsynth_lena-mpeg4-rc

15
libavcodec/motion_est.c
Unescape View File

@ -1127,9 +1127,6 @@ static int estimate_motion_b(MpegEncContext *s, int mb_x, int mb_y,
const uint8_t * const mv_penalty = c->mv_penalty[f_code] + MAX_DMV; const uint8_t * const mv_penalty = c->mv_penalty[f_code] + MAX_DMV;
int mv_scale; int mv_scale;
c->penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp);
c->current_mv_penalty= mv_penalty; c->current_mv_penalty= mv_penalty;
get_limits(s, 16*mb_x, 16*mb_y); get_limits(s, 16*mb_x, 16*mb_y);
@ -1495,7 +1492,6 @@ void ff_estimate_b_frame_motion(MpegEncContext * s,
int mb_x, int mb_y) int mb_x, int mb_y)
{ {
MotionEstContext * const c= &s->me; MotionEstContext * const c= &s->me;
const int penalty_factor= c->mb_penalty_factor;
int fmin, bmin, dmin, fbmin, bimin, fimin; int fmin, bmin, dmin, fbmin, bimin, fimin;
int type=0; int type=0;
const int xy = mb_y*s->mb_stride + mb_x; const int xy = mb_y*s->mb_stride + mb_x;
@ -1517,22 +1513,27 @@ void ff_estimate_b_frame_motion(MpegEncContext * s,
return; return;
} }
c->penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
c->mb_penalty_factor = get_penalty_factor(s->lambda, s->lambda2, c->avctx->mb_cmp);
if (s->codec_id == AV_CODEC_ID_MPEG4) if (s->codec_id == AV_CODEC_ID_MPEG4)
dmin= direct_search(s, mb_x, mb_y); dmin= direct_search(s, mb_x, mb_y);
else else
dmin= INT_MAX; dmin= INT_MAX;
// FIXME penalty stuff for non-MPEG-4 // FIXME penalty stuff for non-MPEG-4
c->skip=0; c->skip=0;
fmin = estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) + fmin = estimate_motion_b(s, mb_x, mb_y, s->b_forw_mv_table, 0, s->f_code) +
3 * penalty_factor; 3 * c->mb_penalty_factor;
c->skip=0; c->skip=0;
bmin = estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) + bmin = estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) +
2 * penalty_factor; 2 * c->mb_penalty_factor;
ff_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]); ff_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]);
c->skip=0; c->skip=0;
fbmin= bidir_refine(s, mb_x, mb_y) + penalty_factor; fbmin= bidir_refine(s, mb_x, mb_y) + c->mb_penalty_factor;
ff_dlog(s, "%d %d %d %d\n", dmin, fmin, bmin, fbmin); ff_dlog(s, "%d %d %d %d\n", dmin, fmin, bmin, fbmin);
if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME) { if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_ME) {

6
tests/ref/vsynth/vsynth1-mpeg4-thread
Unescape View File

@ -1,4 +1,4 @@
369ace2f9613261af869efd9fbb3c149 *tests/data/fate/vsynth1-mpeg4-thread.avi 7761391e354266976a9e0155eff983dd *tests/data/fate/vsynth1-mpeg4-thread.avi
774754 tests/data/fate/vsynth1-mpeg4-thread.avi 774752 tests/data/fate/vsynth1-mpeg4-thread.avi
9aa327a244d5179acf7fe64dc1459bff *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo bbdbe9af4f5b106b847595bf3040699f *tests/data/fate/vsynth1-mpeg4-thread.out.rawvideo
stddev: 10.13 PSNR: 28.02 MAXDIFF: 183 bytes: 7603200/ 7603200 stddev: 10.13 PSNR: 28.02 MAXDIFF: 183 bytes: 7603200/ 7603200

6
tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd
Unescape View File

@ -1,4 +1,4 @@
907a30295ed8323780eee08e606af0ab *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video f612ea89aa79a7f7b93a8acf332705c4 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
269722 tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video 269723 tests/data/fate/vsynth2-mpeg2-ivlc-qprd.mpeg2video
d2d9793bf8f3427b5cc17a1be78ddd64 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.out.rawvideo 88e17886e6383755829d7da519fd5e79 *tests/data/fate/vsynth2-mpeg2-ivlc-qprd.out.rawvideo
stddev: 5.54 PSNR: 33.25 MAXDIFF: 94 bytes: 7603200/ 7603200 stddev: 5.54 PSNR: 33.25 MAXDIFF: 94 bytes: 7603200/ 7603200

8
tests/ref/vsynth/vsynth2-mpeg4-adap
Unescape View File

@ -1,4 +1,4 @@
06a397fe43dab7b6cf56870410fbbbaf *tests/data/fate/vsynth2-mpeg4-adap.avi 9465ef120d560537d8fcfb5564782e01 *tests/data/fate/vsynth2-mpeg4-adap.avi
203000 tests/data/fate/vsynth2-mpeg4-adap.avi 203004 tests/data/fate/vsynth2-mpeg4-adap.avi
686565d42d8ba5aea790824b04fa0a18 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo d7851ab1ca9744f8e618a24193e5ef76 *tests/data/fate/vsynth2-mpeg4-adap.out.rawvideo
stddev: 4.55 PSNR: 34.95 MAXDIFF: 84 bytes: 7603200/ 7603200 stddev: 4.56 PSNR: 34.95 MAXDIFF: 84 bytes: 7603200/ 7603200

6
tests/ref/vsynth/vsynth2-mpeg4-qprd
Unescape View File

@ -1,4 +1,4 @@
4ddd2fef35854d9b387bbcbda03dc7f0 *tests/data/fate/vsynth2-mpeg4-qprd.avi 33fc3d5507cc8d2c8b63b8f811e62e4c *tests/data/fate/vsynth2-mpeg4-qprd.avi
248706 tests/data/fate/vsynth2-mpeg4-qprd.avi 248734 tests/data/fate/vsynth2-mpeg4-qprd.avi
baa8d0d57a7fb5e393642cb20efed2c2 *tests/data/fate/vsynth2-mpeg4-qprd.out.rawvideo 61f8006e8903915056493fb1f05d1b2f *tests/data/fate/vsynth2-mpeg4-qprd.out.rawvideo
stddev: 4.85 PSNR: 34.40 MAXDIFF: 85 bytes: 7603200/ 7603200 stddev: 4.85 PSNR: 34.40 MAXDIFF: 85 bytes: 7603200/ 7603200

6
tests/ref/vsynth/vsynth2-mpeg4-thread
Unescape View File

@ -1,4 +1,4 @@
92128f8adc4ac70a66fdddf58e46b923 *tests/data/fate/vsynth2-mpeg4-thread.avi 44df605055498a01afb53eaaabdb94b4 *tests/data/fate/vsynth2-mpeg4-thread.avi
268396 tests/data/fate/vsynth2-mpeg4-thread.avi 268394 tests/data/fate/vsynth2-mpeg4-thread.avi
f432bd8d897c7c8e286e385b77cedcfa *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo 13240eaccc345bf4b45f24d44cfc5ca2 *tests/data/fate/vsynth2-mpeg4-thread.out.rawvideo
stddev: 4.89 PSNR: 34.34 MAXDIFF: 86 bytes: 7603200/ 7603200 stddev: 4.89 PSNR: 34.34 MAXDIFF: 86 bytes: 7603200/ 7603200

4
tests/ref/vsynth/vsynth_lena-mpeg4-rc
Unescape View File

@ -1,4 +1,4 @@
396a76466dee56e2714dfa42cebe3d2d *tests/data/fate/vsynth_lena-mpeg4-rc.avi 3ae5a2590bdd0e80a95bf374b06c553f *tests/data/fate/vsynth_lena-mpeg4-rc.avi
226314 tests/data/fate/vsynth_lena-mpeg4-rc.avi 226314 tests/data/fate/vsynth_lena-mpeg4-rc.avi
6e8b62e8c3bcbfdcc58afb69a0b1c4e3 *tests/data/fate/vsynth_lena-mpeg4-rc.out.rawvideo 27c8771df4154f2be317465a3d3cbd56 *tests/data/fate/vsynth_lena-mpeg4-rc.out.rawvideo
stddev: 4.23 PSNR: 35.60 MAXDIFF: 85 bytes: 7603200/ 7603200 stddev: 4.23 PSNR: 35.60 MAXDIFF: 85 bytes: 7603200/ 7603200

Write Preview
Loading…
Cancel
Save