[FFmpeg-cvslog] avcodec/mpegvideo: also export 0,0 motion vectors

Michael Niedermayer git at videolan.org
Thu Jan 22 12:50:09 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jan 19 23:38:10 2015 +0100| [146a2c4e7fb68bf401b9747c171150560be23b4d] | committer: Michael Niedermayer

avcodec/mpegvideo: also export 0,0 motion vectors

Reviewed-by: Clément Bœsch <u at pkh.me>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=146a2c4e7fb68bf401b9747c171150560be23b4d
---

 libavcodec/mpegvideo.c              |    2 --
 tests/ref/fate/filter-codecview-mvs |   30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ce4fa59..6966572 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -2138,8 +2138,6 @@ static int add_mb(AVMotionVector *mb, uint32_t mb_type,
                   int src_x, int src_y,
                   int direction)
 {
-    if (dst_x == src_x && dst_y == src_y)
-        return 0;
     mb->w = IS_8X8(mb_type) || IS_8X16(mb_type) ? 8 : 16;
     mb->h = IS_8X8(mb_type) || IS_16X8(mb_type) ? 8 : 16;
     mb->src_x = src_x;
diff --git a/tests/ref/fate/filter-codecview-mvs b/tests/ref/fate/filter-codecview-mvs
index 82b571f..e2404f3 100644
--- a/tests/ref/fate/filter-codecview-mvs
+++ b/tests/ref/fate/filter-codecview-mvs
@@ -15,47 +15,47 @@
 0,         13,         13,        1,   276480, 0x5f7a0d4f
 0,         14,         14,        1,   276480, 0x5f7a0d4f
 0,         15,         15,        1,   276480, 0x5f7a0d4f
-0,         16,         16,        1,   276480, 0x5f7a0d4f
+0,         16,         16,        1,   276480, 0xc3b80edf
 0,         17,         17,        1,   276480, 0x5f7a0d4f
 0,         18,         18,        1,   276480, 0x5f7a0d4f
 0,         19,         19,        1,   276480, 0x5f7a0d4f
-0,         20,         20,        1,   276480, 0x5f7a0d4f
+0,         20,         20,        1,   276480, 0xc3b80edf
 0,         21,         21,        1,   276480, 0x5f7a0d4f
 0,         22,         22,        1,   276480, 0x5f7a0d4f
 0,         23,         23,        1,   276480, 0x5f7a0d4f
-0,         24,         24,        1,   276480, 0x5f7a0d4f
+0,         24,         24,        1,   276480, 0xc3b80edf
 0,         25,         25,        1,   276480, 0x5f7a0d4f
 0,         26,         26,        1,   276480, 0x5f7a0d4f
 0,         27,         27,        1,   276480, 0x5f7a0d4f
-0,         28,         28,        1,   276480, 0x5f7a0d4f
+0,         28,         28,        1,   276480, 0xc3b80edf
 0,         29,         29,        1,   276480, 0x5f7a0d4f
 0,         30,         30,        1,   276480, 0x5f7a0d4f
 0,         31,         31,        1,   276480, 0x5f7a0d4f
-0,         32,         32,        1,   276480, 0x5f7a0d4f
+0,         32,         32,        1,   276480, 0xc3b80edf
 0,         33,         33,        1,   276480, 0x75641594
 0,         34,         34,        1,   276480, 0x32ee3526
 0,         35,         35,        1,   276480, 0xcb53479a
-0,         36,         36,        1,   276480, 0x7ca9658e
+0,         36,         36,        1,   276480, 0xe1be6e26
 0,         37,         37,        1,   276480, 0x5ce39368
 0,         38,         38,        1,   276480, 0x4ec1e418
 0,         39,         39,        1,   276480, 0x23c418ae
-0,         40,         40,        1,   276480, 0x70ac4c76
+0,         40,         40,        1,   276480, 0x499c55d6
 0,         41,         41,        1,   276480, 0x166ef020
 0,         42,         42,        1,   276480, 0xaa0614ab
 0,         43,         43,        1,   276480, 0x8bc2fa2b
-0,         44,         44,        1,   276480, 0x07956a97
-0,         45,         45,        1,   276480, 0x6fcb808b
-0,         46,         46,        1,   276480, 0x841cf493
+0,         44,         44,        1,   276480, 0xc9c873f7
+0,         45,         45,        1,   276480, 0x99838153
+0,         46,         46,        1,   276480, 0x32e5f45b
 0,         47,         47,        1,   276480, 0xe7834514
-0,         48,         48,        1,   276480, 0xb805fcb1
+0,         48,         48,        1,   276480, 0x454c99c8
 0,         49,         49,        1,   276480, 0xe29bacc8
 0,         50,         50,        1,   276480, 0x6b79c3d3
-0,         51,         51,        1,   276480, 0x798c35c6
-0,         52,         52,        1,   276480, 0x1b31d2ed
+0,         51,         51,        1,   276480, 0x284d358e
+0,         52,         52,        1,   276480, 0x17552cd4
 0,         53,         53,        1,   276480, 0x6ceebf3e
 0,         54,         54,        1,   276480, 0x7ac8de3c
 0,         55,         55,        1,   276480, 0x14d6768c
-0,         56,         56,        1,   276480, 0xcb08af08
+0,         56,         56,        1,   276480, 0x59891e5f
 0,         57,         57,        1,   276480, 0xed3053ea
-0,         58,         58,        1,   276480, 0x015782fb
+0,         58,         58,        1,   276480, 0x9b0182c3
 0,         59,         59,        1,   276480, 0xf849eb88



More information about the ffmpeg-cvslog mailing list