From 0ad26cdf24122f643c497b6e5442f4f2462f33a2 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 17 May 2012 13:22:17 +0200 Subject: [PATCH 1/4] avconv: add support for audio in complex filtergraphs. --- avconv.c | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 133 insertions(+), 13 deletions(-) diff --git a/avconv.c b/avconv.c index 07bb86d4d1..0b4ca813f6 100644 --- a/avconv.c +++ b/avconv.c @@ -215,7 +215,7 @@ typedef struct InputStream { FrameBuffer *buffer_pool; /* decoded data from this stream goes into all those filters - * currently video only */ + * currently video and audio only */ InputFilter **filters; int nb_filters; } InputStream; @@ -889,8 +889,9 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) int i; // TODO: support other filter types - if (type != AVMEDIA_TYPE_VIDEO) { - av_log(NULL, AV_LOG_FATAL, "Only video filters supported currently.\n"); + if (type != AVMEDIA_TYPE_VIDEO && type != AVMEDIA_TYPE_AUDIO) { + av_log(NULL, AV_LOG_FATAL, "Only video and audio filters supported " + "currently.\n"); exit_program(1); } @@ -951,7 +952,7 @@ static void init_input_filter(FilterGraph *fg, AVFilterInOut *in) ist->filters[ist->nb_filters - 1] = fg->inputs[fg->nb_inputs - 1]; } -static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) { char *pix_fmts; AVCodecContext *codec = ofilter->ost->st->codec; @@ -1005,6 +1006,104 @@ static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFil return 0; } +static int configure_output_audio_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +{ + OutputStream *ost = ofilter->ost; + AVCodecContext *codec = ost->st->codec; + AVFilterContext *last_filter = out->filter_ctx; + int pad_idx = out->pad_idx; + char *sample_fmts, *sample_rates, *channel_layouts; + int ret; + + ret = avfilter_graph_create_filter(&ofilter->filter, + avfilter_get_by_name("abuffersink"), + "out", NULL, NULL, fg->graph); + if (ret < 0) + return ret; + + if (codec->channels && !codec->channel_layout) + codec->channel_layout = av_get_default_channel_layout(codec->channels); + + sample_fmts = choose_sample_fmts(ost); + sample_rates = choose_sample_rates(ost); + channel_layouts = choose_channel_layouts(ost); + if (sample_fmts || sample_rates || channel_layouts) { + AVFilterContext *format; + char args[256]; + int len = 0; + + if (sample_fmts) + len += snprintf(args + len, sizeof(args) - len, "sample_fmts=%s:", + sample_fmts); + if (sample_rates) + len += snprintf(args + len, sizeof(args) - len, "sample_rates=%s:", + sample_rates); + if (channel_layouts) + len += snprintf(args + len, sizeof(args) - len, "channel_layouts=%s:", + channel_layouts); + args[len - 1] = 0; + + av_freep(&sample_fmts); + av_freep(&sample_rates); + av_freep(&channel_layouts); + + ret = avfilter_graph_create_filter(&format, + avfilter_get_by_name("aformat"), + "aformat", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, pad_idx, format, 0); + if (ret < 0) + return ret; + + last_filter = format; + pad_idx = 0; + } + + if (audio_sync_method > 0) { + AVFilterContext *async; + char args[256]; + int len = 0; + + av_log(NULL, AV_LOG_WARNING, "-async has been deprecated. Used the " + "asyncts audio filter instead.\n"); + + if (audio_sync_method > 1) + len += snprintf(args + len, sizeof(args) - len, "compensate=1:" + "max_comp=%d:", audio_sync_method); + snprintf(args + len, sizeof(args) - len, "min_delta=%f", + audio_drift_threshold); + + ret = avfilter_graph_create_filter(&async, + avfilter_get_by_name("asyncts"), + "async", args, NULL, fg->graph); + if (ret < 0) + return ret; + + ret = avfilter_link(last_filter, pad_idx, async, 0); + if (ret < 0) + return ret; + + last_filter = async; + pad_idx = 0; + } + + if ((ret = avfilter_link(last_filter, pad_idx, ofilter->filter, 0)) < 0) + return ret; + + return 0; +} + +static int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out) +{ + switch (out->filter_ctx->output_pads[out->pad_idx].type) { + case AVMEDIA_TYPE_VIDEO: return configure_output_video_filter(fg, ofilter, out); + case AVMEDIA_TYPE_AUDIO: return configure_output_audio_filter(fg, ofilter, out); + default: av_assert0(0); + } +} + static int configure_complex_filter(FilterGraph *fg) { AVFilterInOut *inputs, *outputs, *cur; @@ -1024,16 +1123,34 @@ static int configure_complex_filter(FilterGraph *fg) InputFilter *ifilter = fg->inputs[i]; InputStream *ist = ifilter->ist; AVRational sar; + AVFilter *filter; char args[255]; - sar = ist->st->sample_aspect_ratio.num ? ist->st->sample_aspect_ratio : - ist->st->codec->sample_aspect_ratio; - snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, - ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, - sar.num, sar.den); + switch (cur->filter_ctx->input_pads[cur->pad_idx].type) { + case AVMEDIA_TYPE_VIDEO: + sar = ist->st->sample_aspect_ratio.num ? + ist->st->sample_aspect_ratio : + ist->st->codec->sample_aspect_ratio; + snprintf(args, sizeof(args), "%d:%d:%d:%d:%d:%d:%d", ist->st->codec->width, + ist->st->codec->height, ist->st->codec->pix_fmt, 1, AV_TIME_BASE, + sar.num, sar.den); + filter = avfilter_get_by_name("buffer"); + break; + case AVMEDIA_TYPE_AUDIO: + snprintf(args, sizeof(args), "time_base=%d/%d:sample_rate=%d:" + "sample_fmt=%s:channel_layout=0x%"PRIx64, + ist->st->time_base.num, ist->st->time_base.den, + ist->st->codec->sample_rate, + av_get_sample_fmt_name(ist->st->codec->sample_fmt), + ist->st->codec->channel_layout); + filter = avfilter_get_by_name("abuffer"); + break; + default: + av_assert0(0); + } if ((ret = avfilter_graph_create_filter(&ifilter->filter, - avfilter_get_by_name("buffer"), cur->name, + filter, cur->name, args, NULL, fg->graph)) < 0) return ret; if ((ret = avfilter_link(ifilter->filter, 0, @@ -4087,12 +4204,15 @@ static void init_output_filter(OutputFilter *ofilter, OptionsContext *o, { OutputStream *ost; - if (ofilter->out_tmp->filter_ctx->output_pads[ofilter->out_tmp->pad_idx].type != AVMEDIA_TYPE_VIDEO) { - av_log(NULL, AV_LOG_FATAL, "Only video filters are supported currently.\n"); + switch (ofilter->out_tmp->filter_ctx->output_pads[ofilter->out_tmp->pad_idx].type) { + case AVMEDIA_TYPE_VIDEO: ost = new_video_stream(o, oc); break; + case AVMEDIA_TYPE_AUDIO: ost = new_audio_stream(o, oc); break; + default: + av_log(NULL, AV_LOG_FATAL, "Only video and audio filters are supported " + "currently.\n"); exit_program(1); } - ost = new_video_stream(o, oc); ost->source_index = -1; ost->filter = ofilter; From 7b3b24a8eea8da7b63b4167b7ab8bc1c0fdecc64 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 16 May 2012 14:57:59 +0200 Subject: [PATCH 2/4] lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs. --- libavfilter/audio.c | 2 ++ libavfilter/video.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavfilter/audio.c b/libavfilter/audio.c index 3e12c697ce..81a042b6bc 100644 --- a/libavfilter/audio.c +++ b/libavfilter/audio.c @@ -129,6 +129,8 @@ AVFilterBufferRef* avfilter_get_audio_buffer_ref_from_arrays(uint8_t **data, samplesref->extended_data = samplesref->data; } + samplesref->pts = AV_NOPTS_VALUE; + return samplesref; fail: diff --git a/libavfilter/video.c b/libavfilter/video.c index 211cec9055..ad033f3b8f 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -125,6 +125,8 @@ avfilter_get_video_buffer_ref_from_arrays(uint8_t *data[4], int linesize[4], int pic-> extended_data = pic->data; picref->extended_data = picref->data; + picref->pts = AV_NOPTS_VALUE; + return picref; fail: From 54c5dd89e3125c1f363fe8f95d2837a796967c6e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 9 May 2012 14:08:21 +0200 Subject: [PATCH 3/4] lavfi: Add fps filter. Partially based on a patch by Robert Nagy --- Changelog | 1 + doc/filters.texi | 13 ++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_fps.c | 271 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 288 insertions(+), 1 deletion(-) create mode 100644 libavfilter/vf_fps.c diff --git a/Changelog b/Changelog index 79fc8746bc..afde0e9e04 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version : - drop support for avconv without libavfilter - add libavresample audio conversion library - audio filters support in libavfilter and avconv +- add fps filter version 0.8: diff --git a/doc/filters.texi b/doc/filters.texi index 0e611d2793..cda235f106 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -814,6 +814,19 @@ format=yuv420p format=yuv420p:yuv444p:yuv410p @end example +@section fps + +Convert the video to specified constant framerate by duplicating or dropping +frames as necessary. + +This filter accepts the following named parameters: +@table @option + +@item fps +Desired output framerate. + +@end table + @anchor{frei0r} @section frei0r diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 680b8d958c..fc96f42fe9 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -46,6 +46,7 @@ OBJS-$(CONFIG_FADE_FILTER) += vf_fade.o OBJS-$(CONFIG_FIELDORDER_FILTER) += vf_fieldorder.o OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o OBJS-$(CONFIG_FREI0R_FILTER) += vf_frei0r.o OBJS-$(CONFIG_GRADFUN_FILTER) += vf_gradfun.o OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 3fa0152d86..b3e57fd74c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -55,6 +55,7 @@ void avfilter_register_all(void) REGISTER_FILTER (FIELDORDER, fieldorder, vf); REGISTER_FILTER (FIFO, fifo, vf); REGISTER_FILTER (FORMAT, format, vf); + REGISTER_FILTER (FPS, fps, vf); REGISTER_FILTER (FREI0R, frei0r, vf); REGISTER_FILTER (GRADFUN, gradfun, vf); REGISTER_FILTER (HFLIP, hflip, vf); diff --git a/libavfilter/version.h b/libavfilter/version.h index 192af68dcb..f352f7b242 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVFILTER_VERSION_MAJOR 2 -#define LIBAVFILTER_VERSION_MINOR 17 +#define LIBAVFILTER_VERSION_MINOR 18 #define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c new file mode 100644 index 0000000000..da38af299b --- /dev/null +++ b/libavfilter/vf_fps.c @@ -0,0 +1,271 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * a filter enforcing given constant framerate + */ + +#include "libavutil/fifo.h" +#include "libavutil/mathematics.h" +#include "libavutil/opt.h" +#include "libavutil/parseutils.h" + +#include "avfilter.h" + +typedef struct FPSContext { + const AVClass *class; + + AVFifoBuffer *fifo; ///< store frames until we get two successive timestamps + + /* timestamps in input timebase */ + int64_t first_pts; ///< pts of the first frame that arrived on this filter + int64_t pts; ///< pts of the first frame currently in the fifo + + AVRational framerate; ///< target framerate + char *fps; ///< a string describing target framerate + + /* statistics */ + int frames_in; ///< number of frames on input + int frames_out; ///< number of frames on output + int dup; ///< number of frames duplicated + int drop; ///< number of framed dropped +} FPSContext; + +#define OFFSET(x) offsetof(FPSContext, x) +#define V AV_OPT_FLAG_VIDEO_PARAM +static const AVOption options[] = { + { "fps", "A string describing desired output framerate", OFFSET(fps), AV_OPT_TYPE_STRING, { .str = "25" }, .flags = V }, + { NULL }, +}; + +static const AVClass class = { + .class_name = "FPS filter", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque) +{ + FPSContext *s = ctx->priv; + int ret; + + s->class = &class; + av_opt_set_defaults(s); + + if ((ret = av_set_options_string(s, args, "=", ":")) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error parsing the options string %s.\n", + args); + return ret; + } + + if ((ret = av_parse_video_rate(&s->framerate, s->fps)) < 0) { + av_log(ctx, AV_LOG_ERROR, "Error parsing framerate %s.\n", s->fps); + return ret; + } + av_opt_free(s); + + if (!(s->fifo = av_fifo_alloc(2*sizeof(AVFilterBufferRef*)))) + return AVERROR(ENOMEM); + + av_log(ctx, AV_LOG_VERBOSE, "fps=%d/%d\n", s->framerate.num, s->framerate.den); + return 0; +} + +static void flush_fifo(AVFifoBuffer *fifo) +{ + while (av_fifo_size(fifo)) { + AVFilterBufferRef *tmp; + av_fifo_generic_read(fifo, &tmp, sizeof(tmp), NULL); + avfilter_unref_buffer(tmp); + } +} + +static av_cold void uninit(AVFilterContext *ctx) +{ + FPSContext *s = ctx->priv; + if (s->fifo) { + flush_fifo(s->fifo); + av_fifo_free(s->fifo); + } + + av_log(ctx, AV_LOG_VERBOSE, "%d frames in, %d frames out; %d frames dropped, " + "%d frames duplicated.\n", s->frames_in, s->frames_out, s->drop, s->dup); +} + +static int config_props(AVFilterLink* link) +{ + FPSContext *s = link->src->priv; + + link->time_base = (AVRational){ s->framerate.den, s->framerate.num }; + link->w = link->src->inputs[0]->w; + link->h = link->src->inputs[0]->h; + s->pts = AV_NOPTS_VALUE; + + return 0; +} + +static int request_frame(AVFilterLink *outlink) +{ + AVFilterContext *ctx = outlink->src; + FPSContext *s = ctx->priv; + int frames_out = s->frames_out; + int ret = 0; + + while (ret >= 0 && s->frames_out == frames_out) + ret = avfilter_request_frame(ctx->inputs[0]); + + /* flush the fifo */ + if (ret == AVERROR_EOF && av_fifo_size(s->fifo)) { + int i; + for (i = 0; av_fifo_size(s->fifo); i++) { + AVFilterBufferRef *buf; + + av_fifo_generic_read(s->fifo, &buf, sizeof(buf), NULL); + buf->pts = av_rescale_q(s->first_pts, ctx->inputs[0]->time_base, + outlink->time_base) + s->frames_out; + + avfilter_start_frame(outlink, buf); + avfilter_draw_slice(outlink, 0, outlink->h, 1); + avfilter_end_frame(outlink); + s->frames_out++; + } + return 0; + } + + return ret; +} + +static int write_to_fifo(AVFifoBuffer *fifo, AVFilterBufferRef *buf) +{ + int ret; + + if (!av_fifo_space(fifo) && + (ret = av_fifo_realloc2(fifo, 2*av_fifo_size(fifo)))) + return ret; + + av_fifo_generic_write(fifo, &buf, sizeof(buf), NULL); + return 0; +} + +static void end_frame(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + FPSContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + AVFilterBufferRef *buf = inlink->cur_buf; + int64_t delta; + int i; + + s->frames_in++; + /* discard frames until we get the first timestamp */ + if (s->pts == AV_NOPTS_VALUE) { + if (buf->pts != AV_NOPTS_VALUE) { + write_to_fifo(s->fifo, buf); + s->first_pts = s->pts = buf->pts; + } else { + av_log(ctx, AV_LOG_WARNING, "Discarding initial frame(s) with no " + "timestamp.\n"); + avfilter_unref_buffer(buf); + s->drop++; + } + return; + } + + /* now wait for the next timestamp */ + if (buf->pts == AV_NOPTS_VALUE) { + write_to_fifo(s->fifo, buf); + return; + } + + /* number of output frames */ + delta = av_rescale_q(buf->pts - s->pts, inlink->time_base, + outlink->time_base); + + if (delta < 1) { + /* drop the frame and everything buffered except the first */ + AVFilterBufferRef *tmp; + int drop = av_fifo_size(s->fifo)/sizeof(AVFilterBufferRef*); + + av_log(ctx, AV_LOG_DEBUG, "Dropping %d frame(s).\n", drop); + s->drop += drop; + + av_fifo_generic_read(s->fifo, &tmp, sizeof(tmp), NULL); + flush_fifo(s->fifo); + write_to_fifo(s->fifo, tmp); + + avfilter_unref_buffer(buf); + return; + } + + /* can output >= 1 frames */ + for (i = 0; i < delta; i++) { + AVFilterBufferRef *buf_out; + av_fifo_generic_read(s->fifo, &buf_out, sizeof(buf_out), NULL); + + /* duplicate the frame if needed */ + if (!av_fifo_size(s->fifo) && i < delta - 1) { + av_log(ctx, AV_LOG_DEBUG, "Duplicating frame.\n"); + write_to_fifo(s->fifo, avfilter_ref_buffer(buf_out, AV_PERM_READ)); + s->dup++; + } + + buf_out->pts = av_rescale_q(s->first_pts, inlink->time_base, + outlink->time_base) + s->frames_out; + + avfilter_start_frame(outlink, buf_out); + avfilter_draw_slice(outlink, 0, outlink->h, 1); + avfilter_end_frame(outlink); + s->frames_out++; + } + flush_fifo(s->fifo); + + write_to_fifo(s->fifo, buf); + s->pts = s->first_pts + av_rescale_q(s->frames_out, outlink->time_base, inlink->time_base); +} + +static void null_start_frame(AVFilterLink *link, AVFilterBufferRef *buf) +{ +} + +static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) +{ +} + +AVFilter avfilter_vf_fps = { + .name = "fps", + .description = NULL_IF_CONFIG_SMALL("Force constant framerate"), + + .init = init, + .uninit = uninit, + + .priv_size = sizeof(FPSContext), + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .start_frame = null_start_frame, + .draw_slice = null_draw_slice, + .end_frame = end_frame, }, + { .name = NULL}}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = request_frame, + .config_props = config_props}, + { .name = NULL}}, +}; From 755cd4197d53946208e042f095b930dca18d9430 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 17 May 2012 20:45:51 +0200 Subject: [PATCH 4/4] mov: enable parsing for VC-1. This makes lavf discard broken timestamps for non-B frames in samples/isom/vc1-wmapro.ism. --- libavformat/mov.c | 3 + tests/ref/fate/vc1-ism | 122 ++++++++++++++++++++--------------------- 2 files changed, 64 insertions(+), 61 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 29f01c3f72..10ffe8beb5 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1464,6 +1464,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries) st->codec->sample_rate = AV_RB32(st->codec->extradata+32); } break; + case CODEC_ID_VC1: + st->need_parsing = AVSTREAM_PARSE_FULL; + break; default: break; } diff --git a/tests/ref/fate/vc1-ism b/tests/ref/fate/vc1-ism index a4d29cc5ca..2a42a13f5f 100644 --- a/tests/ref/fate/vc1-ism +++ b/tests/ref/fate/vc1-ism @@ -1,121 +1,121 @@ #tb 0: 1/10000000 -0, 0, 0, 0, 37440, 0xd1bc5235 +0, 423330, 423330, 0, 37440, 0xd1bc5235 0, 840000, 840000, 0, 37440, 0x158e6167 -0, 1250000, 1250000, 0, 37440, 0x0faa4481 +0, 1256670, 1256670, 0, 37440, 0x0faa4481 0, 1670000, 1670000, 0, 37440, 0x427158c5 -0, 2090000, 2090000, 0, 37440, 0x4eb53ac6 +0, 2086670, 2086670, 0, 37440, 0x4eb53ac6 0, 2500000, 2500000, 0, 37440, 0x99304eea -0, 2920000, 2920000, 0, 37440, 0xcc554a6f +0, 2916670, 2916670, 0, 37440, 0xcc554a6f 0, 3340000, 3340000, 0, 37440, 0xabeb6c35 -0, 3750000, 3750000, 0, 37440, 0xddfc7e18 +0, 3756670, 3756670, 0, 37440, 0xddfc7e18 0, 4170000, 4170000, 0, 37440, 0xaa79b504 -0, 4590000, 4590000, 0, 37440, 0x5cb1c839 +0, 4586670, 4586670, 0, 37440, 0x5cb1c839 0, 5000000, 5000000, 0, 37440, 0x7e36ecca -0, 5420000, 5420000, 0, 37440, 0xf486f425 +0, 5416670, 5416670, 0, 37440, 0xf486f425 0, 5840000, 5840000, 0, 37440, 0xf1b4138f -0, 6250000, 6250000, 0, 37440, 0x966f1a49 +0, 6256670, 6256670, 0, 37440, 0x966f1a49 0, 6670000, 6670000, 0, 37440, 0x5eff21da -0, 7090000, 7090000, 0, 37440, 0x333f39b1 +0, 7086670, 7086670, 0, 37440, 0x333f39b1 0, 7500000, 7500000, 0, 37440, 0x62e5963e -0, 7920000, 7920000, 0, 37440, 0x26930671 +0, 7916670, 7916670, 0, 37440, 0x26930671 0, 8340000, 8340000, 0, 37440, 0x27b4bb6c -0, 8750000, 8750000, 0, 37440, 0xdbd07766 +0, 8756670, 8756670, 0, 37440, 0xdbd07766 0, 9170000, 9170000, 0, 37440, 0x04260104 -0, 9590000, 9590000, 0, 37440, 0x9b1e078b +0, 9586670, 9586670, 0, 37440, 0x9b1e078b 0, 10000000, 10000000, 0, 37440, 0xdf4e2474 -0, 10420000, 10420000, 0, 37440, 0x57d44986 +0, 10416670, 10416670, 0, 37440, 0x57d44986 0, 10840000, 10840000, 0, 37440, 0x8780e34c -0, 11250000, 11250000, 0, 37440, 0xf80c8bc0 +0, 11256670, 11256670, 0, 37440, 0xf80c8bc0 0, 11670000, 11670000, 0, 37440, 0x630a7583 -0, 12090000, 12090000, 0, 37440, 0x235ae089 +0, 12086670, 12086670, 0, 37440, 0x235ae089 0, 12500000, 12500000, 0, 37440, 0x984b8f0e -0, 12920000, 12920000, 0, 37440, 0x865cf592 +0, 12916670, 12916670, 0, 37440, 0x865cf592 0, 13340000, 13340000, 0, 37440, 0x70f376f2 -0, 13750000, 13750000, 0, 37440, 0x8b30c035 +0, 13756670, 13756670, 0, 37440, 0x8b30c035 0, 14170000, 14170000, 0, 37440, 0xde772d79 -0, 14590000, 14590000, 0, 37440, 0x8e076be5 +0, 14586670, 14586670, 0, 37440, 0x8e076be5 0, 15000000, 15000000, 0, 37440, 0x3dc2bd9f -0, 15420000, 15420000, 0, 37440, 0xb782eb67 +0, 15416670, 15416670, 0, 37440, 0xb782eb67 0, 15840000, 15840000, 0, 37440, 0x02025d73 -0, 16250000, 16250000, 0, 37440, 0x86bbbce8 +0, 16256670, 16256670, 0, 37440, 0x86bbbce8 0, 16670000, 16670000, 0, 37440, 0xd6554f62 -0, 17090000, 17090000, 0, 37440, 0xb831b917 +0, 17086670, 17086670, 0, 37440, 0xb831b917 0, 17500000, 17500000, 0, 37440, 0x80643560 -0, 17920000, 17920000, 0, 37440, 0x4ecf9afd +0, 17916670, 17916670, 0, 37440, 0x4ecf9afd 0, 18340000, 18340000, 0, 37440, 0x9ce51e0b -0, 18750000, 18750000, 0, 37440, 0x179466cd +0, 18756670, 18756670, 0, 37440, 0x179466cd 0, 19170000, 19170000, 0, 37440, 0x145fc900 -0, 19590000, 19590000, 0, 37440, 0xb1b50402 +0, 19586670, 19586670, 0, 37440, 0xb1b50402 0, 20000000, 20000000, 0, 37440, 0x0a87552a -0, 20420000, 20420000, 0, 37440, 0x8f53821d +0, 20416670, 20416670, 0, 37440, 0x8f53821d 0, 20840000, 20840000, 0, 37440, 0x1c07c825 -0, 21250000, 21250000, 0, 37440, 0x49dde82f +0, 21256670, 21256670, 0, 37440, 0x49dde82f 0, 21670000, 21670000, 0, 37440, 0xb1a32605 -0, 22090000, 22090000, 0, 37440, 0x410f3cd5 +0, 22086670, 22086670, 0, 37440, 0x410f3cd5 0, 22500000, 22500000, 0, 37440, 0xff5e6696 -0, 22920000, 22920000, 0, 37440, 0x96f678c9 +0, 22916670, 22916670, 0, 37440, 0x96f678c9 0, 23340000, 23340000, 0, 37440, 0x6c9e9e68 -0, 23750000, 23750000, 0, 37440, 0x79a2a655 +0, 23756670, 23756670, 0, 37440, 0x79a2a655 0, 24170000, 24170000, 0, 37440, 0xf237bd6c -0, 24590000, 24590000, 0, 37440, 0x4051b611 +0, 24586670, 24586670, 0, 37440, 0x4051b611 0, 25000000, 25000000, 0, 37440, 0xc7ccc918 -0, 25420000, 25420000, 0, 37440, 0xbd02c122 +0, 25416670, 25416670, 0, 37440, 0xbd02c122 0, 25840000, 25840000, 0, 37440, 0xacb3c881 -0, 26250000, 26250000, 0, 37440, 0x2abdb940 +0, 26256670, 26256670, 0, 37440, 0x2abdb940 0, 26670000, 26670000, 0, 37440, 0x19d5be85 -0, 27090000, 27090000, 0, 37440, 0xfa5fb1ba -0, 27500000, 27500000, 0, 37440, 0xdae7a7aa +0, 27086670, 27086670, 0, 37440, 0xfa5fb1ba +0, 27503330, 27503330, 0, 37440, 0xdae7a7aa 0, 27920000, 27920000, 0, 37440, 0x6b0f9f69 0, 28340000, 28340000, 0, 37440, 0x353e8201 -0, 28750000, 28750000, 0, 37440, 0xa21443aa +0, 28756670, 28756670, 0, 37440, 0xa21443aa 0, 29170000, 29170000, 0, 37440, 0x66c8d7e0 -0, 29590000, 29590000, 0, 37440, 0xc332068e +0, 29586670, 29586670, 0, 37440, 0xc332068e 0, 30000000, 30000000, 0, 37440, 0x71431b9b -0, 30420000, 30420000, 0, 37440, 0x392f15cb +0, 30416670, 30416670, 0, 37440, 0x392f15cb 0, 30840000, 30840000, 0, 37440, 0x95a146bb -0, 31250000, 31250000, 0, 37440, 0x7c51740a +0, 31256670, 31256670, 0, 37440, 0x7c51740a 0, 31670000, 31670000, 0, 37440, 0xa3bdd43c -0, 32090000, 32090000, 0, 37440, 0xa079f965 +0, 32086670, 32086670, 0, 37440, 0xa079f965 0, 32500000, 32500000, 0, 37440, 0xa95423ea -0, 32920000, 32920000, 0, 37440, 0xd1bd2c67 +0, 32916670, 32916670, 0, 37440, 0xd1bd2c67 0, 33340000, 33340000, 0, 37440, 0x6cf82844 -0, 33750000, 33750000, 0, 37440, 0xd401e128 +0, 33756670, 33756670, 0, 37440, 0xd401e128 0, 34170000, 34170000, 0, 37440, 0x1f7db118 -0, 34590000, 34590000, 0, 37440, 0x2e0a65a9 +0, 34586670, 34586670, 0, 37440, 0x2e0a65a9 0, 35000000, 35000000, 0, 37440, 0x321c1c40 -0, 35420000, 35420000, 0, 37440, 0x95b2a127 +0, 35416670, 35416670, 0, 37440, 0x95b2a127 0, 35840000, 35840000, 0, 37440, 0xa1471f4b -0, 36250000, 36250000, 0, 37440, 0x29d148c0 +0, 36256670, 36256670, 0, 37440, 0x29d148c0 0, 36670000, 36670000, 0, 37440, 0x24c07107 -0, 37090000, 37090000, 0, 37440, 0x0ead678d +0, 37086670, 37086670, 0, 37440, 0x0ead678d 0, 37500000, 37500000, 0, 37440, 0xd0ca6495 -0, 37920000, 37920000, 0, 37440, 0x08f935ef +0, 37916670, 37916670, 0, 37440, 0x08f935ef 0, 38340000, 38340000, 0, 37440, 0xb5ec3c38 -0, 38750000, 38750000, 0, 37440, 0xce371628 +0, 38756670, 38756670, 0, 37440, 0xce371628 0, 39170000, 39170000, 0, 37440, 0x68170812 -0, 39590000, 39590000, 0, 37440, 0xe222699e +0, 39586670, 39586670, 0, 37440, 0xe222699e 0, 40000000, 40000000, 0, 37440, 0xd688706c -0, 40420000, 40420000, 0, 37440, 0x81a033f9 +0, 40416670, 40416670, 0, 37440, 0x81a033f9 0, 40840000, 40840000, 0, 37440, 0x28bd0fbf -0, 41250000, 41250000, 0, 37440, 0xe36db7b2 +0, 41256670, 41256670, 0, 37440, 0xe36db7b2 0, 41670000, 41670000, 0, 37440, 0x30559121 -0, 42090000, 42090000, 0, 37440, 0xbf2b5fc8 +0, 42086670, 42086670, 0, 37440, 0xbf2b5fc8 0, 42500000, 42500000, 0, 37440, 0x4b427672 -0, 42920000, 42920000, 0, 37440, 0x0544b0b4 +0, 42916670, 42916670, 0, 37440, 0x0544b0b4 0, 43340000, 43340000, 0, 37440, 0x38a70b06 -0, 43750000, 43750000, 0, 37440, 0x4ed62607 +0, 43756670, 43756670, 0, 37440, 0x4ed62607 0, 44170000, 44170000, 0, 37440, 0x6efe8ea6 -0, 44590000, 44590000, 0, 37440, 0x81197e11 +0, 44586670, 44586670, 0, 37440, 0x81197e11 0, 45000000, 45000000, 0, 37440, 0xf4060050 -0, 45420000, 45420000, 0, 37440, 0xaf205f13 +0, 45416670, 45416670, 0, 37440, 0xaf205f13 0, 45840000, 45840000, 0, 37440, 0x5fa21382 -0, 46250000, 46250000, 0, 37440, 0x8627ad05 +0, 46256670, 46256670, 0, 37440, 0x8627ad05 0, 46670000, 46670000, 0, 37440, 0xf7130133 -0, 47090000, 47090000, 0, 37440, 0x76dea7ba +0, 47086670, 47086670, 0, 37440, 0x76dea7ba 0, 47500000, 47500000, 0, 37440, 0x1dbae1be -0, 47920000, 47920000, 0, 37440, 0x74a933f7 +0, 47916670, 47916670, 0, 37440, 0x74a933f7 0, 48340000, 48340000, 0, 37440, 0xbdcd41a3 -0, 48750000, 48750000, 0, 37440, 0xf0fe8c1c +0, 48756670, 48756670, 0, 37440, 0xf0fe8c1c 0, 49170000, 49170000, 0, 37440, 0xc0036222 -0, 49590000, 49590000, 0, 37440, 0x3058385c -0, 49798330, 49798330, 0, 37440, 0x68141016 +0, 49586670, 49586670, 0, 37440, 0x3058385c +0, 50003340, 50003340, 0, 37440, 0x68141016