highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -vsync drop.

Browse Source 
This allows to work around any non-monotonic time-stamp errors
by just discarding all time stamps.
This will be necessary to allow H.264 conformance tests to pass
after fixing time stamps to be passed through rawenc.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger
2012-01-28 19:56:13 +01:00
parent 836110665f
commit 47a5274104
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ffmpeg.texi
View File

@ -939,6 +939,8 @@ This option is deprecated, use -loop.
Thread count. Thread count.
@item -vsync @var{parameter} @item -vsync @var{parameter}
Video sync method. Video sync method.
For compatibility reasons old values can be specified as numbers.
Newly added values will have to be specified as strings always.
@table @option @table @option
@item 0, passthrough @item 0, passthrough
@ -949,6 +951,9 @@ constant framerate.
@item 2, vfr @item 2, vfr
Frames are passed through with their timestamp or dropped so as to Frames are passed through with their timestamp or dropped so as to
prevent 2 frames from having the same timestamp. prevent 2 frames from having the same timestamp.
@item drop
As passthrough but destroys all timestamps, making the muxer generate
fresh timestamps based on frame-rate.
@item -1, auto @item -1, auto
Chooses between 1 and 2 depending on muxer capabilities. This is the Chooses between 1 and 2 depending on muxer capabilities. This is the
default method. default method.

6
ffmpeg.c
View File

@ -97,6 +97,7 @@
#define VSYNC_PASSTHROUGH 0 #define VSYNC_PASSTHROUGH 0
#define VSYNC_CFR 1 #define VSYNC_CFR 1
#define VSYNC_VFR 2 #define VSYNC_VFR 2
#define VSYNC_DROP 0xff
const char program_name[] = "ffmpeg"; const char program_name[] = "ffmpeg";
const int program_birth_year = 2000; const int program_birth_year = 2000;
@ -1474,7 +1475,7 @@ static void do_video_out(AVFormatContext *s,
if (format_video_sync == VSYNC_AUTO) if (format_video_sync == VSYNC_AUTO)
format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : 1; format_video_sync = (s->oformat->flags & AVFMT_VARIABLE_FPS) ? ((s->oformat->flags & AVFMT_NOTIMESTAMPS) ? VSYNC_PASSTHROUGH : VSYNC_VFR) : 1;
if (format_video_sync != VSYNC_PASSTHROUGH) { if (format_video_sync != VSYNC_PASSTHROUGH && format_video_sync != VSYNC_DROP) {
double vdelta = sync_ipts - ost->sync_opts + duration; double vdelta = sync_ipts - ost->sync_opts + duration;
// FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c // FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c
if (vdelta < -1.1) if (vdelta < -1.1)
@ -1569,6 +1570,8 @@ static void do_video_out(AVFormatContext *s,
if (enc->coded_frame->key_frame) if (enc->coded_frame->key_frame)
pkt.flags |= AV_PKT_FLAG_KEY; pkt.flags |= AV_PKT_FLAG_KEY;
if (format_video_sync == VSYNC_DROP)
pkt.pts = pkt.dts = AV_NOPTS_VALUE;
write_frame(s, &pkt, ost); write_frame(s, &pkt, ost);
*frame_size = ret; *frame_size = ret;
video_size += ret; video_size += ret;
@ -4927,6 +4930,7 @@ static int opt_vsync(const char *opt, const char *arg)
if (!av_strcasecmp(arg, "cfr")) video_sync_method = VSYNC_CFR; if (!av_strcasecmp(arg, "cfr")) video_sync_method = VSYNC_CFR;
else if (!av_strcasecmp(arg, "vfr")) video_sync_method = VSYNC_VFR; else if (!av_strcasecmp(arg, "vfr")) video_sync_method = VSYNC_VFR;
else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH; else if (!av_strcasecmp(arg, "passthrough")) video_sync_method = VSYNC_PASSTHROUGH;
else if (!av_strcasecmp(arg, "drop")) video_sync_method = VSYNC_DROP;
if (video_sync_method == VSYNC_AUTO) if (video_sync_method == VSYNC_AUTO)
video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR); video_sync_method = parse_number_or_die("vsync", arg, OPT_INT, VSYNC_AUTO, VSYNC_VFR);