diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 05:08:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-30 14:17:10 +0200 |
| commit | 31619584556466e4beab98e9b04ed4c5ba0db178 (patch) | |
| tree | a283652cc29749acbd880aa1eeccbc979b434a8c | |
| parent | cbb2c95e47cd83cb65b2ce77cbb0296e85fa506b (diff) | |
| download | ffmpeg-31619584556466e4beab98e9b04ed4c5ba0db178.tar.gz | |
yadif: update frame rate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_yadif.c | 5 | ||||
| -rw-r--r-- | tests/ref/fate/filter-yadif-mode1 | 97 |
2 files changed, 68 insertions, 34 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c index afbd900af4..215c764c7b 100644 --- a/libavfilter/vf_yadif.c +++ b/libavfilter/vf_yadif.c @@ -405,11 +405,16 @@ static int null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) static int config_props(AVFilterLink *link) { + YADIFContext *yadif = link->src->priv; + link->time_base.num = link->src->inputs[0]->time_base.num; link->time_base.den = link->src->inputs[0]->time_base.den * 2; link->w = link->src->inputs[0]->w; link->h = link->src->inputs[0]->h; + if(yadif->mode&1) + link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1}); + return 0; } diff --git a/tests/ref/fate/filter-yadif-mode1 b/tests/ref/fate/filter-yadif-mode1 index a262353441..87bd18c362 100644 --- a/tests/ref/fate/filter-yadif-mode1 +++ b/tests/ref/fate/filter-yadif-mode1 @@ -1,34 +1,63 @@ -#tb 0: 1/25 -0, 9, 9, 1, 622080, 0x4440caef -0, 10, 10, 1, 622080, 0xa5cea88b -0, 11, 11, 1, 622080, 0xce67e69d -0, 12, 12, 1, 622080, 0x9a57891f -0, 13, 13, 1, 622080, 0xc171c0c5 -0, 14, 14, 1, 622080, 0x20db9890 -0, 15, 15, 1, 622080, 0xdb181d52 -0, 16, 16, 1, 622080, 0xc2b913d1 -0, 17, 17, 1, 622080, 0xf1d9c5fb -0, 18, 18, 1, 622080, 0x669c5775 -0, 19, 19, 1, 622080, 0x01921a16 -0, 20, 20, 1, 622080, 0xd5047bc9 -0, 21, 21, 1, 622080, 0xa8b006eb -0, 22, 22, 1, 622080, 0xf0e125a7 -0, 23, 23, 1, 622080, 0x4afe2976 -0, 24, 24, 1, 622080, 0x637fcbfe -0, 25, 25, 1, 622080, 0xd9a8f5ac -0, 26, 26, 1, 622080, 0x4540039f -0, 27, 27, 1, 622080, 0x3039906f -0, 28, 28, 1, 622080, 0x52872cf9 -0, 29, 29, 1, 622080, 0x82de12ee -0, 30, 30, 1, 622080, 0x7e849cc9 -0, 31, 31, 1, 622080, 0xffe6f770 -0, 32, 32, 1, 622080, 0xb67f3233 -0, 33, 33, 1, 622080, 0x15fe44b4 -0, 34, 34, 1, 622080, 0x380f8563 -0, 35, 35, 1, 622080, 0xb964d70f -0, 36, 36, 1, 622080, 0x4f60f7f4 -0, 37, 37, 1, 622080, 0xd0afb742 -0, 38, 38, 1, 622080, 0xb9a15294 -0, 39, 39, 1, 622080, 0xb70b01a9 -0, 40, 40, 1, 622080, 0xcb3a371f -0, 41, 41, 1, 622080, 0x82dfb1f2 +#tb 0: 1/50 +0, 18, 18, 1, 622080, 0x4440caef +0, 19, 19, 1, 622080, 0xa5cea88b +0, 20, 20, 1, 622080, 0xce67e69d +0, 21, 21, 1, 622080, 0x9a57891f +0, 22, 22, 1, 622080, 0x1dbdc653 +0, 23, 23, 1, 622080, 0xc171c0c5 +0, 24, 24, 1, 622080, 0x82c591d1 +0, 25, 25, 1, 622080, 0x20db9890 +0, 26, 26, 1, 622080, 0x8193740b +0, 27, 27, 1, 622080, 0xdb181d52 +0, 28, 28, 1, 622080, 0xcb219711 +0, 29, 29, 1, 622080, 0xc2b913d1 +0, 30, 30, 1, 622080, 0x1870783b +0, 31, 31, 1, 622080, 0xf1d9c5fb +0, 32, 32, 1, 622080, 0x7080590b +0, 33, 33, 1, 622080, 0x669c5775 +0, 34, 34, 1, 622080, 0x6df4175d +0, 35, 35, 1, 622080, 0x01921a16 +0, 36, 36, 1, 622080, 0x6b530e95 +0, 37, 37, 1, 622080, 0xd5047bc9 +0, 38, 38, 1, 622080, 0x7f9d66f7 +0, 39, 39, 1, 622080, 0xa8b006eb +0, 40, 40, 1, 622080, 0x338cda81 +0, 41, 41, 1, 622080, 0xf0e125a7 +0, 42, 42, 1, 622080, 0xb13797f8 +0, 43, 43, 1, 622080, 0x4afe2976 +0, 44, 44, 1, 622080, 0xb51e7ca4 +0, 45, 45, 1, 622080, 0x637fcbfe +0, 46, 46, 1, 622080, 0x353eed75 +0, 47, 47, 1, 622080, 0xd9a8f5ac +0, 48, 48, 1, 622080, 0xf93e92b0 +0, 49, 49, 1, 622080, 0x4540039f +0, 50, 50, 1, 622080, 0xd0811094 +0, 51, 51, 1, 622080, 0x3039906f +0, 52, 52, 1, 622080, 0xb04a3141 +0, 53, 53, 1, 622080, 0x52872cf9 +0, 54, 54, 1, 622080, 0x4ab84909 +0, 55, 55, 1, 622080, 0x82de12ee +0, 56, 56, 1, 622080, 0xa0fcb8fb +0, 57, 57, 1, 622080, 0x7e849cc9 +0, 58, 58, 1, 622080, 0x9003aebb +0, 59, 59, 1, 622080, 0xffe6f770 +0, 60, 60, 1, 622080, 0x153faa3e +0, 61, 61, 1, 622080, 0xb67f3233 +0, 62, 62, 1, 622080, 0xae724063 +0, 63, 63, 1, 622080, 0x15fe44b4 +0, 64, 64, 1, 622080, 0xeb4de77a +0, 65, 65, 1, 622080, 0x380f8563 +0, 66, 66, 1, 622080, 0x209ed8c7 +0, 67, 67, 1, 622080, 0xb964d70f +0, 68, 68, 1, 622080, 0xe2bbac96 +0, 69, 69, 1, 622080, 0x4f60f7f4 +0, 70, 70, 1, 622080, 0xe945441e +0, 71, 71, 1, 622080, 0xd0afb742 +0, 72, 72, 1, 622080, 0x8f8cbd5f +0, 73, 73, 1, 622080, 0xb9a15294 +0, 74, 74, 1, 622080, 0xbc3cf717 +0, 75, 75, 1, 622080, 0xb70b01a9 +0, 76, 76, 1, 622080, 0x0109f125 +0, 77, 77, 1, 622080, 0xcb3a371f +0, 78, 78, 1, 622080, 0x230c373f +0, 79, 79, 1, 622080, 0x82dfb1f2 |