generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: use av_stream_get_end_pts()

Browse Source 
Simplifies code and should correct timing values when -*sync drop is used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-19 20:16:22 +02:00
parent 7f7080dc73
commit 1f359c8559
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ffmpeg.c
View File

@ -658,12 +658,8 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
pkt->dts = max; pkt->dts = max;
} }
} }
ost->last_mux_dts_plus_duration =
ost->last_mux_dts = pkt->dts; ost->last_mux_dts = pkt->dts;
if (ost->last_mux_dts_plus_duration != AV_NOPTS_VALUE)
ost->last_mux_dts_plus_duration += pkt->duration;
ost->data_size += pkt->size; ost->data_size += pkt->size;
ost->packets_written++; ost->packets_written++;
@ -1107,7 +1103,7 @@ static void do_video_stats(OutputStream *ost, int frame_size)
fprintf(vstats_file,"f_size= %6d ", frame_size); fprintf(vstats_file,"f_size= %6d ", frame_size);
/* compute pts value */ /* compute pts value */
ti1 = ost->last_mux_dts_plus_duration * av_q2d(ost->st->time_base); ti1 = av_stream_get_end_pts(ost->st) * av_q2d(ost->st->time_base);
if (ti1 < 0.01) if (ti1 < 0.01)
ti1 = 0.01; ti1 = 0.01;
@ -1419,8 +1415,8 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti
vid = 1; vid = 1;
} }
/* compute min output value */ /* compute min output value */
if (ost->last_mux_dts_plus_duration != AV_NOPTS_VALUE) if (av_stream_get_end_pts(ost->st) != AV_NOPTS_VALUE)
pts = FFMAX(pts, av_rescale_q(ost->last_mux_dts_plus_duration, pts = FFMAX(pts, av_rescale_q(av_stream_get_end_pts(ost->st),
ost->st->time_base, AV_TIME_BASE_Q)); ost->st->time_base, AV_TIME_BASE_Q));
} }

1
ffmpeg.h
View File

@ -378,7 +378,6 @@ typedef struct OutputStream {
int64_t first_pts; int64_t first_pts;
/* dts of the last packet sent to the muxer */ /* dts of the last packet sent to the muxer */
int64_t last_mux_dts; int64_t last_mux_dts;
int64_t last_mux_dts_plus_duration;
AVBitStreamFilterContext *bitstream_filters; AVBitStreamFilterContext *bitstream_filters;
AVCodec *enc; AVCodec *enc;
int64_t max_frames; int64_t max_frames;

1
ffmpeg_opt.c
View File

@ -1152,7 +1152,6 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e
input_streams[source_index]->st->discard = AVDISCARD_NONE; input_streams[source_index]->st->discard = AVDISCARD_NONE;
} }
ost->last_mux_dts = AV_NOPTS_VALUE; ost->last_mux_dts = AV_NOPTS_VALUE;
ost->last_mux_dts_plus_duration = AV_NOPTS_VALUE;
return ost; return ost;
} }