diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 02:26:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 02:38:05 +0200 |
| commit | 58201c6e9eec306c7fe4cc0846fb8501f1157eac (patch) | |
| tree | 2de9b25b054fc8af0743aa63318c0d7198557f12 | |
| parent | db6d0a5bd2447b764d67bcd66741e8044a3d7c3f (diff) | |
| download | ffmpeg-58201c6e9eec306c7fe4cc0846fb8501f1157eac.tar.gz | |
avcodec/snowenc: correct fullpel search pattern
No real difference in quality, its a bit slower for the same dia_size as more
vectors are searched for the same dia_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/snowenc.c | 4 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth1-snow | 8 | ||||
| -rw-r--r-- | tests/ref/vsynth/vsynth1-snow-hpel | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index a8f4106355..1f0460943f 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1119,8 +1119,8 @@ static void iterative_me(SnowContext *s){ for(j=0; j<i; j++){ dia_change |= check_block_inter(s, mb_x, mb_y, newx+4*(i-j), newy+(4*j), obmc_edged, &best_rd); dia_change |= check_block_inter(s, mb_x, mb_y, newx-4*(i-j), newy-(4*j), obmc_edged, &best_rd); - dia_change |= check_block_inter(s, mb_x, mb_y, newx+4*(i-j), newy-(4*j), obmc_edged, &best_rd); - dia_change |= check_block_inter(s, mb_x, mb_y, newx-4*(i-j), newy+(4*j), obmc_edged, &best_rd); + dia_change |= check_block_inter(s, mb_x, mb_y, newx-(4*j), newy+4*(i-j), obmc_edged, &best_rd); + dia_change |= check_block_inter(s, mb_x, mb_y, newx+(4*j), newy-4*(i-j), obmc_edged, &best_rd); } } }while(dia_change); diff --git a/tests/ref/vsynth/vsynth1-snow b/tests/ref/vsynth/vsynth1-snow index 24c41674e1..bd29a3b2ff 100644 --- a/tests/ref/vsynth/vsynth1-snow +++ b/tests/ref/vsynth/vsynth1-snow @@ -1,4 +1,4 @@ -61915927233f94db766dd968e750d6a8 *tests/data/fate/vsynth1-snow.avi -136324 tests/data/fate/vsynth1-snow.avi -443a1fbdfea490453e790b7e99c0c8df *tests/data/fate/vsynth1-snow.out.rawvideo -stddev: 22.77 PSNR: 20.98 MAXDIFF: 172 bytes: 7603200/ 7603200 +09e7402e7a86a1b88c2470ce7b7c5479 *tests/data/fate/vsynth1-snow.avi +136222 tests/data/fate/vsynth1-snow.avi +1b666c20aab90bca35d45732ae6f539f *tests/data/fate/vsynth1-snow.out.rawvideo +stddev: 22.77 PSNR: 20.98 MAXDIFF: 173 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-snow-hpel b/tests/ref/vsynth/vsynth1-snow-hpel index 1c0691e33f..e12ca4e986 100644 --- a/tests/ref/vsynth/vsynth1-snow-hpel +++ b/tests/ref/vsynth/vsynth1-snow-hpel @@ -1,4 +1,4 @@ -a49202654daa09408565be55b2a18010 *tests/data/fate/vsynth1-snow-hpel.avi -138684 tests/data/fate/vsynth1-snow-hpel.avi -00a7d96a4829e4babbe496bb0d1a1cdc *tests/data/fate/vsynth1-snow-hpel.out.rawvideo -stddev: 22.74 PSNR: 20.99 MAXDIFF: 171 bytes: 7603200/ 7603200 +a7fcc538cb09bd0d9096690ebc0e12c3 *tests/data/fate/vsynth1-snow-hpel.avi +138572 tests/data/fate/vsynth1-snow-hpel.avi +654064845979137a336aa27cb9605f69 *tests/data/fate/vsynth1-snow-hpel.out.rawvideo +stddev: 22.74 PSNR: 20.99 MAXDIFF: 175 bytes: 7603200/ 7603200 |