virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avfilter/vf_decimate: change ts_unit to AVRational

Browse Source 
This might help with rounding differences between platforms

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-12-14 20:24:21 +01:00
parent 997de2e810
commit 1925eaeaa6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/vf_decimate.c
View File

@ -42,7 +42,7 @@ typedef struct {
AVFrame *last; ///< last frame from the previous queue AVFrame *last; ///< last frame from the previous queue
AVFrame **clean_src; ///< frame queue for the clean source AVFrame **clean_src; ///< frame queue for the clean source
int got_frame[2]; ///< frame request flag for each input stream int got_frame[2]; ///< frame request flag for each input stream
double ts_unit; ///< timestamp units for the output frames AVRational ts_unit; ///< timestamp units for the output frames
int64_t start_pts; ///< base for output timestamps int64_t start_pts; ///< base for output timestamps
uint32_t eof; ///< bitmask for end of stream uint32_t eof; ///< bitmask for end of stream
int hsub, vsub; ///< chroma subsampling values int hsub, vsub; ///< chroma subsampling values
@ -217,7 +217,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
av_frame_free(&frame); av_frame_free(&frame);
frame = dm->clean_src[i]; frame = dm->clean_src[i];
} }
frame->pts = outlink->frame_count * dm->ts_unit + frame->pts = av_rescale_q(outlink->frame_count, dm->ts_unit, (AVRational){1,0}) +
(dm->start_pts == AV_NOPTS_VALUE ? 0 : dm->start_pts); (dm->start_pts == AV_NOPTS_VALUE ? 0 : dm->start_pts);
ret = ff_filter_frame(outlink, frame); ret = ff_filter_frame(outlink, frame);
if (ret < 0) if (ret < 0)
@ -377,7 +377,7 @@ static int config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
outlink->w = inlink->w; outlink->w = inlink->w;
outlink->h = inlink->h; outlink->h = inlink->h;
dm->ts_unit = av_q2d(av_inv_q(av_mul_q(fps, outlink->time_base))); dm->ts_unit = av_inv_q(av_mul_q(fps, outlink->time_base));
return 0; return 0;
} }