diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index d3aa191e23..f51867435d 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -322,6 +322,7 @@ typedef struct OutputFilterOptions { enum AVColorSpace color_space; enum AVColorRange color_range; enum AVAlphaMode alpha_mode; + enum AVChromaLocation chroma_location; unsigned crop_top; unsigned crop_bottom; @@ -345,6 +346,7 @@ typedef struct OutputFilterOptions { const enum AVColorSpace *color_spaces; const enum AVColorRange *color_ranges; const enum AVAlphaMode *alpha_modes; + const enum AVChromaLocation *chroma_locations; AVFrameSideData **side_data; int nb_side_data; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 1498afa880..1c9ef14f25 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -1666,6 +1666,7 @@ static int dec_open(DecoderPriv *dp, AVDictionary **dec_opts, param_out->colorspace = dp->dec_ctx->colorspace; param_out->color_range = dp->dec_ctx->color_range; param_out->alpha_mode = dp->dec_ctx->alpha_mode; + param_out->chroma_location = dp->dec_ctx->chroma_sample_location; } av_frame_side_data_free(¶m_out->side_data, ¶m_out->nb_side_data); diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index cf145f13e0..37e67b78ce 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -338,18 +338,7 @@ static int enc_reopen(void *opaque, const AVFrame *frame, enc_ctx->color_trc = frame->color_trc; enc_ctx->colorspace = frame->colorspace; enc_ctx->alpha_mode = frame->alpha_mode; - - /* Video properties which are not part of filter graph negotiation */ - if (enc_ctx->chroma_sample_location == AVCHROMA_LOC_UNSPECIFIED) { - enc_ctx->chroma_sample_location = frame->chroma_location; - } else if (enc_ctx->chroma_sample_location != frame->chroma_location && - frame->chroma_location != AVCHROMA_LOC_UNSPECIFIED) { - av_log(e, AV_LOG_WARNING, - "Requested chroma sample location '%s' does not match the " - "frame tagged sample location '%s'; result may be incorrect.\n", - av_chroma_location_name(enc_ctx->chroma_sample_location), - av_chroma_location_name(frame->chroma_location)); - } + enc_ctx->chroma_sample_location = frame->chroma_location; if (enc_ctx->flags & (AV_CODEC_FLAG_INTERLACED_DCT | AV_CODEC_FLAG_INTERLACED_ME) || (frame->flags & AV_FRAME_FLAG_INTERLACED)) { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 058d64421d..a0a6e082b3 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -125,6 +125,7 @@ typedef struct InputFilterPriv { enum AVColorSpace color_space; enum AVColorRange color_range; enum AVAlphaMode alpha_mode; + enum AVChromaLocation chroma_location; int sample_rate; AVChannelLayout ch_layout; @@ -208,6 +209,7 @@ typedef struct OutputFilterPriv { enum AVColorSpace color_space; enum AVColorRange color_range; enum AVAlphaMode alpha_mode; + enum AVChromaLocation chroma_location; unsigned crop_top; unsigned crop_bottom; @@ -240,6 +242,7 @@ typedef struct OutputFilterPriv { const enum AVColorSpace *color_spaces; const enum AVColorRange *color_ranges; const enum AVAlphaMode *alpha_modes; + const enum AVChromaLocation *chroma_locations; int32_t displaymatrix[9]; @@ -295,6 +298,7 @@ static int sub2video_get_blank_frame(InputFilterPriv *ifp) frame->colorspace = ifp->color_space; frame->color_range = ifp->color_range; frame->alpha_mode = ifp->alpha_mode; + frame->chroma_location = ifp->chroma_location; ret = av_frame_get_buffer(frame, 0); if (ret < 0) @@ -431,6 +435,10 @@ DEF_CHOOSE_FORMAT(color_ranges, enum AVColorRange, color_range, color_ranges, DEF_CHOOSE_FORMAT(alpha_modes, enum AVAlphaMode, alpha_mode, alpha_modes, AVALPHA_MODE_UNSPECIFIED, "%s", av_alpha_mode_name) +DEF_CHOOSE_FORMAT(chroma_locations, enum AVChromaLocation, chroma_location, + chroma_locations, AVCHROMA_LOC_UNSPECIFIED, "%s", + av_chroma_location_name) + static void choose_channel_layouts(OutputFilterPriv *ofp, AVBPrint *bprint) { if (av_channel_layout_check(&ofp->ch_layout)) { @@ -661,6 +669,7 @@ static const AVOption ofilter_options[] = { {"colorspace", "color space", offsetof(OutputFilterPriv, color_space), AV_OPT_TYPE_INT, {.i64 = AVCOL_SPC_UNSPECIFIED }, 0, INT_MAX }, {"color_range", "color range", offsetof(OutputFilterPriv, color_range), AV_OPT_TYPE_INT, {.i64 = AVCOL_RANGE_UNSPECIFIED }, 0, INT_MAX }, {"alpha_mode", "color range", offsetof(OutputFilterPriv, alpha_mode), AV_OPT_TYPE_INT, {.i64 = AVALPHA_MODE_UNSPECIFIED }, 0, INT_MAX }, + {"chroma_location", "chroma sample location", offsetof(OutputFilterPriv, chroma_location), AV_OPT_TYPE_INT, {.i64 = AVCHROMA_LOC_UNSPECIFIED }, 0, INT_MAX }, {"ar", "set audio sampling rate (in Hz)", offsetof(OutputFilterPriv, sample_rate), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX }, {"ch_layout", NULL, offsetof(OutputFilterPriv, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL }, 0, 0 }, { NULL }, @@ -975,6 +984,11 @@ int ofilter_bind_enc(OutputFilter *ofilter, unsigned sched_idx_enc, else ofp->alpha_modes = opts->alpha_modes; + if (opts->chroma_location != AVCHROMA_LOC_UNSPECIFIED) + ofp->chroma_location = opts->chroma_location; + else + ofp->chroma_locations = opts->chroma_locations; + fgp->disable_conversions |= !!(ofp->flags & OFILTER_FLAG_DISABLE_CONVERT); ofp->fps.last_frame = av_frame_alloc(); @@ -1101,6 +1115,7 @@ static InputFilter *ifilter_alloc(FilterGraph *fg) ifp->color_space = AVCOL_SPC_UNSPECIFIED; ifp->color_range = AVCOL_RANGE_UNSPECIFIED; ifp->alpha_mode = AVALPHA_MODE_UNSPECIFIED; + ifp->chroma_location = AVCHROMA_LOC_UNSPECIFIED; ifp->frame_queue = av_fifo_alloc2(8, sizeof(AVFrame*), AV_FIFO_FLAG_AUTO_GROW); if (!ifp->frame_queue) @@ -1808,6 +1823,7 @@ static int configure_output_video_filter(FilterGraphPriv *fgp, AVFilterGraph *gr choose_color_spaces(ofp, &bprint); choose_color_ranges(ofp, &bprint); choose_alpha_modes(ofp, &bprint); + choose_chroma_locations(ofp, &bprint); if (!av_bprint_is_complete(&bprint)) return AVERROR(ENOMEM); @@ -1977,6 +1993,7 @@ static int configure_input_video_filter(FilterGraph *fg, AVFilterGraph *graph, par->color_space = ifp->color_space; par->color_range = ifp->color_range; par->alpha_mode = ifp->alpha_mode; + par->chroma_location = ifp->chroma_location; par->hw_frames_ctx = ifp->hw_frames_ctx; par->side_data = ifp->side_data; par->nb_side_data = ifp->nb_side_data; @@ -2255,6 +2272,7 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt) ofp->color_space = av_buffersink_get_colorspace(sink); ofp->color_range = av_buffersink_get_color_range(sink); ofp->alpha_mode = av_buffersink_get_alpha_mode(sink); + ofp->chroma_location = av_buffersink_get_chroma_location(sink); // If the timing parameters are not locked yet, get the tentative values // here but don't lock them. They will only be used if no output frames @@ -2351,6 +2369,7 @@ static int ifilter_parameters_from_frame(InputFilter *ifilter, const AVFrame *fr ifp->color_space = frame->colorspace; ifp->color_range = frame->color_range; ifp->alpha_mode = frame->alpha_mode; + ifp->chroma_location = frame->chroma_location; ifp->sample_rate = frame->sample_rate; ret = av_channel_layout_copy(&ifp->ch_layout, &frame->ch_layout); @@ -3130,6 +3149,7 @@ static int send_eof(FilterGraphThread *fgt, InputFilter *ifilter, ifp->color_space = ifp->opts.fallback->colorspace; ifp->color_range = ifp->opts.fallback->color_range; ifp->alpha_mode = ifp->opts.fallback->alpha_mode; + ifp->chroma_location = ifp->opts.fallback->chroma_location; ifp->time_base = ifp->opts.fallback->time_base; ret = av_channel_layout_copy(&ifp->ch_layout, @@ -3200,7 +3220,8 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt, ifp->height != frame->height || ifp->color_space != frame->colorspace || ifp->color_range != frame->color_range || - ifp->alpha_mode != frame->alpha_mode) + ifp->alpha_mode != frame->alpha_mode || + ifp->chroma_location != frame->chroma_location) need_reinit |= VIDEO_CHANGED; break; } @@ -3290,10 +3311,11 @@ static int send_frame(FilterGraph *fg, FilterGraphThread *fgt, const char *color_space_name = av_color_space_name(frame->colorspace); const char *color_range_name = av_color_range_name(frame->color_range); const char *alpha_mode = av_alpha_mode_name(frame->alpha_mode); - av_bprintf(&reason, "video parameters changed to %s(%s, %s), %dx%d, %s alpha, ", + const char *chroma_location = av_chroma_location_name(frame->chroma_location); + av_bprintf(&reason, "video parameters changed to %s(%s, %s), %dx%d, %s alpha, %s chroma, ", unknown_if_null(pixel_format_name), unknown_if_null(color_range_name), unknown_if_null(color_space_name), frame->width, frame->height, - unknown_if_null(alpha_mode)); + unknown_if_null(alpha_mode), unknown_if_null(chroma_location)); } if (need_reinit & MATRIX_CHANGED) av_bprintf(&reason, "display matrix changed, "); diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 48ff8bc7e5..aef27e2a8f 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -972,6 +972,7 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, .color_space = enc_ctx->colorspace, .color_range = enc_ctx->color_range, .alpha_mode = enc_ctx->alpha_mode, + .chroma_location = enc_ctx->chroma_sample_location, .vsync_method = vsync_method, .frame_rate = ms->frame_rate, .max_frame_rate = ms->max_frame_rate, @@ -1025,6 +1026,11 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter, (const void **) &opts.alpha_modes, NULL); if (ret < 0) return ret; + ret = avcodec_get_supported_config(enc_ctx, NULL, + AV_CODEC_CONFIG_CHROMA_LOCATION, 0, + (const void **) &opts.chroma_locations, NULL); + if (ret < 0) + return ret; } else { ret = avcodec_get_supported_config(enc_ctx, NULL, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, diff --git a/tests/ref/fate/ffmpeg-heif-merge-filtergraph b/tests/ref/fate/ffmpeg-heif-merge-filtergraph index dfc8c7d868..bec4358545 100644 --- a/tests/ref/fate/ffmpeg-heif-merge-filtergraph +++ b/tests/ref/fate/ffmpeg-heif-merge-filtergraph @@ -3,4 +3,4 @@ #codec_id 0: rawvideo #dimensions 0: 1280x720 #sar 0: 0/1 -0, 0, 0, 1, 1382400, 0x0f97ebd5 +0, 0, 0, 1, 1382400, 0xc219ea92 diff --git a/tests/ref/fate/filter-overlay-dvdsub-2397 b/tests/ref/fate/filter-overlay-dvdsub-2397 index 45c026f540..6a87265a84 100644 --- a/tests/ref/fate/filter-overlay-dvdsub-2397 +++ b/tests/ref/fate/filter-overlay-dvdsub-2397 @@ -497,360 +497,360 @@ 0, 118, 118, 1, 518400, 0xa47de755 1, 3952, 3952, 10, 2013, 0x0e5db67e 1, 3962, 3962, 10, 2013, 0xfc9baf97 -0, 119, 119, 1, 518400, 0x588534fc +0, 119, 119, 1, 518400, 0x703035e3 1, 3972, 3972, 10, 2013, 0x8e02a1b1 1, 3982, 3982, 10, 2013, 0x6eecaac8 1, 3992, 3992, 10, 2013, 0xf5558f0c 1, 4002, 4002, 10, 2013, 0x512ba99b -0, 120, 120, 1, 518400, 0x2145ebc1 +0, 120, 120, 1, 518400, 0x97b0ecc6 1, 4012, 4012, 10, 2013, 0x932b9932 1, 4022, 4022, 10, 2013, 0xc01ea987 -0, 121, 121, 1, 518400, 0x28bca595 +0, 121, 121, 1, 518400, 0x3d24a67d 1, 4038, 4038, 10, 2013, 0x10879cf7 1, 4048, 4048, 10, 2013, 0x90679338 1, 4058, 4058, 10, 2013, 0x077d8a9e 1, 4068, 4068, 10, 2013, 0x969fa57c -0, 122, 122, 1, 518400, 0x77dc951e +0, 122, 122, 1, 518400, 0x6cff9604 1, 4078, 4078, 10, 2013, 0xe049ab07 1, 4088, 4088, 10, 2013, 0xf535b3b3 1, 4098, 4098, 10, 2013, 0xfe76bd37 -0, 123, 123, 1, 518400, 0xe8924c17 +0, 123, 123, 1, 518400, 0x61404cf6 1, 4108, 4108, 10, 2013, 0xde79ad8c 1, 4123, 4123, 10, 2013, 0xe89b9c47 1, 4133, 4133, 10, 2013, 0xc570b0f0 -0, 124, 124, 1, 518400, 0xadb4cccc +0, 124, 124, 1, 518400, 0xd3f9cdb7 1, 4143, 4143, 10, 2013, 0xee709cd9 1, 4153, 4153, 10, 2013, 0xcfe5afab 1, 4163, 4163, 10, 2013, 0x98ff8ce4 -0, 125, 125, 1, 518400, 0x1d7b56ac +0, 125, 125, 1, 518400, 0xd50a5796 1, 4173, 4173, 10, 2013, 0x9d19b44c 1, 4183, 4183, 10, 2013, 0x4349917a 1, 4193, 4193, 10, 2013, 0xbf54a59a -0, 126, 126, 1, 518400, 0xad5739a4 +0, 126, 126, 1, 518400, 0x3fe13a8c 1, 4208, 4208, 10, 2013, 0xc4a399e0 1, 4218, 4218, 10, 2013, 0x1bf58ff0 1, 4228, 4228, 10, 2013, 0x3518ac56 -0, 127, 127, 1, 518400, 0x2733d35a +0, 127, 127, 1, 518400, 0x8613d44c 1, 4238, 4238, 10, 2013, 0xcd38c1de 1, 4248, 4248, 10, 2013, 0xbe7d9c4d 1, 4258, 4258, 10, 2013, 0xe113a306 1, 4268, 4268, 10, 2013, 0x083197ea -0, 128, 128, 1, 518400, 0x78e76da2 +0, 128, 128, 1, 518400, 0x5a066e83 1, 4278, 4278, 10, 2013, 0x1929b1eb 1, 4294, 4294, 10, 2013, 0x5d6ea5af 1, 4304, 4304, 10, 2013, 0x05519d53 -0, 129, 129, 1, 518400, 0x6c076013 +0, 129, 129, 1, 518400, 0x841a60f0 1, 4314, 4314, 10, 2013, 0x5773b380 1, 4324, 4324, 10, 2013, 0xaa70a8f5 1, 4334, 4334, 10, 2013, 0x990db0ec -0, 130, 130, 1, 518400, 0x7854f2b1 +0, 130, 130, 1, 518400, 0x8890f39c 1, 4344, 4344, 10, 2013, 0x91d3a623 1, 4354, 4354, 10, 2013, 0xc91f9824 1, 4364, 4364, 10, 2013, 0x1d058abf -0, 131, 131, 1, 518400, 0xd2ae1ecd +0, 131, 131, 1, 518400, 0x446f1fb8 1, 4379, 4379, 10, 2013, 0x8de1b8d5 1, 4389, 4389, 10, 2013, 0x7872b06b 1, 4399, 4399, 10, 2013, 0xa084c203 -0, 132, 132, 1, 518400, 0xf5eab38d +0, 132, 132, 1, 518400, 0x8025b479 1, 4409, 4409, 10, 2013, 0xff90ae8d 1, 4419, 4419, 10, 2013, 0x61dead8e 1, 4429, 4429, 10, 2013, 0xee76b284 -0, 133, 133, 1, 518400, 0x994d3e9c +0, 133, 133, 1, 518400, 0xb6f83f86 1, 4439, 4439, 10, 2013, 0xe888af7f 1, 4449, 4449, 10, 2013, 0x5d57b115 1, 4464, 4464, 10, 2013, 0xcdbfb1d0 -0, 134, 134, 1, 518400, 0x95ab705a +0, 134, 134, 1, 518400, 0x61a27162 1, 4474, 4474, 10, 2013, 0x2e28a952 1, 4484, 4484, 10, 2013, 0x4795a994 1, 4494, 4494, 10, 2013, 0x7e7ea304 1, 4504, 4504, 10, 2013, 0x9502c1e1 -0, 135, 135, 1, 518400, 0x3c83c5ce +0, 135, 135, 1, 518400, 0x09c1c6c6 1, 4514, 4514, 10, 2013, 0xf7c78ab2 1, 4524, 4524, 10, 2013, 0x24049816 1, 4534, 4534, 10, 2013, 0x52089dcf -0, 136, 136, 1, 518400, 0xfa22c508 +0, 136, 136, 1, 518400, 0x489fc5f2 1, 4550, 4550, 10, 2013, 0x2150a0b1 1, 4560, 4560, 10, 2013, 0x3c2e9b93 1, 4570, 4570, 10, 2013, 0x491f932b -0, 137, 137, 1, 518400, 0xddda1712 +0, 137, 137, 1, 518400, 0x736017fb 1, 4580, 4580, 10, 2013, 0x31359cf8 1, 4590, 4590, 10, 2013, 0x1b00ac3f 1, 4600, 4600, 10, 2013, 0x8d7ab3cb -0, 138, 138, 1, 518400, 0x985a3b93 +0, 138, 138, 1, 518400, 0x6ebd3c7c 1, 4610, 4610, 10, 2013, 0xb2c2a4de 1, 4620, 4620, 10, 2013, 0x80a4abf2 1, 4635, 4635, 10, 2013, 0x0701a4ee -0, 139, 139, 1, 518400, 0xea63c5e7 +0, 139, 139, 1, 518400, 0xf360c6dc 1, 4645, 4645, 10, 2013, 0xdc1ba5bc 1, 4655, 4655, 10, 2013, 0x6083a8a4 1, 4665, 4665, 10, 2013, 0x6226ad45 -0, 140, 140, 1, 518400, 0xef64983d +0, 140, 140, 1, 518400, 0x9c46993d 1, 4675, 4675, 10, 2013, 0x2732a205 1, 4685, 4685, 10, 2013, 0x0f62a0d3 1, 4695, 4695, 10, 2013, 0xc1799249 -0, 141, 141, 1, 518400, 0x747bb193 +0, 141, 141, 1, 518400, 0x6829b294 1, 4705, 4705, 10, 2013, 0xbccfa9c8 1, 4720, 4720, 10, 2013, 0xded096e7 1, 4730, 4730, 10, 2013, 0x7f0daf43 -0, 142, 142, 1, 518400, 0xb8748862 +0, 142, 142, 1, 518400, 0x13568953 1, 4740, 4740, 10, 2013, 0xc47ea682 1, 4750, 4750, 10, 2013, 0x5a72b07a 1, 4760, 4760, 10, 2013, 0x386faa8c 1, 4770, 4770, 10, 2013, 0xf9919a91 -0, 143, 143, 1, 518400, 0xaab55a5f +0, 143, 143, 1, 518400, 0x22095b4e 1, 4780, 4780, 10, 2013, 0x4908897e 1, 4790, 4790, 10, 2013, 0x4882b594 -0, 144, 144, 1, 518400, 0x7b468add +0, 144, 144, 1, 518400, 0xd86e8bd3 1, 4806, 4806, 10, 2013, 0x113e98d1 1, 4816, 4816, 10, 2013, 0x5098b30d 1, 4826, 4826, 10, 2013, 0x0ef7b857 1, 4836, 4836, 10, 2013, 0x216ea176 -0, 145, 145, 1, 518400, 0xf2078707 +0, 145, 145, 1, 518400, 0x61aa87f6 1, 4846, 4846, 10, 2013, 0xf906944a 1, 4856, 4856, 10, 2013, 0xee9b92fb 1, 4866, 4866, 10, 2013, 0xd6029209 -0, 146, 146, 1, 518400, 0x6a2d931e +0, 146, 146, 1, 518400, 0x29479418 1, 4876, 4876, 10, 2013, 0x2256a12e 1, 4891, 4891, 10, 2013, 0x89de8e4a 1, 4901, 4901, 10, 2013, 0x0bf0a584 -0, 147, 147, 1, 518400, 0xbbe3c417 +0, 147, 147, 1, 518400, 0x5066c50c 1, 4911, 4911, 10, 2013, 0x6a5ebd58 1, 4921, 4921, 10, 2013, 0x3edd9aa4 1, 4931, 4931, 10, 2013, 0xbd66ac26 -0, 148, 148, 1, 518400, 0x6294e449 +0, 148, 148, 1, 518400, 0x1246e549 1, 4941, 4941, 10, 2013, 0x313896ea 1, 4951, 4951, 10, 2013, 0x6b83a6a0 1, 4961, 4961, 10, 2013, 0x9aafb109 -0, 149, 149, 1, 518400, 0xa05721e7 +0, 149, 149, 1, 518400, 0x36d722d5 1, 4976, 4976, 10, 2013, 0x5192a85a 1, 4986, 4986, 10, 2013, 0x1f919f79 1, 4996, 4996, 10, 2013, 0xc0799c40 -0, 150, 150, 1, 518400, 0x37749183 +0, 150, 150, 1, 518400, 0xacd09288 1, 5006, 5006, 10, 2013, 0x2988bcd8 1, 5016, 5016, 10, 2013, 0x1482913a 1, 5026, 5026, 10, 2013, 0x74da9a94 1, 5036, 5036, 10, 2013, 0x763eb709 -0, 151, 151, 1, 518400, 0xf9d9dca0 +0, 151, 151, 1, 518400, 0x7b13dda6 1, 5046, 5046, 10, 2013, 0x1285b405 1, 5062, 5062, 10, 2013, 0xb6ab9dfc -0, 152, 152, 1, 518400, 0x5f8ccf08 +0, 152, 152, 1, 518400, 0xeb30d01a 1, 5072, 5072, 10, 2013, 0xe4c8bf19 1, 5082, 5082, 10, 2013, 0xabbbade8 1, 5092, 5092, 10, 2013, 0xf8b69d89 1, 5102, 5102, 10, 2013, 0xce04a866 -0, 153, 153, 1, 518400, 0x7303f77b +0, 153, 153, 1, 518400, 0x23e1f885 1, 5112, 5112, 10, 2013, 0x07528abf 1, 5122, 5122, 10, 2013, 0x74fb98bf 1, 5132, 5132, 10, 2013, 0x579fb1c9 -0, 154, 154, 1, 518400, 0x22b0513f +0, 154, 154, 1, 518400, 0xe1bb5236 1, 5147, 5147, 10, 2013, 0x7ddea2ed 1, 5157, 5157, 10, 2013, 0x296caa2c 1, 5167, 5167, 10, 2013, 0x346d9c4f -0, 155, 155, 1, 518400, 0x330485d2 +0, 155, 155, 1, 518400, 0x334386c2 1, 5177, 5177, 10, 2013, 0x3e1fba15 1, 5187, 5187, 10, 2013, 0x48a2908f 1, 5197, 5197, 10, 2013, 0xc1938d09 -0, 156, 156, 1, 518400, 0x7f83daea +0, 156, 156, 1, 518400, 0x9f28dbd8 1, 5207, 5207, 10, 2013, 0x0e96a060 1, 5217, 5217, 10, 2013, 0x7b6a9e06 1, 5232, 5232, 10, 2013, 0x5b779d28 -0, 157, 157, 1, 518400, 0xee19f2df +0, 157, 157, 1, 518400, 0x9ef6f3d1 1, 5242, 5242, 10, 2013, 0xf600aca1 1, 5252, 5252, 10, 2013, 0x3a6c9e68 1, 5262, 5262, 10, 2013, 0x0c8dc1b0 -0, 158, 158, 1, 518400, 0xb71b1c77 +0, 158, 158, 1, 518400, 0xe1ff1d52 1, 5272, 5272, 10, 2013, 0x26beb245 1, 5282, 5282, 10, 2013, 0x2bc09557 1, 5292, 5292, 10, 2013, 0x27fc8845 1, 5302, 5302, 10, 2013, 0x1025aa47 -0, 159, 159, 1, 518400, 0xbffc1856 +0, 159, 159, 1, 518400, 0xab6d1932 1, 5318, 5318, 10, 2013, 0xc2e69baa 1, 5328, 5328, 10, 2013, 0xdb249b92 1, 5338, 5338, 10, 2013, 0x6ccda29e -0, 160, 160, 1, 518400, 0xabc125aa +0, 160, 160, 1, 518400, 0x407526a2 1, 5348, 5348, 10, 2013, 0xeaf6a1cf 1, 5358, 5358, 10, 2013, 0x509ba397 1, 5368, 5368, 10, 2013, 0xfaf8a2df -0, 161, 161, 1, 518400, 0x5ee467f8 +0, 161, 161, 1, 518400, 0xda2d68e6 1, 5378, 5378, 10, 2013, 0x41388f28 1, 5388, 5388, 10, 2013, 0xfe5eab39 1, 5403, 5403, 10, 2013, 0xd5ffa066 -0, 162, 162, 1, 518400, 0x6c2cf168 +0, 162, 162, 1, 518400, 0x0405f255 1, 5413, 5413, 10, 2013, 0x6813a30a 1, 5423, 5423, 10, 2013, 0x9be89718 1, 5433, 5433, 10, 2013, 0xaec3a27b -0, 163, 163, 1, 518400, 0x63996b26 +0, 163, 163, 1, 518400, 0xbd8e6c14 1, 5446, 5446, 10, 2013, 0x579a983e 1, 5456, 5456, 10, 2013, 0x98cea21f 1, 5466, 5466, 10, 2013, 0xca77a58a -0, 164, 164, 1, 518400, 0xb34d789a +0, 164, 164, 1, 518400, 0xe66f798f 1, 5476, 5476, 10, 2013, 0xcbc3b1ee 1, 5486, 5486, 10, 2013, 0xf3bb8f07 1, 5496, 5496, 10, 2013, 0x6aeebd92 -0, 165, 165, 1, 518400, 0xf49c030f +0, 165, 165, 1, 518400, 0x4f25040f 1, 5506, 5506, 10, 2013, 0xe955a449 1, 5516, 5516, 10, 2013, 0x9436aa5b 1, 5531, 5531, 10, 2013, 0x4f0a8f9f -0, 166, 166, 1, 518400, 0x092dc41a +0, 166, 166, 1, 518400, 0x37e5c512 1, 5541, 5541, 10, 2013, 0x3551b22d 1, 5551, 5551, 10, 2013, 0x0959a3d4 1, 5561, 5561, 10, 2013, 0x2ed5a11b 1, 5571, 5571, 10, 2013, 0x8f52a5c3 -0, 167, 167, 1, 518400, 0x4134c577 +0, 167, 167, 1, 518400, 0x95ddc65e 1, 5581, 5581, 10, 2013, 0x6552978d 1, 5591, 5591, 10, 2013, 0x7dcca0c1 1, 5601, 5601, 10, 2013, 0xbcd4a3c9 -0, 168, 168, 1, 518400, 0x261de1ed +0, 168, 168, 1, 518400, 0xe7d3e2de 1, 5616, 5616, 10, 2013, 0xfe41a8d8 1, 5626, 5626, 10, 2013, 0xc85aae14 1, 5636, 5636, 10, 2013, 0x1185b346 -0, 169, 169, 1, 518400, 0xcbc8566a +0, 169, 169, 1, 518400, 0x6d0d5759 1, 5646, 5646, 10, 2013, 0xf7429a0d 1, 5656, 5656, 10, 2013, 0x48c2a160 1, 5666, 5666, 10, 2013, 0x9d85a85d -0, 170, 170, 1, 518400, 0x407a5c76 +0, 170, 170, 1, 518400, 0x1ad45d67 1, 5676, 5676, 10, 2013, 0xbbe89fe9 1, 5686, 5686, 10, 2013, 0xea429fe2 1, 5702, 5702, 10, 2013, 0x221ca1d4 -0, 171, 171, 1, 518400, 0x1ed73bb2 +0, 171, 171, 1, 518400, 0xe5c83cb4 1, 5712, 5712, 10, 2013, 0x394b925b 1, 5722, 5722, 10, 2013, 0x556dc26f 1, 5732, 5732, 10, 2013, 0xce21a5e1 -0, 172, 172, 1, 518400, 0x8467ddb5 +0, 172, 172, 1, 518400, 0xaf37de9f 1, 5742, 5742, 10, 2013, 0xbc87c0a8 1, 5752, 5752, 10, 2013, 0xbac4ac07 1, 5762, 5762, 10, 2013, 0xdeefa4aa 1, 5772, 5772, 10, 2013, 0x1f15b362 -0, 173, 173, 1, 518400, 0x0523dc73 +0, 173, 173, 1, 518400, 0xcfbddd73 1, 5787, 5787, 10, 2013, 0x6406b7b2 1, 5797, 5797, 10, 2013, 0x8030a03d -0, 174, 174, 1, 518400, 0x81f5e895 +0, 174, 174, 1, 518400, 0xf741e985 1, 5807, 5807, 10, 2013, 0x0373a5b1 1, 5817, 5817, 10, 2013, 0x34ef93da 1, 5827, 5827, 10, 2013, 0x94c198fe 1, 5837, 5837, 10, 2013, 0xfefcabad -0, 175, 175, 1, 518400, 0xfc74608d +0, 175, 175, 1, 518400, 0xb62e616e 1, 5847, 5847, 10, 2013, 0x8755b3ec 1, 5857, 5857, 10, 2013, 0xe436a6fd 1, 5872, 5872, 10, 2013, 0x9cf5a11e -0, 176, 176, 1, 518400, 0xc4e0dae0 +0, 176, 176, 1, 518400, 0xccfbdbbd 1, 5882, 5882, 10, 2013, 0x03b8a98c 1, 5892, 5892, 10, 2013, 0x6216a138 1, 5902, 5902, 10, 2013, 0xd87b9f12 -0, 177, 177, 1, 518400, 0x98367f5b +0, 177, 177, 1, 518400, 0x66108032 1, 5912, 5912, 10, 2013, 0x4ce99653 1, 5922, 5922, 10, 2013, 0x6c2ea9e2 1, 5932, 5932, 10, 2013, 0x918cae4c -0, 178, 178, 1, 518400, 0x0f1a869d +0, 178, 178, 1, 518400, 0x1c26876e 1, 5942, 5942, 10, 2013, 0xd19fa5f2 1, 5958, 5958, 10, 2013, 0x0bdda7c6 1, 5968, 5968, 10, 2013, 0x0f9ab0ca -0, 179, 179, 1, 518400, 0x45b6ccf2 +0, 179, 179, 1, 518400, 0x950bcdcc 1, 5978, 5978, 10, 2013, 0x410a92b1 1, 5988, 5988, 10, 2013, 0xcfbe9d1c 1, 5998, 5998, 10, 2013, 0x59ed9d15 -0, 180, 180, 1, 518400, 0x5f9ccb77 +0, 180, 180, 1, 518400, 0x46f4cc3f 1, 6008, 6008, 10, 2013, 0x4e129e27 1, 6018, 6018, 10, 2013, 0x7bb9ac0a 1, 6028, 6028, 10, 2013, 0x826ca82b -0, 181, 181, 1, 518400, 0x5f15ea31 +0, 181, 181, 1, 518400, 0x0818eafc 1, 6043, 6043, 10, 2013, 0x9ad5a74b 1, 6053, 6053, 10, 2013, 0x6c5f969a 1, 6063, 6063, 10, 2013, 0x8479a0e5 -0, 182, 182, 1, 518400, 0x86369f27 +0, 182, 182, 1, 518400, 0x372a9ff8 1, 6073, 6073, 10, 2013, 0x165298ef 1, 6083, 6083, 10, 2013, 0xdcadb4a1 1, 6093, 6093, 10, 2013, 0xa90e987c 1, 6103, 6103, 10, 2013, 0x1ac5b510 -0, 183, 183, 1, 518400, 0x2e27f9fa +0, 183, 183, 1, 518400, 0xc46afacb 1, 6113, 6113, 10, 2013, 0x66728d85 1, 6128, 6128, 10, 2013, 0xe4859fc5 1, 6138, 6138, 10, 2013, 0x9901786e -0, 184, 184, 1, 518400, 0xc029a44d +0, 184, 184, 1, 518400, 0x3984a527 1, 6148, 6148, 10, 2013, 0x6aebb406 1, 6158, 6158, 10, 2013, 0x7d13a2cc 1, 6168, 6168, 10, 2013, 0x99b7a8cc -0, 185, 185, 1, 518400, 0xebee33b0 +0, 185, 185, 1, 518400, 0xd28b3486 1, 6178, 6178, 10, 2013, 0x80b8a624 1, 6188, 6188, 10, 2013, 0xbb6aa271 1, 6198, 6198, 10, 2013, 0x17af9e4a -0, 186, 186, 1, 518400, 0x19e5494f +0, 186, 186, 1, 518400, 0x0f004a31 1, 6214, 6214, 10, 2013, 0xfaf0a8f1 1, 6224, 6224, 10, 2013, 0xd6849b93 1, 6234, 6234, 10, 2013, 0xe9829669 -0, 187, 187, 1, 518400, 0xf697bd7c +0, 187, 187, 1, 518400, 0xaf06be66 1, 6244, 6244, 10, 2013, 0x7ec98944 1, 6254, 6254, 10, 2013, 0x2b2099a4 1, 6264, 6264, 10, 2013, 0x1033a82f -0, 188, 188, 1, 518400, 0x82569002 +0, 188, 188, 1, 518400, 0x041290db 1, 6274, 6274, 10, 2013, 0x5ec88990 1, 6284, 6284, 10, 2013, 0xd2a19b3d 1, 6299, 6299, 10, 2013, 0xa377b268 -0, 189, 189, 1, 518400, 0xfcb6d707 +0, 189, 189, 1, 518400, 0x5544d7e4 1, 6309, 6309, 10, 2013, 0xfa859901 1, 6319, 6319, 10, 2013, 0x1713955a 1, 6329, 6329, 10, 2013, 0x70aab0da 1, 6339, 6339, 10, 2013, 0xcdaea422 -0, 190, 190, 1, 518400, 0x82a9662b +0, 190, 190, 1, 518400, 0x4f2a6714 1, 6349, 6349, 10, 2013, 0x65c3bf80 1, 6359, 6359, 10, 2013, 0x1d75a55f 1, 6369, 6369, 10, 2013, 0xa5bea4de -0, 191, 191, 1, 518400, 0x212e16ee +0, 191, 191, 1, 518400, 0x91b617d5 1, 6384, 6384, 10, 2013, 0x184db71c 1, 6394, 6394, 10, 2013, 0x99858ec8 1, 6404, 6404, 10, 2013, 0xb8f2aee5 -0, 192, 192, 1, 518400, 0x2ca34dca +0, 192, 192, 1, 518400, 0x9a494eaf 1, 6414, 6414, 10, 2013, 0x4435b2ef 1, 6424, 6424, 10, 2013, 0x8acfa6c7 1, 6434, 6434, 10, 2013, 0x42b4c01f -0, 193, 193, 1, 518400, 0xe9ebe0a5 +0, 193, 193, 1, 518400, 0xaff1e191 1, 6444, 6444, 10, 2013, 0x6e308c13 1, 6454, 6454, 10, 2013, 0x8227a0f6 1, 6470, 6470, 10, 2013, 0x6f12a7a2 -0, 194, 194, 1, 518400, 0x4e6b6917 +0, 194, 194, 1, 518400, 0xacc36a11 1, 6480, 6480, 10, 2013, 0x785392be 1, 6490, 6490, 10, 2013, 0x81849c2b 1, 6500, 6500, 10, 2013, 0x5cf2af65 -0, 195, 195, 1, 518400, 0x7dcf20ab +0, 195, 195, 1, 518400, 0x9be5218c 1, 6510, 6510, 10, 2013, 0x0c6ca6b4 1, 6520, 6520, 10, 2013, 0x412fab9f 1, 6530, 6530, 10, 2013, 0x08e792b4 -0, 196, 196, 1, 518400, 0xf30fac97 +0, 196, 196, 1, 518400, 0xb063ad76 1, 6540, 6540, 10, 2013, 0x407aace3 1, 6555, 6555, 10, 2013, 0xd26bac16 1, 6565, 6565, 10, 2013, 0xac8bb295 -0, 197, 197, 1, 518400, 0xcb9fc692 +0, 197, 197, 1, 518400, 0x4520c773 1, 6575, 6575, 10, 2013, 0xddd1949c 1, 6585, 6585, 10, 2013, 0x6b26b868 1, 6595, 6595, 10, 2013, 0x5eaba587 1, 6605, 6605, 10, 2013, 0xef0793b9 -0, 198, 198, 1, 518400, 0x5d05601e +0, 198, 198, 1, 518400, 0x991e610f 1, 6615, 6615, 10, 2013, 0xdef19bd6 1, 6625, 6625, 10, 2013, 0xca98a635 -0, 199, 199, 1, 518400, 0x456c1417 +0, 199, 199, 1, 518400, 0xdf8214f4 1, 6640, 6640, 10, 2013, 0x06269a5a 1, 6650, 6650, 10, 2013, 0x32cb9952 1, 6660, 6660, 10, 2013, 0xf01fa95a 1, 6670, 6670, 10, 2013, 0xefab9e55 -0, 200, 200, 1, 518400, 0x9a0fd1ad +0, 200, 200, 1, 518400, 0x8844d29c 1, 6680, 6680, 10, 2013, 0x55a3b63a 1, 6690, 6690, 10, 2013, 0xcd36a553 1, 6700, 6700, 10, 2013, 0x2ec19877 -0, 201, 201, 1, 518400, 0x55db9716 +0, 201, 201, 1, 518400, 0x1d9097fe 1, 6710, 6710, 10, 2013, 0xc18b924c 1, 6726, 6726, 10, 2013, 0xf132b04c 1, 6736, 6736, 10, 2013, 0x7975a44d -0, 202, 202, 1, 518400, 0x1f0d40d6 +0, 202, 202, 1, 518400, 0x430141bb 1, 6746, 6746, 10, 2013, 0x2aaf94cb 1, 6756, 6756, 10, 2013, 0x58cfa60f 1, 6766, 6766, 10, 2013, 0x9757a658 -0, 203, 203, 1, 518400, 0x73695c82 +0, 203, 203, 1, 518400, 0xe9665d69 1, 6776, 6776, 10, 2013, 0x67ebc0d5 1, 6786, 6786, 10, 2013, 0x3c50a70e 1, 6796, 6796, 10, 2013, 0x9c5799c6 -0, 204, 204, 1, 518400, 0xb0f10812 +0, 204, 204, 1, 518400, 0xe0e30902 1, 6811, 6811, 10, 2013, 0x018d85b2 1, 6821, 6821, 10, 2013, 0x5367a956 -0, 205, 205, 1, 518400, 0xdec18505 -0, 208, 208, 1, 518400, 0xb147b947 +0, 205, 205, 1, 518400, 0xa45f85f1 +0, 208, 208, 1, 518400, 0x42cbba34 0, 240, 240, 1, 518400, 0x9d2e3977 diff --git a/tests/ref/fate/matroska-stereo3d-sbs b/tests/ref/fate/matroska-stereo3d-sbs index f4d5256037..13bbcb3aeb 100644 --- a/tests/ref/fate/matroska-stereo3d-sbs +++ b/tests/ref/fate/matroska-stereo3d-sbs @@ -1,5 +1,5 @@ -16938e7e91ea9492eef3654d3db9af57 *tests/data/fate/matroska-stereo3d-sbs.matroska -38205 tests/data/fate/matroska-stereo3d-sbs.matroska +3d5849ad6cfb704e148b5b1b6f62a9ed *tests/data/fate/matroska-stereo3d-sbs.matroska +38213 tests/data/fate/matroska-stereo3d-sbs.matroska #extradata 0: 30, 0x47ab0576 #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/mxf-d10-user-comments b/tests/ref/fate/mxf-d10-user-comments index ba126d2ea4..9f3092f4af 100644 --- a/tests/ref/fate/mxf-d10-user-comments +++ b/tests/ref/fate/mxf-d10-user-comments @@ -1,4 +1,4 @@ -454136266f7c6a18ca2c9efee07d25da *tests/data/fate/mxf-d10-user-comments.mxf_d10 +d0dae277c0cb07f517ae2b456658f123 *tests/data/fate/mxf-d10-user-comments.mxf_d10 3782189 tests/data/fate/mxf-d10-user-comments.mxf_d10 #extradata 0: 34, 0x716b05c4 #tb 0: 1/25 @@ -6,11 +6,11 @@ #codec_id 0: mpeg2video #dimensions 0: 1280x720 #sar 0: 3/4 -0, -1, 0, 1, 150000, 0x0071d23b -0, 0, 1, 1, 150000, 0xbaf7ba4a, F=0x0 -0, 1, 2, 1, 150000, 0xde2b9cd9, F=0x0 -0, 2, 3, 1, 150000, 0x7a66b4c9, F=0x0 -0, 3, 4, 1, 150000, 0xfc7e91a1, F=0x0 +0, -1, 0, 1, 150000, 0xa811adc1 +0, 0, 1, 1, 150000, 0x4952bac6, F=0x0 +0, 1, 2, 1, 150000, 0x6b437346, F=0x0 +0, 2, 3, 1, 150000, 0x36dbac43, F=0x0 +0, 3, 4, 1, 150000, 0xe1c2955a, F=0x0 [FORMAT] TAG:operational_pattern_ul=060e2b34.04010101.0d010201.01010900 TAG:uid=adab4424-2f25-4dc7-92ff-000c00000000 diff --git a/tests/ref/lavf/dv b/tests/ref/lavf/dv index 7ae4223a21..d301571411 100644 --- a/tests/ref/lavf/dv +++ b/tests/ref/lavf/dv @@ -1,3 +1,3 @@ -2fb332aab8f2ba9c33b1b2368194392a *tests/data/lavf/lavf.dv +343b03a4ae5a95adb7340fc453c7e61e *tests/data/lavf/lavf.dv 3600000 tests/data/lavf/lavf.dv -tests/data/lavf/lavf.dv CRC=0xbdaf7f52 +tests/data/lavf/lavf.dv CRC=0x3efa60d5 diff --git a/tests/ref/lavf/dv_ntsc b/tests/ref/lavf/dv_ntsc index c6aa6b1fbb..7b5953461a 100644 --- a/tests/ref/lavf/dv_ntsc +++ b/tests/ref/lavf/dv_ntsc @@ -1,3 +1,3 @@ -d28a4c67aa8e3413458de9ca7e6f00ed *tests/data/lavf/lavf.dv_ntsc +947f17de36e17a8f91c844ae84ea1409 *tests/data/lavf/lavf.dv_ntsc 3480000 tests/data/lavf/lavf.dv_ntsc -tests/data/lavf/lavf.dv_ntsc CRC=0xaa69ba6a +tests/data/lavf/lavf.dv_ntsc CRC=0xadfc9598 diff --git a/tests/ref/lavf/dv_pal b/tests/ref/lavf/dv_pal index 93bb728c46..b16911f8d1 100644 --- a/tests/ref/lavf/dv_pal +++ b/tests/ref/lavf/dv_pal @@ -1,3 +1,3 @@ -7830f9c6716ceb6011f865f1e521b951 *tests/data/lavf/lavf.dv_pal +7a0264fd1c59908e6c6c3d7557a1ca21 *tests/data/lavf/lavf.dv_pal 3600000 tests/data/lavf/lavf.dv_pal -tests/data/lavf/lavf.dv_pal CRC=0xd428d3ee +tests/data/lavf/lavf.dv_pal CRC=0x5573b571 diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf index e8351fab86..77958e9fa3 100644 --- a/tests/ref/lavf/gxf +++ b/tests/ref/lavf/gxf @@ -1,3 +1,3 @@ -0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf -795876 tests/data/lavf/lavf.gxf -tests/data/lavf/lavf.gxf CRC=0x5ade0285 +1daed037a9177758cec5cb8d1d507aac *tests/data/lavf/lavf.gxf +796020 tests/data/lavf/lavf.gxf +tests/data/lavf/lavf.gxf CRC=0xdb5d9d15 diff --git a/tests/ref/lavf/gxf_ntsc b/tests/ref/lavf/gxf_ntsc index d74e8d8ba4..3c3ef7d43e 100644 --- a/tests/ref/lavf/gxf_ntsc +++ b/tests/ref/lavf/gxf_ntsc @@ -1,3 +1,3 @@ -5071abe1fd46a3ca3d669203c6d45883 *tests/data/lavf/lavf.gxf_ntsc -793900 tests/data/lavf/lavf.gxf_ntsc -tests/data/lavf/lavf.gxf_ntsc CRC=0xb73f184e +b5946298495a6234044887afa2b10bb4 *tests/data/lavf/lavf.gxf_ntsc +794100 tests/data/lavf/lavf.gxf_ntsc +tests/data/lavf/lavf.gxf_ntsc CRC=0x4a373084 diff --git a/tests/ref/lavf/gxf_pal b/tests/ref/lavf/gxf_pal index aefcd0ccab..419f1dcba4 100644 --- a/tests/ref/lavf/gxf_pal +++ b/tests/ref/lavf/gxf_pal @@ -1,3 +1,3 @@ -4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal -795880 tests/data/lavf/lavf.gxf_pal -tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76 +7690ad7cb7acca33ae29879f937233cd *tests/data/lavf/lavf.gxf_pal +796024 tests/data/lavf/lavf.gxf_pal +tests/data/lavf/lavf.gxf_pal CRC=0x9e3e8a15 diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 018a9fec45..4626e7af44 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -96857fc58eceb82a0dc2c38dadd7f70b *tests/data/lavf/lavf.mkv -320453 tests/data/lavf/lavf.mkv +1e6bddfa6a19e4c1a42401b5b0d556f0 *tests/data/lavf/lavf.mkv +320461 tests/data/lavf/lavf.mkv tests/data/lavf/lavf.mkv CRC=0x5df3232f diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index 3105ddccbf..9af9e61ff6 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -96d4bab2f4ee95236480afbee2b64f77 *tests/data/lavf/lavf.mkv_attachment -472603 tests/data/lavf/lavf.mkv_attachment +74beaeb8a0ddb24490b8c8de9ee8c54f *tests/data/lavf/lavf.mkv_attachment +472611 tests/data/lavf/lavf.mkv_attachment tests/data/lavf/lavf.mkv_attachment CRC=0x5df3232f diff --git a/tests/ref/lavf/mxf b/tests/ref/lavf/mxf index 4cf3388afa..7e90a07f21 100644 --- a/tests/ref/lavf/mxf +++ b/tests/ref/lavf/mxf @@ -1,9 +1,9 @@ -fac1fb467168a374e96ea12755558869 *tests/data/lavf/lavf.mxf +b3e24d85944c027e86d5d410ab7e4670 *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab -d711481c4f81f6466fd92bdc7ed6c968 *tests/data/lavf/lavf.mxf +c714c4f9bea014001c51d25a3d4bee8f *tests/data/lavf/lavf.mxf 551481 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0xf091e687 -7f4f8048c4f2d714e45947d4f39b8ea3 *tests/data/lavf/lavf.mxf +779a390835c475041fc711db9004bee5 *tests/data/lavf/lavf.mxf 526393 tests/data/lavf/lavf.mxf tests/data/lavf/lavf.mxf CRC=0x8dddfaab diff --git a/tests/ref/lavf/mxf_d10 b/tests/ref/lavf/mxf_d10 index 191e9f877c..1dfaf476a3 100644 --- a/tests/ref/lavf/mxf_d10 +++ b/tests/ref/lavf/mxf_d10 @@ -1,3 +1,3 @@ -963758bdb2a5d64f4e68c205fc5aba96 *tests/data/lavf/lavf.mxf_d10 +0f1187f21b47d645ea6ea4c3cea3d73d *tests/data/lavf/lavf.mxf_d10 5332013 tests/data/lavf/lavf.mxf_d10 -tests/data/lavf/lavf.mxf_d10 CRC=0x6c74d488 +tests/data/lavf/lavf.mxf_d10 CRC=0xc58d9422 diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index 95a58906a0..33a0511398 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -59d632e097e6f45c28445b2ab862ffe8 *tests/data/lavf/lavf.mxf_dv25 +e9a10efc1a6d127448ac6b60b0b3af51 *tests/data/lavf/lavf.mxf_dv25 3834413 tests/data/lavf/lavf.mxf_dv25 -tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52 +tests/data/lavf/lavf.mxf_dv25 CRC=0x3efa60d5 diff --git a/tests/ref/lavf/mxf_dvcpro100 b/tests/ref/lavf/mxf_dvcpro100 index 8193828e2c..21e1d21e53 100644 --- a/tests/ref/lavf/mxf_dvcpro100 +++ b/tests/ref/lavf/mxf_dvcpro100 @@ -1,3 +1,3 @@ -efa5cdde54ac38b02827ee8b6d7f03a4 *tests/data/lavf/lavf.mxf_dvcpro100 +a2d6031d60aee54d24919d7628a1f7b5 *tests/data/lavf/lavf.mxf_dvcpro100 14637613 tests/data/lavf/lavf.mxf_dvcpro100 -tests/data/lavf/lavf.mxf_dvcpro100 CRC=0x245e9a5f +tests/data/lavf/lavf.mxf_dvcpro100 CRC=0x25feb3fd diff --git a/tests/ref/lavf/mxf_dvcpro50 b/tests/ref/lavf/mxf_dvcpro50 index 5be1b6875e..7cf0cc8f0c 100644 --- a/tests/ref/lavf/mxf_dvcpro50 +++ b/tests/ref/lavf/mxf_dvcpro50 @@ -1,3 +1,3 @@ -8494122b2a8e8e5998ace60d4d508d46 *tests/data/lavf/lavf.mxf_dvcpro50 +25160bc35e28e0fe89b5ce1ea89e0eff *tests/data/lavf/lavf.mxf_dvcpro50 7431213 tests/data/lavf/lavf.mxf_dvcpro50 -tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xe3bbe4b4 +tests/data/lavf/lavf.mxf_dvcpro50 CRC=0xfd34a6d9 diff --git a/tests/ref/seek/lavf-gxf b/tests/ref/seek/lavf-gxf index 716246268b..188452b3d4 100644 --- a/tests/ref/seek/lavf-gxf +++ b/tests/ref/seek/lavf-gxf @@ -2,52 +2,52 @@ ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st:-1 flags:0 ts:-1.000000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 0 flags:0 ts: 0.780000 -ret: 0 st: 0 flags:0 dts: 0.800000 pts: NOPTS pos: 653420 size: 22124 +ret: 0 st: 0 flags:0 dts: 0.800000 pts: NOPTS pos: 653704 size: 22032 ret: 0 st: 0 flags:1 ts:-0.320000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st: 1 flags:0 ts: 2.580000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 1 flags:1 ts: 1.480000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 2 flags:0 ts: 0.360000 -ret: 0 st: 0 flags:0 dts: 0.360000 pts: NOPTS pos: 302672 size: 25116 +ret: 0 st: 0 flags:0 dts: 0.360000 pts: NOPTS pos: 302740 size: 25108 ret: 0 st: 2 flags:1 ts:-0.740000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st:-1 flags:0 ts: 2.153336 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 0 flags:0 ts:-0.060000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st: 0 flags:1 ts: 2.840000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 1 flags:0 ts: 1.740000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 1 flags:1 ts: 0.620000 -ret: 0 st: 0 flags:0 dts: 0.640000 pts: NOPTS pos: 497196 size: 21612 +ret: 0 st: 0 flags:0 dts: 0.640000 pts: NOPTS pos: 497424 size: 21608 ret: 0 st: 2 flags:0 ts:-0.480000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st: 2 flags:1 ts: 2.420000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:0 dts: 0.200000 pts: NOPTS pos: 209504 size: 22964 +ret: 0 st: 0 flags:0 dts: 0.200000 pts: NOPTS pos: 209456 size: 22972 ret: 0 st: 0 flags:0 ts:-0.900000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st: 0 flags:1 ts: 1.980000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 1 flags:0 ts: 0.880000 -ret: 0 st: 0 flags:0 dts: 0.880000 pts: NOPTS pos: 696160 size: 21820 +ret: 0 st: 0 flags:0 dts: 0.880000 pts: NOPTS pos: 696340 size: 21772 ret: 0 st: 1 flags:1 ts:-0.220000 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 ret: 0 st: 2 flags:0 ts: 2.680000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st: 2 flags:1 ts: 1.560000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741124 size: 54736 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: NOPTS pos: 741264 size: 54740 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: NOPTS pos: 370700 size: 54628 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: NOPTS pos: 370852 size: 54580 ret: 0 st:-1 flags:1 ts:-0.645825 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 5024 size: 65536 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index e327959058..05add1844d 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 697 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 697 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 689 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 697 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292321 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292329 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320165 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320173 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146873 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146881 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 905 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 913 size: 27837 diff --git a/tests/ref/seek/vsynth_lena-mpeg2-422 b/tests/ref/seek/vsynth_lena-mpeg2-422 index 1fc2bf93a0..1167ffe166 100644 --- a/tests/ref/seek/vsynth_lena-mpeg2-422 +++ b/tests/ref/seek/vsynth_lena-mpeg2-422 @@ -1,46 +1,46 @@ -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329242 size: 21479 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329739 size: 21500 ret: 0 st: 0 flags:0 ts: 0.788334 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203086 size: 24774 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203720 size: 24595 ret:-1 st: 0 flags:1 ts:-0.317499 ret:-1 st:-1 flags:0 ts: 2.576668 ret: 0 st:-1 flags:1 ts: 1.470835 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268154 size: 22845 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268843 size: 23110 ret: 0 st: 0 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 108763 size: 32204 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 109828 size: 32323 ret:-1 st: 0 flags:1 ts:-0.740831 ret:-1 st:-1 flags:0 ts: 2.153336 ret: 0 st:-1 flags:1 ts: 1.047503 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203086 size: 24774 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203720 size: 24595 ret: 0 st: 0 flags:0 ts:-0.058330 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st: 0 flags:1 ts: 2.835837 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329242 size: 21479 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329739 size: 21500 ret: 0 st:-1 flags:0 ts: 1.730004 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329242 size: 21479 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329739 size: 21500 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 108763 size: 32204 +ret: 0 st: 0 flags:1 dts: 0.400000 pts: NOPTS pos: 109828 size: 32323 ret: 0 st: 0 flags:0 ts:-0.481662 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st: 0 flags:1 ts: 2.412505 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329242 size: 21479 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329739 size: 21500 ret: 0 st:-1 flags:0 ts: 1.306672 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268154 size: 22845 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268843 size: 23110 ret: 0 st:-1 flags:1 ts: 0.200839 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st: 0 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18339 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: NOPTS pos: 0 size: 18546 ret: 0 st: 0 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329242 size: 21479 +ret: 0 st: 0 flags:1 dts: 1.840000 pts: NOPTS pos: 329739 size: 21500 ret: 0 st:-1 flags:0 ts: 0.883340 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268154 size: 22845 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268843 size: 23110 ret:-1 st:-1 flags:1 ts:-0.222493 ret:-1 st: 0 flags:0 ts: 2.671674 ret: 0 st: 0 flags:1 ts: 1.565841 -ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268154 size: 22845 +ret: 0 st: 0 flags:1 dts: 1.360000 pts: NOPTS pos: 268843 size: 23110 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203086 size: 24774 +ret: 0 st: 0 flags:1 dts: 0.880000 pts: NOPTS pos: 203720 size: 24595 ret:-1 st:-1 flags:1 ts:-0.645825 diff --git a/tests/ref/vsynth/vsynth1-dv b/tests/ref/vsynth/vsynth1-dv index 2762fb65d3..a7d1732803 100644 --- a/tests/ref/vsynth/vsynth1-dv +++ b/tests/ref/vsynth/vsynth1-dv @@ -1,4 +1,4 @@ -4246668d61439617101d051d7a995108 *tests/data/fate/vsynth1-dv.dv +adc7407581ce59a8523c21eafc5816d3 *tests/data/fate/vsynth1-dv.dv 7200000 tests/data/fate/vsynth1-dv.dv -6a8785ff1768e9cceb8272d067b8e4df *tests/data/fate/vsynth1-dv.out.rawvideo -stddev: 7.48 PSNR: 30.65 MAXDIFF: 76 bytes: 7603200/ 7603200 +03cb7d33cbf595f49ae0a612645b937e *tests/data/fate/vsynth1-dv.out.rawvideo +stddev: 6.90 PSNR: 31.34 MAXDIFF: 76 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-411 b/tests/ref/vsynth/vsynth1-dv-411 index f954ee35f2..321f88ac96 100644 --- a/tests/ref/vsynth/vsynth1-dv-411 +++ b/tests/ref/vsynth/vsynth1-dv-411 @@ -1,4 +1,4 @@ -df067afe65f1712d9e8efa7117aab6ea *tests/data/fate/vsynth1-dv-411.dv +672fea6f3a7520be517a9805fb21f40c *tests/data/fate/vsynth1-dv-411.dv 7200000 tests/data/fate/vsynth1-dv-411.dv -dd1f307ce315306c93701af6fce03e04 *tests/data/fate/vsynth1-dv-411.out.rawvideo -stddev: 9.93 PSNR: 28.19 MAXDIFF: 84 bytes: 7603200/ 7603200 +e5770b32c4887ca756f217ddfd9a17f3 *tests/data/fate/vsynth1-dv-411.out.rawvideo +stddev: 9.51 PSNR: 28.56 MAXDIFF: 84 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-50 b/tests/ref/vsynth/vsynth1-dv-50 index 371077d83f..a3e2e50689 100644 --- a/tests/ref/vsynth/vsynth1-dv-50 +++ b/tests/ref/vsynth/vsynth1-dv-50 @@ -1,4 +1,4 @@ -adb1df1a65cecab225677003a5de9f28 *tests/data/fate/vsynth1-dv-50.dv +2ad59ce2f2f16d6c6d13cbdfbc91c51c *tests/data/fate/vsynth1-dv-50.dv 14400000 tests/data/fate/vsynth1-dv-50.dv -62e412c20d15db556c3d1f481e84a557 *tests/data/fate/vsynth1-dv-50.out.rawvideo -stddev: 1.72 PSNR: 43.41 MAXDIFF: 29 bytes: 7603200/ 7603200 +9835507c030dfcafb1da68e1a9c8174e *tests/data/fate/vsynth1-dv-50.out.rawvideo +stddev: 2.00 PSNR: 42.09 MAXDIFF: 33 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-fhd b/tests/ref/vsynth/vsynth1-dv-fhd index bb8885cb36..261c778eef 100644 --- a/tests/ref/vsynth/vsynth1-dv-fhd +++ b/tests/ref/vsynth/vsynth1-dv-fhd @@ -1,4 +1,4 @@ -74315a8678d12c7f592c02990dc8952d *tests/data/fate/vsynth1-dv-fhd.dv +25358c8711e14fcb2d323f17c2dac9e2 *tests/data/fate/vsynth1-dv-fhd.dv 28800000 tests/data/fate/vsynth1-dv-fhd.dv -67e5831babb4df3458916f35d1f75f57 *tests/data/fate/vsynth1-dv-fhd.out.rawvideo -stddev: 2.63 PSNR: 39.72 MAXDIFF: 35 bytes: 7603200/ 7603200 +2d0665ede0c7971e2c07fe2a9bab80e7 *tests/data/fate/vsynth1-dv-fhd.out.rawvideo +stddev: 2.52 PSNR: 40.07 MAXDIFF: 33 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-dv-hd b/tests/ref/vsynth/vsynth1-dv-hd index 5d227ca8d8..0163648578 100644 --- a/tests/ref/vsynth/vsynth1-dv-hd +++ b/tests/ref/vsynth/vsynth1-dv-hd @@ -1,4 +1,4 @@ -b2bcafc74dec5f9ca516cb25dd07459b *tests/data/fate/vsynth1-dv-hd.dv +f90617c638c3b0791610caf461543d3d *tests/data/fate/vsynth1-dv-hd.dv 14400000 tests/data/fate/vsynth1-dv-hd.dv -cf209014c7a0019e1970989263fb0a6c *tests/data/fate/vsynth1-dv-hd.out.rawvideo -stddev: 4.40 PSNR: 35.26 MAXDIFF: 74 bytes: 7603200/ 7603200 +70dd405a0c2a51e0c9ad292116ae9d9b *tests/data/fate/vsynth1-dv-hd.out.rawvideo +stddev: 4.27 PSNR: 35.52 MAXDIFF: 74 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth1-mpeg2-422 b/tests/ref/vsynth/vsynth1-mpeg2-422 index b4d7919884..f825c703ab 100644 --- a/tests/ref/vsynth/vsynth1-mpeg2-422 +++ b/tests/ref/vsynth/vsynth1-mpeg2-422 @@ -1,4 +1,4 @@ -651f054730be04257498eeae08b3bdc5 *tests/data/fate/vsynth1-mpeg2-422.mpeg2video -855859 tests/data/fate/vsynth1-mpeg2-422.mpeg2video -5819721624335aca527479eadd111818 *tests/data/fate/vsynth1-mpeg2-422.out.rawvideo -stddev: 9.98 PSNR: 28.14 MAXDIFF: 178 bytes: 7603200/ 7603200 +d4a6d061a9dd4e2279178b005d53a027 *tests/data/fate/vsynth1-mpeg2-422.mpeg2video +864200 tests/data/fate/vsynth1-mpeg2-422.mpeg2video +3963a0679dbe26a15287123ef998250f *tests/data/fate/vsynth1-mpeg2-422.out.rawvideo +stddev: 9.40 PSNR: 28.66 MAXDIFF: 169 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv b/tests/ref/vsynth/vsynth2-dv index a24112af66..a18d281aea 100644 --- a/tests/ref/vsynth/vsynth2-dv +++ b/tests/ref/vsynth/vsynth2-dv @@ -1,4 +1,4 @@ -6a059698f1f619312dd91504697cca98 *tests/data/fate/vsynth2-dv.dv +654ae49a62c0a622e331caaac52771ab *tests/data/fate/vsynth2-dv.dv 7200000 tests/data/fate/vsynth2-dv.dv -d243461a7f0ffe5ad6e6f55116f02669 *tests/data/fate/vsynth2-dv.out.rawvideo -stddev: 2.06 PSNR: 41.84 MAXDIFF: 38 bytes: 7603200/ 7603200 +fbe28a56dbce3f3d4c431387d531284a *tests/data/fate/vsynth2-dv.out.rawvideo +stddev: 1.99 PSNR: 42.13 MAXDIFF: 38 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-411 b/tests/ref/vsynth/vsynth2-dv-411 index 81bb9e7107..b76cabbac4 100644 --- a/tests/ref/vsynth/vsynth2-dv-411 +++ b/tests/ref/vsynth/vsynth2-dv-411 @@ -1,4 +1,4 @@ -a4afd3c595b4242fb5f1329c82a0b0c2 *tests/data/fate/vsynth2-dv-411.dv +b86adde161ed48c788be4732040a57b3 *tests/data/fate/vsynth2-dv-411.dv 7200000 tests/data/fate/vsynth2-dv-411.dv -c493fa38fbf20cfabb2604892245e536 *tests/data/fate/vsynth2-dv-411.out.rawvideo -stddev: 3.58 PSNR: 37.04 MAXDIFF: 56 bytes: 7603200/ 7603200 +925554523efdddec3afc1cffc2a82087 *tests/data/fate/vsynth2-dv-411.out.rawvideo +stddev: 3.49 PSNR: 37.26 MAXDIFF: 56 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-50 b/tests/ref/vsynth/vsynth2-dv-50 index 8ff5f8a697..d9dad51697 100644 --- a/tests/ref/vsynth/vsynth2-dv-50 +++ b/tests/ref/vsynth/vsynth2-dv-50 @@ -1,4 +1,4 @@ -8774632954e780697c472d945c597daf *tests/data/fate/vsynth2-dv-50.dv +d72bf5e9d9b4013f29c7224a0d820a87 *tests/data/fate/vsynth2-dv-50.dv 14400000 tests/data/fate/vsynth2-dv-50.dv -415874f0bdbb99e1cd545da6b750f922 *tests/data/fate/vsynth2-dv-50.out.rawvideo -stddev: 0.86 PSNR: 49.43 MAXDIFF: 17 bytes: 7603200/ 7603200 +eb8e4df1fb5b1c6ffccc4e204076b093 *tests/data/fate/vsynth2-dv-50.out.rawvideo +stddev: 0.92 PSNR: 48.85 MAXDIFF: 17 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-fhd b/tests/ref/vsynth/vsynth2-dv-fhd index ae6764ec7d..3606d82854 100644 --- a/tests/ref/vsynth/vsynth2-dv-fhd +++ b/tests/ref/vsynth/vsynth2-dv-fhd @@ -1,4 +1,4 @@ -1f96ce7c1a5f09ec9d30c51c7271cf77 *tests/data/fate/vsynth2-dv-fhd.dv +2f8912c74603aee00817e8e7c2bc9ece *tests/data/fate/vsynth2-dv-fhd.dv 28800000 tests/data/fate/vsynth2-dv-fhd.dv -a07ad25682cb775f311f476cc45541d3 *tests/data/fate/vsynth2-dv-fhd.out.rawvideo -stddev: 1.18 PSNR: 46.66 MAXDIFF: 21 bytes: 7603200/ 7603200 +e19b75c1b4622ee5aebb478a0569bf3e *tests/data/fate/vsynth2-dv-fhd.out.rawvideo +stddev: 1.15 PSNR: 46.85 MAXDIFF: 21 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-dv-hd b/tests/ref/vsynth/vsynth2-dv-hd index 6ff29df2cd..44ab7bbbe2 100644 --- a/tests/ref/vsynth/vsynth2-dv-hd +++ b/tests/ref/vsynth/vsynth2-dv-hd @@ -1,4 +1,4 @@ -a9a4c750f7720e83d538d36c318be787 *tests/data/fate/vsynth2-dv-hd.dv +eea6719cf633de08f0ebf78e6ae528b5 *tests/data/fate/vsynth2-dv-hd.dv 14400000 tests/data/fate/vsynth2-dv-hd.dv -9dd8c60ac5b4de1b4d3db233ecba0b28 *tests/data/fate/vsynth2-dv-hd.out.rawvideo -stddev: 1.78 PSNR: 43.09 MAXDIFF: 34 bytes: 7603200/ 7603200 +3074f3f46fa8f33b44e36f855fd35d14 *tests/data/fate/vsynth2-dv-hd.out.rawvideo +stddev: 1.74 PSNR: 43.29 MAXDIFF: 34 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-mpeg2-422 b/tests/ref/vsynth/vsynth2-mpeg2-422 index 5497ece63a..d36933469e 100644 --- a/tests/ref/vsynth/vsynth2-mpeg2-422 +++ b/tests/ref/vsynth/vsynth2-mpeg2-422 @@ -1,4 +1,4 @@ -fcaf6242ca4b706d392e40d9631e3465 *tests/data/fate/vsynth2-mpeg2-422.mpeg2video -383946 tests/data/fate/vsynth2-mpeg2-422.mpeg2video -0cba1ea3af323b69197269f2a51c55bd *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo -stddev: 4.00 PSNR: 36.09 MAXDIFF: 69 bytes: 7603200/ 7603200 +e8c3ca1ed876d574e59774136394d7fa *tests/data/fate/vsynth2-mpeg2-422.mpeg2video +384183 tests/data/fate/vsynth2-mpeg2-422.mpeg2video +0d31c637a6d6b788ff6e7aa5d4816d4d *tests/data/fate/vsynth2-mpeg2-422.out.rawvideo +stddev: 3.94 PSNR: 36.22 MAXDIFF: 74 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-dv-fhd b/tests/ref/vsynth/vsynth3-dv-fhd index 08ca9ef889..27cf70a329 100644 --- a/tests/ref/vsynth/vsynth3-dv-fhd +++ b/tests/ref/vsynth/vsynth3-dv-fhd @@ -1,4 +1,4 @@ -5b8b7f1dc31d7076af891e94c2e88c06 *tests/data/fate/vsynth3-dv-fhd.dv +3ea3837896d94a98704f403df2e08023 *tests/data/fate/vsynth3-dv-fhd.dv 28800000 tests/data/fate/vsynth3-dv-fhd.dv a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-dv-fhd.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-dv-hd b/tests/ref/vsynth/vsynth3-dv-hd index 11a51b18b8..dedd197e67 100644 --- a/tests/ref/vsynth/vsynth3-dv-hd +++ b/tests/ref/vsynth/vsynth3-dv-hd @@ -1,4 +1,4 @@ -63512193a0da09e15815c1be1b9c4fa5 *tests/data/fate/vsynth3-dv-hd.dv +7c9b2b87178b8e86cb28b7b7400e5b7c *tests/data/fate/vsynth3-dv-hd.dv 14400000 tests/data/fate/vsynth3-dv-hd.dv a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-dv-hd.out.rawvideo stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth3-mpeg2-422 b/tests/ref/vsynth/vsynth3-mpeg2-422 index 2b7903b5f8..a8c15158c3 100644 --- a/tests/ref/vsynth/vsynth3-mpeg2-422 +++ b/tests/ref/vsynth/vsynth3-mpeg2-422 @@ -1,4 +1,4 @@ -96dc854fc40a6410d4edc387b63ded1a *tests/data/fate/vsynth3-mpeg2-422.mpeg2video -75445 tests/data/fate/vsynth3-mpeg2-422.mpeg2video -f64545a4597f0927dde0b1a9618f4bb9 *tests/data/fate/vsynth3-mpeg2-422.out.rawvideo -stddev: 5.15 PSNR: 33.89 MAXDIFF: 48 bytes: 86700/ 86700 +9ff411140881fc30606d2aa0127372ca *tests/data/fate/vsynth3-mpeg2-422.mpeg2video +74027 tests/data/fate/vsynth3-mpeg2-422.mpeg2video +3d015d3e63e63a77f8a16ea119f6b6fa *tests/data/fate/vsynth3-mpeg2-422.out.rawvideo +stddev: 3.18 PSNR: 38.07 MAXDIFF: 26 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-dv b/tests/ref/vsynth/vsynth_lena-dv index 0abcf50f26..424285bec2 100644 --- a/tests/ref/vsynth/vsynth_lena-dv +++ b/tests/ref/vsynth/vsynth_lena-dv @@ -1,4 +1,4 @@ -ab03241e988dcd5bd36a76b25372343f *tests/data/fate/vsynth_lena-dv.dv +038d2a2ea3157e31ef85321cb98c959f *tests/data/fate/vsynth_lena-dv.dv 7200000 tests/data/fate/vsynth_lena-dv.dv -44e957e705830c7084d10a68a46c953b *tests/data/fate/vsynth_lena-dv.out.rawvideo -stddev: 1.76 PSNR: 43.17 MAXDIFF: 33 bytes: 7603200/ 7603200 +701b9371e554a6cf00be9773ec752a3d *tests/data/fate/vsynth_lena-dv.out.rawvideo +stddev: 1.69 PSNR: 43.54 MAXDIFF: 33 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-411 b/tests/ref/vsynth/vsynth_lena-dv-411 index e034198c6f..ad365808aa 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-411 +++ b/tests/ref/vsynth/vsynth_lena-dv-411 @@ -1,4 +1,4 @@ -1a7f091993eb6fe5b6f9d927ba60387d *tests/data/fate/vsynth_lena-dv-411.dv +e9096f08713600ee26037104d331abe5 *tests/data/fate/vsynth_lena-dv-411.dv 7200000 tests/data/fate/vsynth_lena-dv-411.dv -405c4b0f32200263db4e92d2664c9e67 *tests/data/fate/vsynth_lena-dv-411.out.rawvideo -stddev: 2.92 PSNR: 38.81 MAXDIFF: 45 bytes: 7603200/ 7603200 +1946aa863ac9186febd2e11db5ac19ac *tests/data/fate/vsynth_lena-dv-411.out.rawvideo +stddev: 2.88 PSNR: 38.93 MAXDIFF: 45 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-50 b/tests/ref/vsynth/vsynth_lena-dv-50 index 793f8d703f..e619f132b8 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-50 +++ b/tests/ref/vsynth/vsynth_lena-dv-50 @@ -1,4 +1,4 @@ -c678b291e58a277725aa4557387efc58 *tests/data/fate/vsynth_lena-dv-50.dv +bf8ef8f20e3a184d9f08226e8da90f05 *tests/data/fate/vsynth_lena-dv-50.dv 14400000 tests/data/fate/vsynth_lena-dv-50.dv -b6cd429a0ebe0c267110ed44fa9894f7 *tests/data/fate/vsynth_lena-dv-50.out.rawvideo -stddev: 0.78 PSNR: 50.27 MAXDIFF: 12 bytes: 7603200/ 7603200 +8067206b7a51fee9b470063fa4a5cf80 *tests/data/fate/vsynth_lena-dv-50.out.rawvideo +stddev: 0.82 PSNR: 49.84 MAXDIFF: 13 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-fhd b/tests/ref/vsynth/vsynth_lena-dv-fhd index 5ce70fe970..767ca8b9ef 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-fhd +++ b/tests/ref/vsynth/vsynth_lena-dv-fhd @@ -1,4 +1,4 @@ -3a33e512f8b3f4213477c98d4e7e2559 *tests/data/fate/vsynth_lena-dv-fhd.dv +f78e7474ee563d0e8215abb7f02dccfe *tests/data/fate/vsynth_lena-dv-fhd.dv 28800000 tests/data/fate/vsynth_lena-dv-fhd.dv -5f43e4d999a9bd060158a31d7614527e *tests/data/fate/vsynth_lena-dv-fhd.out.rawvideo -stddev: 1.05 PSNR: 47.65 MAXDIFF: 14 bytes: 7603200/ 7603200 +dd15da7acbcb46ee1f65f807119d5cfc *tests/data/fate/vsynth_lena-dv-fhd.out.rawvideo +stddev: 1.03 PSNR: 47.81 MAXDIFF: 14 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-dv-hd b/tests/ref/vsynth/vsynth_lena-dv-hd index 33a03ca0dd..0e37a8a3a1 100644 --- a/tests/ref/vsynth/vsynth_lena-dv-hd +++ b/tests/ref/vsynth/vsynth_lena-dv-hd @@ -1,4 +1,4 @@ -f17abb38ed2f416d57f3b956fae5dc82 *tests/data/fate/vsynth_lena-dv-hd.dv +b6ed53a9dcd7b41d541793c8563a8b66 *tests/data/fate/vsynth_lena-dv-hd.dv 14400000 tests/data/fate/vsynth_lena-dv-hd.dv -837cabe2bd4c2eb3a0d4d2778b9fe0ab *tests/data/fate/vsynth_lena-dv-hd.out.rawvideo -stddev: 1.51 PSNR: 44.50 MAXDIFF: 27 bytes: 7603200/ 7603200 +e33c392b80363d0f8aaf3c13df9f7e60 *tests/data/fate/vsynth_lena-dv-hd.out.rawvideo +stddev: 1.48 PSNR: 44.69 MAXDIFF: 26 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth_lena-mpeg2-422 b/tests/ref/vsynth/vsynth_lena-mpeg2-422 index 73a671f9a8..3e8b3a472a 100644 --- a/tests/ref/vsynth/vsynth_lena-mpeg2-422 +++ b/tests/ref/vsynth/vsynth_lena-mpeg2-422 @@ -1,4 +1,4 @@ -87e5c69775b363db649c253050536045 *tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video -361341 tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video -66167032c592492e23f6a5bfff87db1c *tests/data/fate/vsynth_lena-mpeg2-422.out.rawvideo -stddev: 3.01 PSNR: 38.53 MAXDIFF: 57 bytes: 7603200/ 7603200 +630bdb3cb2cd64701deaed4908949fe2 *tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video +361836 tests/data/fate/vsynth_lena-mpeg2-422.mpeg2video +245954de7a9a013222353126ca7d1b6e *tests/data/fate/vsynth_lena-mpeg2-422.out.rawvideo +stddev: 2.96 PSNR: 38.68 MAXDIFF: 60 bytes: 7603200/ 7603200