RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

yadif: Improve pts calculation for is_second. 

Tested-by: Robert Nagy <ronag89@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Robert Nagy 2012-04-15 17:12:02 +02:00 committed by Michael Niedermayer
parent 7a3d2258a6
commit e90dfa6881
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/vf_yadif.c
View File

@ -218,9 +218,20 @@ static void return_frame(AVFilterContext *ctx, int is_second)
if (is_second) {
if (yadif->next->pts != AV_NOPTS_VALUE &&
yadif->cur->pts != AV_NOPTS_VALUE) {
yadif->out->pts =
(yadif->next->pts&yadif->cur->pts) +
((yadif->next->pts^yadif->cur->pts)>>1);
uint64_t next_pts = yadif->next->pts;
uint64_t cur_pts = yadif->cur->pts;
uint64_t prev_pts = yadif->prev->pts;
uint64_t ft = FFMIN3( cur_pts-prev_pts,
next_pts-cur_pts,
(next_pts-prev_pts)/2);
if(next_pts - cur_pts < 2*ft)
yadif->out->pts =
(next_pts&cur_pts) +
((next_pts^cur_pts)>>1);
else
yadif->out->pts = cur_pts + ft/2;
} else {
yadif->out->pts = AV_NOPTS_VALUE;
}