GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-29 15:11:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

video: use dts as fallback when determining pts by sorting

Browse Source 
This makes the new code equivalent with the old one, which often passed
dts as pts. Also rename some variables to clear up things.
This commit is contained in:
wm4
2013-11-27 21:13:42 +01:00
parent fb508105d1
commit 55070ea85f
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
video/decode/dec_video.c
+10 -11
View File
@@ -249,17 +249,16 @@ struct mp_image *video_decode(struct dec_video *d_video,
struct demux_packet *packet,
int drop_frame)
{
mp_image_t *mpi = NULL;
struct MPOpts *opts = d_video->opts;
bool sort_pts = opts->user_pts_assoc_mode != 1 && opts->correct_pts;
double pts = packet ? packet->pts : MP_NOPTS_VALUE;
double dts = packet ? packet->dts : MP_NOPTS_VALUE;
double pkt_pts = packet ? packet->pts : MP_NOPTS_VALUE;
double pkt_dts = packet ? packet->dts : MP_NOPTS_VALUE;
double pdts = pts == MP_NOPTS_VALUE ? dts : pts;
if (pdts != MP_NOPTS_VALUE)
d_video->last_packet_pdts = pdts;
double pkt_pdts = pkt_pts == MP_NOPTS_VALUE ? pkt_dts : pkt_pts;
if (pkt_pdts != MP_NOPTS_VALUE)
d_video->last_packet_pdts = pkt_pdts;
if (sort_pts && pts != MP_NOPTS_VALUE) {
if (sort_pts && pkt_pdts != MP_NOPTS_VALUE) {
int delay = -1;
video_vd_control(d_video, VDCTRL_QUERY_UNSEEN_FRAMES, &delay);
if (delay >= 0) {
@@ -281,16 +280,16 @@ struct mp_image *video_decode(struct dec_video *d_video,
else {
int i, j;
for (i = 0; i < d_video->num_buffered_pts; i++)
if (d_video->buffered_pts[i] < pts)
if (d_video->buffered_pts[i] < pkt_pdts)
break;
for (j = d_video->num_buffered_pts; j > i; j--)
d_video->buffered_pts[j] = d_video->buffered_pts[j - 1];
d_video->buffered_pts[i] = pts;
d_video->buffered_pts[i] = pkt_pdts;
d_video->num_buffered_pts++;
}
}
mpi = d_video->vd_driver->decode(d_video, packet, drop_frame);
struct mp_image *mpi = d_video->vd_driver->decode(d_video, packet, drop_frame);
//------------------------ frame decoded. --------------------
@@ -304,7 +303,7 @@ struct mp_image *video_decode(struct dec_video *d_video,
else if (opts->field_dominance == 1)
mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
pts = mpi->pts;
double pts = mpi->pts;
double prevpts = d_video->codec_reordered_pts;
d_video->prev_codec_reordered_pts = prevpts;