Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: use reordered duration for stream PTS.

Browse Source
pull/269/head
Nicolas George 8 years ago
parent dfed8e2cbb
commit 36c111c40f
1 changed files with 5 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ffmpeg.c

8
ffmpeg.c
Unescape View File

@ -2368,7 +2368,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output,
return err < 0 ? err : ret; return err < 0 ? err : ret;
} }
static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eof, static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_t *duration_pts, int eof,
int *decode_failed) int *decode_failed)
{ {
AVFrame *decoded_frame; AVFrame *decoded_frame;
@ -2459,6 +2459,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int eo
ist->hwaccel_retrieved_pix_fmt = decoded_frame->format; ist->hwaccel_retrieved_pix_fmt = decoded_frame->format;
best_effort_timestamp= decoded_frame->best_effort_timestamp; best_effort_timestamp= decoded_frame->best_effort_timestamp;
*duration_pts = decoded_frame->pkt_duration;
if (ist->framerate.num) if (ist->framerate.num)
best_effort_timestamp = ist->cfr_next_pts++; best_effort_timestamp = ist->cfr_next_pts++;
@ -2629,6 +2630,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
// while we have more to decode or while the decoder did output something on EOF // while we have more to decode or while the decoder did output something on EOF
while (ist->decoding_needed) { while (ist->decoding_needed) {
int64_t duration_dts = 0; int64_t duration_dts = 0;
int64_t duration_pts = 0;
int got_output = 0; int got_output = 0;
int decode_failed = 0; int decode_failed = 0;
@ -2641,7 +2643,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
&decode_failed); &decode_failed);
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
ret = decode_video (ist, repeating ? NULL : &avpkt, &got_output, !pkt, ret = decode_video (ist, repeating ? NULL : &avpkt, &got_output, &duration_pts, !pkt,
&decode_failed); &decode_failed);
if (!repeating || !pkt || got_output) { if (!repeating || !pkt || got_output) {
if (pkt && pkt->duration) { if (pkt && pkt->duration) {
@ -2660,7 +2662,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
} }
if (got_output) if (got_output)
ist->next_pts += duration_dts; //FIXME the duration is not correct in some cases ist->next_pts += av_rescale_q(duration_pts, ist->st->time_base, AV_TIME_BASE_Q);
break; break;
case AVMEDIA_TYPE_SUBTITLE: case AVMEDIA_TYPE_SUBTITLE:
if (repeating) if (repeating)

Write Preview
Loading…
Cancel
Save