November 2024 - ffmpeg-cvslog

avcodec/vvcdec: return error if CTU size > 128
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:38 2024 +0800| [4de67e874697271e189022b03cd619329d54603c] | committer: Nuo Mi avcodec/vvcdec: return error if CTU size > 128 The v3 spec reserves CTU size 256. Currently, we use an uint8_t* table to hold cb_width and cb_height. If a CTU size of 256 is not split, cb_width and cb_height will overflow to 0. To avoid switching to uint16_t, rejecting CTU size 256 provides a simple solution. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4de67e874697271e1… --- libavcodec/vvc/ps.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index f32f1cc5a1..14cedfd1b3 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -649,6 +649,12 @@ static int decode_ps(VVCParamSets *ps, const CodedBitstreamH266Context *h266, vo if (ret < 0) return ret; + if (rsps->sps_log2_ctu_size_minus5 > 2) { + // CTU > 128 are reserved in vvc spec v3 + av_log(log_ctx, AV_LOG_ERROR, "CTU size > 128. \n"); + return AVERROR_PATCHWELCOME; + } + ret = decode_pps(ps, rpps); if (ret < 0) return ret;

1 0

avcodec/vvcdec: schedule next stage only if the current stage reports no error
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:37 2024 +0800| [eb67e60cb004c17ecbbd43c6e3c6732c19de5d33] | committer: Nuo Mi avcodec/vvcdec: schedule next stage only if the current stage reports no error If the current stage reports an error, some variables may not be correctly initialized. Scheduling the next stage could lead to the use of uninitialized variables. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb67e60cb004c17ec… --- libavcodec/vvc/thread.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/thread.c b/libavcodec/vvc/thread.c index f623d6a394..77778f8358 100644 --- a/libavcodec/vvc/thread.c +++ b/libavcodec/vvc/thread.c @@ -656,9 +656,9 @@ static void task_run_stage(VVCTask *t, VVCContext *s, VVCLocalContext *lc) "frame %5d, %s(%3d, %3d) failed with %d\r\n", (int)fc->decode_order, task_name[stage], t->rx, t->ry, ret); } + if (!ret) + task_stage_done(t, s); } - - task_stage_done(t, s); return; }

1 0

avcodec/vvcdec: misc, reformat inter_data()
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:36 2024 +0800| [4ec767abcc1036a424e4b30ef6d0d3b180d4eed4] | committer: Nuo Mi avcodec/vvcdec: misc, reformat inter_data() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ec767abcc1036a42… --- libavcodec/vvc/ctu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 6c0c52b836..a32abdeb62 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1779,7 +1779,7 @@ static int inter_data(VVCLocalContext *lc) if (pu->general_merge_flag) { ret = hls_merge_data(lc); - } else if (cu->pred_mode == MODE_IBC){ + } else if (cu->pred_mode == MODE_IBC) { ret = mvp_data_ibc(lc); } else { ret = mvp_data(lc); @@ -1788,8 +1788,7 @@ static int inter_data(VVCLocalContext *lc) if (ret) return ret; - if (cu->pred_mode == MODE_IBC) - { + if (cu->pred_mode == MODE_IBC) { ff_vvc_update_hmvp(lc, mi); } else if (!pu->merge_gpm_flag && !pu->inter_affine_flag && !pu->merge_subblock_flag) { refine_regular_subblock(lc);

1 0

avcodec/vvcdec: inter_data, check the return value from hls_merge_data
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:35 2024 +0800| [ba89c5b989938fad751ac451d1f6ef813bb42460] | committer: Nuo Mi avcodec/vvcdec: inter_data, check the return value from hls_merge_data Reported-by: Frank Plowman <post(a)frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba89c5b989938fad7… --- libavcodec/vvc/ctu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c index 1e06119cfd..6c0c52b836 100644 --- a/libavcodec/vvc/ctu.c +++ b/libavcodec/vvc/ctu.c @@ -1778,13 +1778,16 @@ static int inter_data(VVCLocalContext *lc) pu->general_merge_flag = ff_vvc_general_merge_flag(lc); if (pu->general_merge_flag) { - hls_merge_data(lc); + ret = hls_merge_data(lc); } else if (cu->pred_mode == MODE_IBC){ ret = mvp_data_ibc(lc); } else { ret = mvp_data(lc); } + if (ret) + return ret; + if (cu->pred_mode == MODE_IBC) { ff_vvc_update_hmvp(lc, mi);

1 0

avcodec/cbs_h266: stricter validation for subpicture's max width and height
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:34 2024 +0800| [98698ed3c24bfd0b1e6e6db943b5f25f6046cee7] | committer: Nuo Mi avcodec/cbs_h266: stricter validation for subpicture's max width and height Co-authored-by: Frank Plowman <post(a)frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98698ed3c24bfd0b1… --- libavcodec/cbs_h266_syntax_template.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index fd42734166..43def9220f 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1147,11 +1147,11 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, infer(sps_subpic_ctu_top_left_x[0], 0); infer(sps_subpic_ctu_top_left_y[0], 0); if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) - ubs(wlen, sps_subpic_width_minus1[0], 1, 0); + us(wlen, sps_subpic_width_minus1[0], 0, max_width_minus1, 1, 0); else infer(sps_subpic_width_minus1[0], max_width_minus1); if (current->sps_pic_height_max_in_luma_samples > ctb_size_y) - ubs(hlen, sps_subpic_height_minus1[0], 1, 0); + us(hlen, sps_subpic_height_minus1[0], 0, max_width_minus1, 1, 0); else infer(sps_subpic_height_minus1[0], max_height_minus1); if (!current->sps_independent_subpics_flag) { @@ -1201,14 +1201,14 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, if (i < current->sps_num_subpics_minus1 && current->sps_pic_width_max_in_luma_samples > ctb_size_y) { - us(wlen, sps_subpic_width_minus1[i], min_width, MAX_UINT_BITS(wlen), 1, i); + us(wlen, sps_subpic_width_minus1[i], min_width, max_width_minus1, 1, i); } else { infer(sps_subpic_width_minus1[i], max_width_minus1); } if (i < current->sps_num_subpics_minus1 && current->sps_pic_height_max_in_luma_samples > ctb_size_y) { - us(hlen, sps_subpic_height_minus1[i], min_height, MAX_UINT_BITS(hlen), 1, i); + us(hlen, sps_subpic_height_minus1[i], min_height, max_height_minus1, 1, i); } else { infer(sps_subpic_height_minus1[i], max_height_minus1); }

1 0

avcodec/cbs_h266: improve readability in subpicture parser
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:33 2024 +0800| [e06515b092225f7d954aa64aedde98df097515ee] | committer: Nuo Mi avcodec/cbs_h266: improve readability in subpicture parser > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e06515b092225f7d9… --- libavcodec/cbs_h266_syntax_template.c | 102 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 8abd3d1ba7..fd42734166 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1057,7 +1057,7 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, H266RawSPS *current) { CodedBitstreamH266Context *h266 = ctx->priv_data; - int err, i, j; + int err, i, j, max_width_minus1, max_height_minus1; unsigned int ctb_log2_size_y, min_cb_log2_size_y, min_qt_log2_size_intra_y, min_qt_log2_size_inter_y, ctb_size_y, max_num_merge_cand, tmp_width_val, tmp_height_val; @@ -1130,6 +1130,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, ctb_log2_size_y); tmp_height_val = AV_CEIL_RSHIFT(current->sps_pic_height_max_in_luma_samples, ctb_log2_size_y); + max_width_minus1 = tmp_width_val - 1; + max_height_minus1 = tmp_height_val - 1; flag(sps_subpic_info_present_flag); if (current->sps_subpic_info_present_flag) { @@ -1147,11 +1149,11 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) ubs(wlen, sps_subpic_width_minus1[0], 1, 0); else - infer(sps_subpic_width_minus1[0], tmp_width_val - 1); + infer(sps_subpic_width_minus1[0], max_width_minus1); if (current->sps_pic_height_max_in_luma_samples > ctb_size_y) ubs(hlen, sps_subpic_height_minus1[0], 1, 0); else - infer(sps_subpic_height_minus1[0], tmp_height_val - 1); + infer(sps_subpic_height_minus1[0], max_height_minus1); if (!current->sps_independent_subpics_flag) { flags(sps_subpic_treated_as_pic_flag[0], 1, 0); flags(sps_loop_filter_across_subpic_enabled_flag[0], 1, 0); @@ -1161,58 +1163,54 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, } for (i = 1; i <= current->sps_num_subpics_minus1; i++) { if (!current->sps_subpic_same_size_flag) { - if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) { - const int win_right_edge = - current->sps_pic_width_max_in_luma_samples - - current->sps_conf_win_right_offset * sub_width_c; - us(wlen, sps_subpic_ctu_top_left_x[i], 0, - AV_CEIL_RSHIFT(win_right_edge, ctb_log2_size_y) - 1, - 1, i); - } else + const int win_right_edge = + current->sps_pic_width_max_in_luma_samples - + current->sps_conf_win_right_offset * sub_width_c; + const int win_bottom_edge = + current->sps_pic_height_max_in_luma_samples - + current->sps_conf_win_bottom_offset * sub_height_c; + const int win_left_edge = + current->sps_conf_win_left_offset * sub_width_c; + const int win_top_edge = + current->sps_conf_win_top_offset * sub_height_c; + const int win_left_edge_ctus = + AV_CEIL_RSHIFT(win_left_edge, ctb_log2_size_y); + const int win_right_edge_ctus = + AV_CEIL_RSHIFT(win_right_edge, ctb_log2_size_y); + const int win_top_edge_ctus = + AV_CEIL_RSHIFT(win_top_edge, ctb_log2_size_y); + const int win_bottom_edge_ctus = + AV_CEIL_RSHIFT(win_bottom_edge, ctb_log2_size_y); + const int min_width = + FFMAX(win_left_edge_ctus - current->sps_subpic_ctu_top_left_x[i], 0); + const int min_height = + FFMAX(win_top_edge_ctus - current->sps_subpic_ctu_top_left_y[i], 0); + + if (current->sps_pic_width_max_in_luma_samples > ctb_size_y) + us(wlen, sps_subpic_ctu_top_left_x[i], 0, win_right_edge_ctus - 1, 1, i); + else infer(sps_subpic_ctu_top_left_x[i], 0); - if (current->sps_pic_height_max_in_luma_samples > - ctb_size_y) { - const int win_bottom_edge = - current->sps_pic_height_max_in_luma_samples - - current->sps_conf_win_bottom_offset * sub_height_c; - us(hlen, sps_subpic_ctu_top_left_y[i], 0, - AV_CEIL_RSHIFT(win_bottom_edge, ctb_log2_size_y) - 1, - 1, i); - } else + + if (current->sps_pic_height_max_in_luma_samples > ctb_size_y) + us(hlen, sps_subpic_ctu_top_left_y[i], 0, win_bottom_edge_ctus - 1, 1, i); + else infer(sps_subpic_ctu_top_left_y[i], 0); + + max_width_minus1 = tmp_width_val - current->sps_subpic_ctu_top_left_x[i] - 1; + max_height_minus1 = tmp_height_val - current->sps_subpic_ctu_top_left_y[i] - 1; + if (i < current->sps_num_subpics_minus1 && - current->sps_pic_width_max_in_luma_samples > - ctb_size_y) { - const int win_left_edge = - current->sps_conf_win_left_offset * sub_width_c; - const int win_left_edge_ctus = - AV_CEIL_RSHIFT(win_left_edge, ctb_log2_size_y); - us(wlen, sps_subpic_width_minus1[i], - win_left_edge_ctus > current->sps_subpic_ctu_top_left_x[i] - ? win_left_edge_ctus - current->sps_subpic_ctu_top_left_x[i] - : 0, - MAX_UINT_BITS(wlen), 1, i); + current->sps_pic_width_max_in_luma_samples > ctb_size_y) { + us(wlen, sps_subpic_width_minus1[i], min_width, MAX_UINT_BITS(wlen), 1, i); } else { - infer(sps_subpic_width_minus1[i], - tmp_width_val - - current->sps_subpic_ctu_top_left_x[i] - 1); + infer(sps_subpic_width_minus1[i], max_width_minus1); } + if (i < current->sps_num_subpics_minus1 && - current->sps_pic_height_max_in_luma_samples > - ctb_size_y) { - const int win_top_edge = - current->sps_conf_win_top_offset * sub_height_c; - const int win_top_edge_ctus = - AV_CEIL_RSHIFT(win_top_edge, ctb_log2_size_y); - us(hlen, sps_subpic_height_minus1[i], - win_top_edge_ctus > current->sps_subpic_ctu_top_left_y[i] - ? win_top_edge_ctus - current->sps_subpic_ctu_top_left_y[i] - : 0, - MAX_UINT_BITS(hlen), 1, i); + current->sps_pic_height_max_in_luma_samples > ctb_size_y) { + us(hlen, sps_subpic_height_minus1[i], min_height, MAX_UINT_BITS(hlen), 1, i); } else { - infer(sps_subpic_height_minus1[i], - tmp_height_val - - current->sps_subpic_ctu_top_left_y[i] - 1); + infer(sps_subpic_height_minus1[i], max_height_minus1); } } else { int num_subpic_cols = tmp_width_val / @@ -1245,8 +1243,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, } else { infer(sps_subpic_ctu_top_left_x[0], 0); infer(sps_subpic_ctu_top_left_y[0], 0); - infer(sps_subpic_width_minus1[0], tmp_width_val - 1); - infer(sps_subpic_height_minus1[0], tmp_height_val - 1); + infer(sps_subpic_width_minus1[0], max_width_minus1); + infer(sps_subpic_height_minus1[0], max_height_minus1); } ue(sps_subpic_id_len_minus1, 0, 15); if ((1 << (current->sps_subpic_id_len_minus1 + 1)) < @@ -1273,8 +1271,8 @@ static int FUNC(sps)(CodedBitstreamContext *ctx, RWContext *rw, infer(sps_subpic_id_mapping_explicitly_signalled_flag, 0); infer(sps_subpic_ctu_top_left_x[0], 0); infer(sps_subpic_ctu_top_left_y[0], 0); - infer(sps_subpic_width_minus1[0], tmp_width_val - 1); - infer(sps_subpic_height_minus1[0], tmp_height_val - 1); + infer(sps_subpic_width_minus1[0], max_width_minus1); + infer(sps_subpic_height_minus1[0], max_height_minus1); }

1 0

avcodec/vvcdec: ensure every CTU belongs to a slice
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:32 2024 +0800| [5c5a08ecb53b1b9d97512ce398fa395c3fb8c1a8] | committer: Nuo Mi avcodec/vvcdec: ensure every CTU belongs to a slice According to section 6.3.3 "Spatial or component-wise partitionings," CTUs should fully cover slices with no overlaps, gaps, or additions. No overlaps are ensured by task_init_parse. No gaps and no additions are ensured by this patch. Co-authored-by: Frank Plowman <post(a)frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5c5a08ecb53b1b9d9… --- libavcodec/vvc/thread.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/vvc/thread.c b/libavcodec/vvc/thread.c index 82c00dd4c9..f623d6a394 100644 --- a/libavcodec/vvc/thread.c +++ b/libavcodec/vvc/thread.c @@ -822,6 +822,13 @@ int ff_vvc_frame_submit(VVCContext *s, VVCFrameContext *fc) } } } + for (int rs = 0; rs < ft->ctu_count; rs++) { + const VVCTask *t = ft->tasks + rs; + if (!t->sc) { + av_log(s->avctx, AV_LOG_ERROR, "frame %5d, CTU(%d, %d) not belong to any slice\r\n", (int)fc->decode_order, t->rx, t->ry); + return AVERROR_INVALIDDATA; + } + } frame_thread_add_score(s, ft, 0, 0, VVC_TASK_STAGE_INIT); return 0;

1 0

avcodec/cbs_h266: check subpicture slices number
by Nuo Mi 30 Nov '24

30 Nov '24

ffmpeg | branch: master | Nuo Mi <nuomi2021(a)gmail.com> | Sat Nov 23 17:32:31 2024 +0800| [46006529a16efab45c865114a559914afe281341] | committer: Nuo Mi avcodec/cbs_h266: check subpicture slices number According to section 6.3.3, 'Spatial or component-wise partitionings,' Subpictures must cover the entire picture. Therefore, the total number of subpicture slices should equal the number of picture slices Co-authored-by: Frank Plowman <post(a)frankplowman.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46006529a16efab45… --- libavcodec/cbs_h266_syntax_template.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_h266_syntax_template.c b/libavcodec/cbs_h266_syntax_template.c index 6b2d6534ef..8abd3d1ba7 100644 --- a/libavcodec/cbs_h266_syntax_template.c +++ b/libavcodec/cbs_h266_syntax_template.c @@ -1966,7 +1966,7 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, infer(pps_single_slice_per_subpic_flag, 1); if (current->pps_rect_slice_flag && !current->pps_single_slice_per_subpic_flag) { - int j; + int j, num_slices = 0; uint16_t tile_idx = 0, tile_x, tile_y, ctu_x, ctu_y; uint16_t slice_top_left_ctu_x[VVC_MAX_SLICES]; uint16_t slice_top_left_ctu_y[VVC_MAX_SLICES]; @@ -2155,7 +2155,10 @@ static int FUNC(pps) (CodedBitstreamContext *ctx, RWContext *rw, current->num_slices_in_subpic[i]++; } } + num_slices += current->num_slices_in_subpic[i]; } + if (current->pps_num_slices_in_pic_minus1 + 1 != num_slices) + return AVERROR_INVALIDDATA; } else { if (current->pps_no_pic_partition_flag) infer(pps_num_slices_in_pic_minus1, 0);

1 0

tests/fate/filter-audio: add aloop test
by Marton Balint 29 Nov '24

29 Nov '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Mon Nov 4 01:06:32 2024 +0100| [4100a2da297bddfacc634f93d0634fc34869cbf1] | committer: Marton Balint tests/fate/filter-audio: add aloop test Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4100a2da297bddfac… --- tests/fate/filter-audio.mak | 3 +++ tests/ref/fate/filter-aloop | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 84478740c7..343fa40e9d 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -418,6 +418,9 @@ fate-filter-atempo: CMD = pcm -i $(TARGET_PATH)/tests/data/asynth-44100-1.wav -a fate-filter-atempo: CMP = oneoff fate-filter-atempo: REF = $(SAMPLES)/filter-reference/atempo.pcm +fate-filter-aloop: CMD = framecrc -filter_complex "sine=r=48000:f=480:d=4,aloop=loop=4:start=48000:size=48000,asetnsamples=9600" +FATE_AFILTER-$(call ALLYES, SINE_FILTER ALOOP_FILTER ASETNSAMPLES_FILTER PCM_S16LE_ENCODER FRAMECRC_MUXER PIPE_PROTOCOL) += fate-filter-aloop + fate-filter-crazychannels: tests/data/filtergraphs/crazychannels fate-filter-crazychannels: CMD = framecrc -auto_conversion_filters -/filter_complex $(TARGET_PATH)/tests/data/filtergraphs/crazychannels FATE_AFILTER-$(call FILTERFRAMECRC, ARESAMPLE SINE JOIN ATRIM CHANNELMAP CHANNELSPLIT) += fate-filter-crazychannels diff --git a/tests/ref/fate/filter-aloop b/tests/ref/fate/filter-aloop new file mode 100644 index 0000000000..d6286d8855 --- /dev/null +++ b/tests/ref/fate/filter-aloop @@ -0,0 +1,45 @@ +#tb 0: 1/48000 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 48000 +#channel_layout_name 0: mono +0, 0, 0, 9600, 19200, 0x1476501c +0, 9600, 9600, 9600, 19200, 0x1476501c +0, 19200, 19200, 9600, 19200, 0x1476501c +0, 28800, 28800, 9600, 19200, 0x1476501c +0, 38400, 38400, 9600, 19200, 0x1476501c +0, 48000, 48000, 9600, 19200, 0x1476501c +0, 57600, 57600, 9600, 19200, 0x1476501c +0, 67200, 67200, 9600, 19200, 0x1476501c +0, 76800, 76800, 9600, 19200, 0x1476501c +0, 86400, 86400, 9600, 19200, 0x1476501c +0, 96896, 96896, 9600, 19200, 0x1476501c +0, 106496, 106496, 9600, 19200, 0x1476501c +0, 116096, 116096, 9600, 19200, 0x1476501c +0, 125696, 125696, 9600, 19200, 0x1476501c +0, 135296, 135296, 9600, 19200, 0x1476501c +0, 144896, 144896, 9600, 19200, 0x1476501c +0, 154496, 154496, 9600, 19200, 0x1476501c +0, 164096, 164096, 9600, 19200, 0x1476501c +0, 173696, 173696, 9600, 19200, 0x1476501c +0, 183296, 183296, 9600, 19200, 0x1476501c +0, 192896, 192896, 9600, 19200, 0x1476501c +0, 202496, 202496, 9600, 19200, 0x1476501c +0, 212096, 212096, 9600, 19200, 0x1476501c +0, 221696, 221696, 9600, 19200, 0x1476501c +0, 231296, 231296, 9600, 19200, 0x1476501c +0, 240896, 240896, 9600, 19200, 0x1476501c +0, 250496, 250496, 9600, 19200, 0x1476501c +0, 260096, 260096, 9600, 19200, 0x1476501c +0, 269696, 269696, 9600, 19200, 0x1476501c +0, 279296, 279296, 9600, 19200, 0x1476501c +0, 288896, 288896, 9600, 19200, 0x1476501c +0, 298496, 298496, 9600, 19200, 0x1476501c +0, 308096, 308096, 9600, 19200, 0x1476501c +0, 317696, 317696, 9600, 19200, 0x1476501c +0, 327296, 327296, 9600, 19200, 0x1476501c +0, 336896, 336896, 9600, 19200, 0x1476501c +0, 346496, 346496, 9600, 19200, 0x1476501c +0, 356096, 356096, 9600, 19200, 0x1476501c +0, 365696, 365696, 9600, 19200, 0x1476501c +0, 375296, 375296, 9600, 19200, 0x1476501c

1 0

fate: revert previous frequency adjustments of the sine filter
by Marton Balint 29 Nov '24

29 Nov '24

ffmpeg | branch: master | Marton Balint <cus(a)passwd.hu> | Sun Nov 10 04:01:24 2024 +0100| [f5948543f4fde21f8fbfbb27cf378ec54eb6fb0e] | committer: Marton Balint fate: revert previous frequency adjustments of the sine filter With more precise frequency support in the sine filter, several fate tests will change. Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5948543f4fde21f8… --- tests/fate/ffmpeg.mak | 8 +- tests/fate/filter-video.mak | 2 +- tests/fate/libswresample.mak | 2 +- tests/filtergraphs/concat | 6 +- tests/filtergraphs/concat-vfr | 6 +- tests/filtergraphs/crazychannels | 132 +++++++------- tests/ref/fate/copy-shortest1 | 58 +++--- tests/ref/fate/copy-shortest2 | 58 +++--- tests/ref/fate/filter-concat | 344 ++++++++++++++++++------------------ tests/ref/fate/filter-concat-vfr | 344 ++++++++++++++++++------------------ tests/ref/fate/filter-crazychannels | 68 +++---- tests/ref/fate/shortest | 58 +++--- tests/ref/fate/swr-async-firstpts | 34 ++-- 13 files changed, 560 insertions(+), 560 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 353fba3be2..d9348ee837 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -94,7 +94,7 @@ FATE_FFMPEG-$(call FILTERDEMDEC, AMIX ARESAMPLE SINE, RAWVIDEO, \ MPEG4_ENCODER AC3_FIXED_ENCODER) \ += fate-shortest fate-shortest: tests/data/vsynth1.yuv -fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000.00000013969838619232:d=10" -f lavfi -i "sine=1000.00000346917659044266:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest +fate-shortest: CMD = framecrc -auto_conversion_filters -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth1.yuv -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -threads 1 -c:v mpeg4 -c:a ac3_fixed -shortest # test interleaving video with a sparse subtitle stream FATE_SAMPLES_FFMPEG-$(call ALLYES, COLOR_FILTER, VOBSUB_DEMUXER, MATROSKA_DEMUXER,, \ @@ -179,7 +179,7 @@ tests/data/audio_shorter_than_video.nut: tests/data/vsynth_lena.yuv tests/data/audio_shorter_than_video.nut: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -f rawvideo -s 352x288 -pix_fmt yuv420p -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \ - -f lavfi -i "sine=1000.00000346917659044266:d=1" \ + -f lavfi -i "sine=1000:d=1" \ -sws_flags +accurate_rnd+bitexact -fflags +bitexact -flags +bitexact -idct simple -dct fastint -qscale 10 -c:v mpeg4 -threads 1 -c:a pcm_s16le -bitexact \ -y $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut 2>/dev/null @@ -190,8 +190,8 @@ FATE_STREAMCOPY-$(call FRAMEMD5, NUT, RAWVIDEO PCM_S16LE MPEG4, \ NUT_MUXER AC3_FIXED_ENCODER) \ += fate-copy-shortest1 fate-copy-shortest2 fate-copy-shortest1 fate-copy-shortest2: tests/data/audio_shorter_than_video.nut -fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000.00000013969838619232:d=10" -f lavfi -i "sine=1000.00000346917659044266:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest -fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000.00000013969838619232:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest +fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -f lavfi -i "sine=1000:d=1" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 2:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest +fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest fate-streamcopy: $(FATE_STREAMCOPY-yes) FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 46920342f4..cdd34b72ea 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -756,7 +756,7 @@ fate-filter-metadata-readvitc-thr: CMD = run $(FILTER_METADATA_COMMAND) "movie=' AVF_PHASE_METER_DEPS = FFPROBE LAVFI_INDEV AMOVIE_FILTER FLAC_DEMUXER FLAC_DECODER SINE_FILTER APHASEMETER_FILTER ARESAMPLE_FILTER FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS)) += fate-filter-metadata-avf-aphase-meter-mono -fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000.00000346917659044266:sample_rate=48000:duration=1,aphasemeter=video=0" +fate-filter-metadata-avf-aphase-meter-mono: CMD = run $(FILTER_METADATA_COMMAND) sine="frequency=1000:sample_rate=48000:duration=1,aphasemeter=video=0" FATE_METADATA_FILTER-$(call ALLYES, $(AVF_PHASE_METER_DEPS) FILE_PROTOCOL) += fate-filter-metadata-avf-aphase-meter-out-of-phase fate-filter-metadata-avf-aphase-meter-out-of-phase: SRC = $(TARGET_SAMPLES)/filter/out-of-phase-1000hz.flac diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak index 52c87c63f0..a1e5ab91fa 100644 --- a/tests/fate/libswresample.mak +++ b/tests/fate/libswresample.mak @@ -1083,7 +1083,7 @@ $(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,fltp,f32le,s16) $(call CROSS_TEST,$(SAMPLERATES_LITE),ARESAMPLE_EXACT_LIN_ASYNC,dblp,f64le,s16) FATE_SWR_RESAMPLE-$(call FILTERDEMDEC, ARESAMPLE ASETPTS ATRIM SINE, , PCM_S16LE, LAVFI_INDEV) += fate-swr-async-firstpts -fate-swr-async-firstpts: CMD = framecrc -auto_conversion_filters -copyts -f lavfi -i "sine=r=1000:f=439.99999994412064552:samples_per_frame=100,asetpts=PTS+S+S*floor(ld(1)/4)+st(1\,ld(1)+1)*0,atrim=end=2" -filter:a aresample=async=300:first_pts=0 +fate-swr-async-firstpts: CMD = framecrc -auto_conversion_filters -copyts -f lavfi -i "sine=r=1000:samples_per_frame=100,asetpts=PTS+S+S*floor(ld(1)/4)+st(1\,ld(1)+1)*0,atrim=end=2" -filter:a aresample=async=300:first_pts=0 FATE_SWR_RESAMPLE-$(call FILTERDEMDECENCMUX, ARESAMPLE, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_SWR_RESAMPLE) fate-swr-resample: $(FATE_SWR_RESAMPLE-yes) diff --git a/tests/filtergraphs/concat b/tests/filtergraphs/concat index 51051817b6..26bca14c3a 100644 --- a/tests/filtergraphs/concat +++ b/tests/filtergraphs/concat @@ -1,8 +1,8 @@ testsrc=r=5:n=1:d=2 [v1]; -sine=439.999995776452124118805:b=2.00000002333598070336507:d=1 [a1]; +sine=440:b=2:d=1 [a1]; testsrc=r=5:n=1:d=1 [v2]; -sine=621.999997249804437160492:b=2.00000001650776759731798:d=2 [a2]; +sine=622:b=2:d=2 [a2]; testsrc=r=5:n=1:d=1 [v3]; -sine=880.00000182073563337326:b=2:d=1 [a3]; +sine=880:b=2:d=1 [a3]; [v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3 diff --git a/tests/filtergraphs/concat-vfr b/tests/filtergraphs/concat-vfr index 74426c4314..e15cb96845 100644 --- a/tests/filtergraphs/concat-vfr +++ b/tests/filtergraphs/concat-vfr @@ -1,8 +1,8 @@ testsrc=r=5:n=1:d=2 [v1]; -sine=439.999995776452124118805:b=2.00000002333598070336507:d=1 [a1]; +sine=440:b=2:d=1 [a1]; testsrc=r=15:n=1:d=1 [v2]; -sine=621.999997249804437160492:b=2.00000001650776759731798:d=2 [a2]; +sine=622:b=2:d=2 [a2]; testsrc=r=8:n=1:d=1 [v3]; -sine=880.00000182073563337326:b=2:d=1 [a3]; +sine=880:b=2:d=1 [a3]; [v1][a1][v2][a2][v3][a3] concat=v=1:a=1:n=3 diff --git a/tests/filtergraphs/crazychannels b/tests/filtergraphs/crazychannels index e025a653e6..e48da7267c 100644 --- a/tests/filtergraphs/crazychannels +++ b/tests/filtergraphs/crazychannels @@ -1,73 +1,73 @@ -sine=frequency=0.00000000000000000000[s0]; -sine=frequency=399.999995226971805095[s1]; -sine=frequency=800.000000721774995327[s2]; -sine=frequency=1199.99999594874680042[s3]; -sine=frequency=1600.00000144354999065[s4]; -sine=frequency=1999.99999667052179574[s5]; -sine=frequency=2400.00000216532498598[s6]; -sine=frequency=2799.99999739229679107[s7]; -sine=frequency=3200.00000288709998130[s8]; -sine=frequency=3599.99999811407178640[s9]; -sine=frequency=4000.00000360887497663[sa]; -sine=frequency=4399.99999883584678173[sb]; -sine=frequency=4800.00000433064997196[sc]; -sine=frequency=5199.99999955762177705[sd]; -sine=frequency=5600.00000505242496728[se]; -sine=frequency=6000.00000027939677238[sf]; -sine=frequency=6399.99999550636857748[s10]; +sine=frequency=400 * 0x0 [s0]; +sine=frequency=400 * 0x1 [s1]; +sine=frequency=400 * 0x2 [s2]; +sine=frequency=400 * 0x3 [s3]; +sine=frequency=400 * 0x4 [s4]; +sine=frequency=400 * 0x5 [s5]; +sine=frequency=400 * 0x6 [s6]; +sine=frequency=400 * 0x7 [s7]; +sine=frequency=400 * 0x8 [s8]; +sine=frequency=400 * 0x9 [s9]; +sine=frequency=400 * 0xa [sa]; +sine=frequency=400 * 0xb [sb]; +sine=frequency=400 * 0xc [sc]; +sine=frequency=400 * 0xd [sd]; +sine=frequency=400 * 0xe [se]; +sine=frequency=400 * 0xf [sf]; -sine=frequency=6800.00000100117176771[s11]; -sine=frequency=7199.99999622814357280[s12]; -sine=frequency=7600.00000172294676303[s13]; -sine=frequency=7999.99999694991856813[s14]; -sine=frequency=8400.00000244472175836[s15]; -sine=frequency=8799.99999767169356346[s16]; -sine=frequency=9200.00000316649675369[s17]; -sine=frequency=9599.99999839346855878[s18]; -sine=frequency=10000.0000038882717490[s19]; -sine=frequency=10399.9999991152435541[s1a]; -sine=frequency=10800.0000046100467443[s1b]; -sine=frequency=11199.9999998370185494[s1c]; -sine=frequency=11599.9999950639903545[s1d]; -sine=frequency=12000.0000005587935447[s1e]; -sine=frequency=12399.9999957857653498[s1f]; -sine=frequency=12800.0000012805685400[s20]; +sine=frequency=400 * 0x10 [s10]; +sine=frequency=400 * 0x11 [s11]; +sine=frequency=400 * 0x12 [s12]; +sine=frequency=400 * 0x13 [s13]; +sine=frequency=400 * 0x14 [s14]; +sine=frequency=400 * 0x15 [s15]; +sine=frequency=400 * 0x16 [s16]; +sine=frequency=400 * 0x17 [s17]; +sine=frequency=400 * 0x18 [s18]; +sine=frequency=400 * 0x19 [s19]; +sine=frequency=400 * 0x1a [s1a]; +sine=frequency=400 * 0x1b [s1b]; +sine=frequency=400 * 0x1c [s1c]; +sine=frequency=400 * 0x1d [s1d]; +sine=frequency=400 * 0x1e [s1e]; +sine=frequency=400 * 0x1f [s1f]; -sine=frequency=13199.9999965075403451[s21]; -sine=frequency=13600.0000020023435354[s22]; -sine=frequency=13999.9999972293153405[s23]; -sine=frequency=14400.0000027241185307[s24]; -sine=frequency=14799.9999979510903358[s25]; -sine=frequency=15200.0000034458935260[s26]; -sine=frequency=15599.9999986728653311[s27]; -sine=frequency=16000.0000041676685214[s28]; -sine=frequency=16399.9999993946403264[s29]; -sine=frequency=16800.0000048894435167[s2a]; -sine=frequency=17200.0000001164153218[s2b]; -sine=frequency=17599.9999953433871269[s2c]; -sine=frequency=18000.0000008381903171[s2d]; -sine=frequency=18399.9999960651621222[s2e]; -sine=frequency=18800.0000015599653124[s2f]; -sine=frequency=19199.9999967869371175[s30]; +sine=frequency=400 * 0x20 [s20]; +sine=frequency=400 * 0x21 [s21]; +sine=frequency=400 * 0x22 [s22]; +sine=frequency=400 * 0x23 [s23]; +sine=frequency=400 * 0x24 [s24]; +sine=frequency=400 * 0x25 [s25]; +sine=frequency=400 * 0x26 [s26]; +sine=frequency=400 * 0x27 [s27]; +sine=frequency=400 * 0x28 [s28]; +sine=frequency=400 * 0x29 [s29]; +sine=frequency=400 * 0x2a [s2a]; +sine=frequency=400 * 0x2b [s2b]; +sine=frequency=400 * 0x2c [s2c]; +sine=frequency=400 * 0x2d [s2d]; +sine=frequency=400 * 0x2e [s2e]; +sine=frequency=400 * 0x2f [s2f]; -sine=frequency=19600.0000022817403078[s31]; -sine=frequency=19999.9999975087121129[s32]; -sine=frequency=20400.0000030035153031[s33]; -sine=frequency=20799.9999982304871082[s34]; -sine=frequency=21200.0000037252902984[s35]; -sine=frequency=21599.9999989522621035[s36]; -sine=frequency=22000.0000044470652937[s37]; -sine=frequency=22399.9999996740370988[s38]; -sine=frequency=22799.9999949010089039[s39]; -sine=frequency=23200.0000003958120942[s3a]; -sine=frequency=23599.9999956227838993[s3b]; -sine=frequency=24000.0000011175870895[s3c]; -sine=frequency=24399.9999963445588946[s3d]; -sine=frequency=24800.0000018393620848[s3e]; -sine=frequency=25199.9999970663338899[s3f]; +sine=frequency=400 * 0x30 [s30]; +sine=frequency=400 * 0x31 [s31]; +sine=frequency=400 * 0x32 [s32]; +sine=frequency=400 * 0x33 [s33]; +sine=frequency=400 * 0x34 [s34]; +sine=frequency=400 * 0x35 [s35]; +sine=frequency=400 * 0x36 [s36]; +sine=frequency=400 * 0x37 [s37]; +sine=frequency=400 * 0x38 [s38]; +sine=frequency=400 * 0x39 [s39]; +sine=frequency=400 * 0x3a [s3a]; +sine=frequency=400 * 0x3b [s3b]; +sine=frequency=400 * 0x3c [s3c]; +sine=frequency=400 * 0x3d [s3d]; +sine=frequency=400 * 0x3e [s3e]; +sine=frequency=400 * 0x3f [s3f]; -sine=frequency=25600.0000025611370801[s40]; -sine=frequency=25999.9999977881088852[s41]; +sine=frequency=400 * 0x40 [s40]; +sine=frequency=400 * 0x41 [s41]; [s0] [s1] [s2] [s3] [s4] [s5] [s6] [s7] [s8] [s9] [sa] [sb] [sc] [sd] [se] [sf] [s10][s11][s12][s13][s14][s15][s16][s17] [s18][s19][s1a][s1b][s1c][s1d][s1e][s1f] diff --git a/tests/ref/fate/copy-shortest1 b/tests/ref/fate/copy-shortest1 index c72f9c11fd..83a73d5263 100644 --- a/tests/ref/fate/copy-shortest1 +++ b/tests/ref/fate/copy-shortest1 @@ -13,60 +13,60 @@ #sample_rate 1: 44100 #channel_layout_name 1: mono #stream#, dts, pts, duration, size, hash -1, -256, -256, 1536, 416, 91b0c4b4dff3de421544d4a3926616e6 +1, -256, -256, 1536, 416, 180f042a77b9500f9a002cafd2f670a2 0, 0, 0, 2048, 8719, bbea2a7487d61d39a0b2f2fe62a4df4a -1, 1280, 1280, 1536, 418, 6e79527e2af3448d7a0e4a8e29cd9722 +1, 1280, 1280, 1536, 418, 77effcb2892958193be38a788328616b 0, 2048, 2048, 2048, 975, 94f30e410595452ee981d96224516504 -1, 2816, 2816, 1536, 418, cf49595ac385e497672e5a814f7bcd79 +1, 2816, 2816, 1536, 418, e214edc6acd47561c09b50dfea0f906c 0, 4096, 4096, 2048, 1167, d3b895191e8a06d19bbc8ac90e564b3b -1, 4352, 4352, 1536, 418, 846982243d330ab782f0120988d52ade +1, 4352, 4352, 1536, 418, b9c7e9f52255ab176e064b429796edb8 0, 6144, 6144, 2048, 1274, 272f548f13dd6a45a5cd187f0e43e635 -1, 5888, 5888, 1536, 418, 77b2d15948434a4831e30c47b8214591 +1, 5888, 5888, 1536, 418, be13a7056448b77b46cbbb05a6806887 0, 8192, 8192, 2048, 1361, a0c67fc195fe867ae240dc8c48f85b2e -1, 7424, 7424, 1536, 418, 4fce87d5cce10f6d0268fb398c385af5 +1, 7424, 7424, 1536, 418, 5951d632808b00128e8ca7103d1b304e 0, 10240, 10240, 2048, 1415, f7a3746adb348eb00042b3eccff54a87 -1, 8960, 8960, 1536, 418, 963f2dac9af4672809521f2174b78f10 -1, 10496, 10496, 1536, 418, eb7a20193c157b02f7b5d5abf802af24 +1, 8960, 8960, 1536, 418, 2887539b8a3538b4fdeb2739da6e95a7 +1, 10496, 10496, 1536, 418, 8cf0d5b1bab6fc69c89a46548e7de0ab 0, 12288, 12288, 2048, 1421, 8396b1c23f7d39f6f73c3469826317d6 -1, 12032, 12032, 1536, 418, 219b234a1e01d3538bfe09fda58b3289 +1, 12032, 12032, 1536, 418, b9111115f58834d6be56a3b520e2d489 0, 14336, 14336, 2048, 1474, a9c493c020d710af7f2c98b9aae846ff -1, 13568, 13568, 1536, 418, ef7bd3e9c13f03aa6676629101a9a8a0 +1, 13568, 13568, 1536, 418, 868331b8a5a882591b886d329952fd13 0, 16384, 16384, 2048, 1467, b801d1a76c84923ab813e9a5d9ebdb78 -1, 15104, 15104, 1536, 418, f7ef9460b971b5b8b61e91c489d1dd4e +1, 15104, 15104, 1536, 418, 2055f445a7663182b9d762fe22f80720 0, 18432, 18432, 2048, 1469, 22f7fcd055bf124436de9a9432f7c9d2 -1, 16640, 16640, 1536, 418, 48e7a9f574654dd95a325cfec5072254 +1, 16640, 16640, 1536, 418, d23782b3867a6901911b63778581e4f9 0, 20480, 20480, 2048, 1506, da18f30d7008f2307ec51863a9873afd -1, 18176, 18176, 1536, 418, 737d867e328377a3e6623f77f646ea61 +1, 18176, 18176, 1536, 418, f88ccca38f204d17c012287065a3f3a8 0, 22528, 22528, 2048, 1520, 2c7d44ca3485373af6cfb3e44e495bf7 -1, 19712, 19712, 1536, 418, ed9eb5db5c03725564239eb25d28c137 +1, 19712, 19712, 1536, 418, f07d2d3e7516e42b8fcbea9d82f1634b 0, 24576, 24576, 2048, 8524, 0634c69955cbffe94f4e15b288557cac -1, 21248, 21248, 1536, 418, 3aa5eac505cb898030c705bcfe5ee850 -1, 22784, 22784, 1536, 418, 08ee7262d55437ba687e4f887249d92a +1, 21248, 21248, 1536, 418, a2aef19dd0d374fcafef5639fee73cae +1, 22784, 22784, 1536, 418, 421dd4d77a3579d3435a8b853dfa2691 0, 26624, 26624, 2048, 1079, f081cbd559dab2b579f40d2fa988a959 -1, 24320, 24320, 1536, 418, eb6d62198a5472a1c179d42cde60b869 +1, 24320, 24320, 1536, 418, 9d02c29d9c963db0fcfc4c64927d27a7 0, 28672, 28672, 2048, 1343, fdf8069cd511f4fa185748118acfb72e -1, 25856, 25856, 1536, 418, 53e2ab46c2d6e7c6da1416e2dd581136 +1, 25856, 25856, 1536, 418, 1c580a9427ef65d177a373a18b9aeb68 0, 30720, 30720, 2048, 1486, e72dfcd069f5be3a30310002b1b5e252 -1, 27392, 27392, 1536, 418, 6847924a11575b3628ccdfd81a2fb1dc +1, 27392, 27392, 1536, 418, 22353ded990f185f2f4080b55fee60b3 0, 32768, 32768, 2048, 1491, 710c5421d44a8c9356c1477cbcd27c0e -1, 28928, 28928, 1536, 418, 6f76bbe03d8b4e0080226247e0e54f96 +1, 28928, 28928, 1536, 418, 964f3153f2a6438a5bd2f5d5cd767880 0, 34816, 34816, 2048, 1504, 16a6d624b8175f1191ede25e2d588b92 -1, 30464, 30464, 1536, 418, c946a8d690aa31fde929678b594cc432 +1, 30464, 30464, 1536, 418, 6234b3d6bc4f98a91b6937569da2db6b 0, 36864, 36864, 2048, 1481, 8696aa412629328687bda5e88dd40b81 -1, 32000, 32000, 1536, 418, 3add3833b86a38c229faf8e602f83dcb +1, 32000, 32000, 1536, 418, a85bd1fb35a1a78ae1da70bb061261fc 0, 38912, 38912, 2048, 1521, 3c974bf799b8e35d295c6567ffeb7276 -1, 33536, 33536, 1536, 418, 303adaf2b35e2b8742d0553d21ddb00f -1, 35072, 35072, 1536, 418, f12224af46440d663ea238c313afd664 +1, 33536, 33536, 1536, 418, 07462d7c6d47d2ebf346fb475f74e3cc +1, 35072, 35072, 1536, 418, 3fc40331d421a11efbb592af1610e681 0, 40960, 40960, 2048, 1514, 1a54ec5296f1551a7f67c515e40ca646 -1, 36608, 36608, 1536, 418, 8b986c15b9ab86432c43cedd1a182e8d +1, 36608, 36608, 1536, 418, b518e516ccaa571cfb750efcddb09507 0, 43008, 43008, 2048, 1562, d285916a1c7a2fb9f37d18bfa977e075 -1, 38144, 38144, 1536, 418, 0dd29cc7f63f2afac3eec5e5944165e7 +1, 38144, 38144, 1536, 418, bd94ef0483f8817618b7f0ddbec2f35d 0, 45056, 45056, 2048, 1562, 320c26adae1dad1741e02febdbd5b916 -1, 39680, 39680, 1536, 418, c4c14deb03d5048f8c6101260c617fae +1, 39680, 39680, 1536, 418, 0e21b6125cf3623ba6b75f761fd62cd3 0, 47104, 47104, 2048, 1629, 60c6ebd71f641ebcff9997ee338d82bf -1, 41216, 41216, 1536, 418, 4a3480d888fa0dd49a7bbf2669b5d3ed +1, 41216, 41216, 1536, 418, a5f365fddfcc6aec0850926c68d3d48b 0, 49152, 49152, 2048, 9634, b72deda826b002179c46789e92c07978 -1, 42752, 42752, 1536, 418, aaeabe149b9185a6f09c271eb2c656dd +1, 42752, 42752, 1536, 418, 7e24c321ef02945ddbc8c9f1ca8fb662 0, 51200, 51200, 2048, 1239, 407105508656c920761e60c90540ee18 1, 44288, 44288, 1536, 418, 0995488ad1bb84ec4a3e738b568484a4 1, 45824, 45824, 1536, 418, baa39bdfd9f47f7d312312985f59fb72 diff --git a/tests/ref/fate/copy-shortest2 b/tests/ref/fate/copy-shortest2 index c72f9c11fd..83a73d5263 100644 --- a/tests/ref/fate/copy-shortest2 +++ b/tests/ref/fate/copy-shortest2 @@ -13,60 +13,60 @@ #sample_rate 1: 44100 #channel_layout_name 1: mono #stream#, dts, pts, duration, size, hash -1, -256, -256, 1536, 416, 91b0c4b4dff3de421544d4a3926616e6 +1, -256, -256, 1536, 416, 180f042a77b9500f9a002cafd2f670a2 0, 0, 0, 2048, 8719, bbea2a7487d61d39a0b2f2fe62a4df4a -1, 1280, 1280, 1536, 418, 6e79527e2af3448d7a0e4a8e29cd9722 +1, 1280, 1280, 1536, 418, 77effcb2892958193be38a788328616b 0, 2048, 2048, 2048, 975, 94f30e410595452ee981d96224516504 -1, 2816, 2816, 1536, 418, cf49595ac385e497672e5a814f7bcd79 +1, 2816, 2816, 1536, 418, e214edc6acd47561c09b50dfea0f906c 0, 4096, 4096, 2048, 1167, d3b895191e8a06d19bbc8ac90e564b3b -1, 4352, 4352, 1536, 418, 846982243d330ab782f0120988d52ade +1, 4352, 4352, 1536, 418, b9c7e9f52255ab176e064b429796edb8 0, 6144, 6144, 2048, 1274, 272f548f13dd6a45a5cd187f0e43e635 -1, 5888, 5888, 1536, 418, 77b2d15948434a4831e30c47b8214591 +1, 5888, 5888, 1536, 418, be13a7056448b77b46cbbb05a6806887 0, 8192, 8192, 2048, 1361, a0c67fc195fe867ae240dc8c48f85b2e -1, 7424, 7424, 1536, 418, 4fce87d5cce10f6d0268fb398c385af5 +1, 7424, 7424, 1536, 418, 5951d632808b00128e8ca7103d1b304e 0, 10240, 10240, 2048, 1415, f7a3746adb348eb00042b3eccff54a87 -1, 8960, 8960, 1536, 418, 963f2dac9af4672809521f2174b78f10 -1, 10496, 10496, 1536, 418, eb7a20193c157b02f7b5d5abf802af24 +1, 8960, 8960, 1536, 418, 2887539b8a3538b4fdeb2739da6e95a7 +1, 10496, 10496, 1536, 418, 8cf0d5b1bab6fc69c89a46548e7de0ab 0, 12288, 12288, 2048, 1421, 8396b1c23f7d39f6f73c3469826317d6 -1, 12032, 12032, 1536, 418, 219b234a1e01d3538bfe09fda58b3289 +1, 12032, 12032, 1536, 418, b9111115f58834d6be56a3b520e2d489 0, 14336, 14336, 2048, 1474, a9c493c020d710af7f2c98b9aae846ff -1, 13568, 13568, 1536, 418, ef7bd3e9c13f03aa6676629101a9a8a0 +1, 13568, 13568, 1536, 418, 868331b8a5a882591b886d329952fd13 0, 16384, 16384, 2048, 1467, b801d1a76c84923ab813e9a5d9ebdb78 -1, 15104, 15104, 1536, 418, f7ef9460b971b5b8b61e91c489d1dd4e +1, 15104, 15104, 1536, 418, 2055f445a7663182b9d762fe22f80720 0, 18432, 18432, 2048, 1469, 22f7fcd055bf124436de9a9432f7c9d2 -1, 16640, 16640, 1536, 418, 48e7a9f574654dd95a325cfec5072254 +1, 16640, 16640, 1536, 418, d23782b3867a6901911b63778581e4f9 0, 20480, 20480, 2048, 1506, da18f30d7008f2307ec51863a9873afd -1, 18176, 18176, 1536, 418, 737d867e328377a3e6623f77f646ea61 +1, 18176, 18176, 1536, 418, f88ccca38f204d17c012287065a3f3a8 0, 22528, 22528, 2048, 1520, 2c7d44ca3485373af6cfb3e44e495bf7 -1, 19712, 19712, 1536, 418, ed9eb5db5c03725564239eb25d28c137 +1, 19712, 19712, 1536, 418, f07d2d3e7516e42b8fcbea9d82f1634b 0, 24576, 24576, 2048, 8524, 0634c69955cbffe94f4e15b288557cac -1, 21248, 21248, 1536, 418, 3aa5eac505cb898030c705bcfe5ee850 -1, 22784, 22784, 1536, 418, 08ee7262d55437ba687e4f887249d92a +1, 21248, 21248, 1536, 418, a2aef19dd0d374fcafef5639fee73cae +1, 22784, 22784, 1536, 418, 421dd4d77a3579d3435a8b853dfa2691 0, 26624, 26624, 2048, 1079, f081cbd559dab2b579f40d2fa988a959 -1, 24320, 24320, 1536, 418, eb6d62198a5472a1c179d42cde60b869 +1, 24320, 24320, 1536, 418, 9d02c29d9c963db0fcfc4c64927d27a7 0, 28672, 28672, 2048, 1343, fdf8069cd511f4fa185748118acfb72e -1, 25856, 25856, 1536, 418, 53e2ab46c2d6e7c6da1416e2dd581136 +1, 25856, 25856, 1536, 418, 1c580a9427ef65d177a373a18b9aeb68 0, 30720, 30720, 2048, 1486, e72dfcd069f5be3a30310002b1b5e252 -1, 27392, 27392, 1536, 418, 6847924a11575b3628ccdfd81a2fb1dc +1, 27392, 27392, 1536, 418, 22353ded990f185f2f4080b55fee60b3 0, 32768, 32768, 2048, 1491, 710c5421d44a8c9356c1477cbcd27c0e -1, 28928, 28928, 1536, 418, 6f76bbe03d8b4e0080226247e0e54f96 +1, 28928, 28928, 1536, 418, 964f3153f2a6438a5bd2f5d5cd767880 0, 34816, 34816, 2048, 1504, 16a6d624b8175f1191ede25e2d588b92 -1, 30464, 30464, 1536, 418, c946a8d690aa31fde929678b594cc432 +1, 30464, 30464, 1536, 418, 6234b3d6bc4f98a91b6937569da2db6b 0, 36864, 36864, 2048, 1481, 8696aa412629328687bda5e88dd40b81 -1, 32000, 32000, 1536, 418, 3add3833b86a38c229faf8e602f83dcb +1, 32000, 32000, 1536, 418, a85bd1fb35a1a78ae1da70bb061261fc 0, 38912, 38912, 2048, 1521, 3c974bf799b8e35d295c6567ffeb7276 -1, 33536, 33536, 1536, 418, 303adaf2b35e2b8742d0553d21ddb00f -1, 35072, 35072, 1536, 418, f12224af46440d663ea238c313afd664 +1, 33536, 33536, 1536, 418, 07462d7c6d47d2ebf346fb475f74e3cc +1, 35072, 35072, 1536, 418, 3fc40331d421a11efbb592af1610e681 0, 40960, 40960, 2048, 1514, 1a54ec5296f1551a7f67c515e40ca646 -1, 36608, 36608, 1536, 418, 8b986c15b9ab86432c43cedd1a182e8d +1, 36608, 36608, 1536, 418, b518e516ccaa571cfb750efcddb09507 0, 43008, 43008, 2048, 1562, d285916a1c7a2fb9f37d18bfa977e075 -1, 38144, 38144, 1536, 418, 0dd29cc7f63f2afac3eec5e5944165e7 +1, 38144, 38144, 1536, 418, bd94ef0483f8817618b7f0ddbec2f35d 0, 45056, 45056, 2048, 1562, 320c26adae1dad1741e02febdbd5b916 -1, 39680, 39680, 1536, 418, c4c14deb03d5048f8c6101260c617fae +1, 39680, 39680, 1536, 418, 0e21b6125cf3623ba6b75f761fd62cd3 0, 47104, 47104, 2048, 1629, 60c6ebd71f641ebcff9997ee338d82bf -1, 41216, 41216, 1536, 418, 4a3480d888fa0dd49a7bbf2669b5d3ed +1, 41216, 41216, 1536, 418, a5f365fddfcc6aec0850926c68d3d48b 0, 49152, 49152, 2048, 9634, b72deda826b002179c46789e92c07978 -1, 42752, 42752, 1536, 418, aaeabe149b9185a6f09c271eb2c656dd +1, 42752, 42752, 1536, 418, 7e24c321ef02945ddbc8c9f1ca8fb662 0, 51200, 51200, 2048, 1239, 407105508656c920761e60c90540ee18 1, 44288, 44288, 1536, 418, 0995488ad1bb84ec4a3e738b568484a4 1, 45824, 45824, 1536, 418, baa39bdfd9f47f7d312312985f59fb72 diff --git a/tests/ref/fate/filter-concat b/tests/ref/fate/filter-concat index 42879a45e0..153b910703 100644 --- a/tests/ref/fate/filter-concat +++ b/tests/ref/fate/filter-concat @@ -9,54 +9,54 @@ #sample_rate 1: 44100 #channel_layout_name 1: mono 0, 0, 0, 1, 230400, 0x88c4d19a -1, 0, 0, 1024, 2048, 0xb3f10192 -1, 1024, 1024, 1024, 2048, 0xb340fe4e -1, 2048, 2048, 1024, 2048, 0x0a5f0111 -1, 3072, 3072, 1024, 2048, 0x51be06b8 -1, 4096, 4096, 1024, 2048, 0x71a1ffcb -1, 5120, 5120, 1024, 2048, 0x7f64f50f -1, 6144, 6144, 1024, 2048, 0x70a8fa17 -1, 7168, 7168, 1024, 2048, 0x0dad072a -1, 8192, 8192, 1024, 2048, 0x5e810c51 +1, 0, 0, 1024, 2048, 0xb59f0193 +1, 1024, 1024, 1024, 2048, 0xba70fe4e +1, 2048, 2048, 1024, 2048, 0xaa83fe05 +1, 3072, 3072, 1024, 2048, 0x487e06b5 +1, 4096, 4096, 1024, 2048, 0xb0abfcca +1, 5120, 5120, 1024, 2048, 0x869ef510 +1, 6144, 6144, 1024, 2048, 0x547cf717 +1, 7168, 7168, 1024, 2048, 0xca830826 +1, 8192, 8192, 1024, 2048, 0xf7700954 0, 1, 1, 1, 230400, 0x0d77c977 -1, 9216, 9216, 1024, 2048, 0xbe5bf462 -1, 10240, 10240, 1024, 2048, 0xbcd9faeb -1, 11264, 11264, 1024, 2048, 0x0d5bfe9c -1, 12288, 12288, 1024, 2048, 0x97d80297 -1, 13312, 13312, 1024, 2048, 0xba0f0894 -1, 14336, 14336, 1024, 2048, 0xcc22f291 -1, 15360, 15360, 1024, 2048, 0x11a9fa03 -1, 16384, 16384, 1024, 2048, 0x9a920378 -1, 17408, 17408, 1024, 2048, 0x901b0525 +1, 9216, 9216, 1024, 2048, 0x3759f55c +1, 10240, 10240, 1024, 2048, 0x0ca9f7ee +1, 11264, 11264, 1024, 2048, 0xfb78fe99 +1, 12288, 12288, 1024, 2048, 0x93580191 +1, 13312, 13312, 1024, 2048, 0x079f0797 +1, 14336, 14336, 1024, 2048, 0xcf5ff38b +1, 15360, 15360, 1024, 2048, 0xb201f701 +1, 16384, 16384, 1024, 2048, 0x7aac0476 +1, 17408, 17408, 1024, 2048, 0xd89b0222 0, 2, 2, 1, 230400, 0x242629d7 -1, 18432, 18432, 1024, 2048, 0x74b2003f -1, 19456, 19456, 1024, 2048, 0xa20ef3ed -1, 20480, 20480, 1024, 2048, 0x44cef9de -1, 21504, 21504, 1024, 2048, 0x4b2e039b -1, 22528, 22528, 1024, 2048, 0x198509a1 -1, 23552, 23552, 1024, 2048, 0xcab6f9e5 -1, 24576, 24576, 1024, 2048, 0x67f8f608 -1, 25600, 25600, 1024, 2048, 0x8d7f03fa +1, 18432, 18432, 1024, 2048, 0x160b013e +1, 19456, 19456, 1024, 2048, 0x950ef0eb +1, 20480, 20480, 1024, 2048, 0x9b51fada +1, 21504, 21504, 1024, 2048, 0xed610097 +1, 22528, 22528, 1024, 2048, 0x40b90a9d +1, 23552, 23552, 1024, 2048, 0x21eaf6e7 +1, 24576, 24576, 1024, 2048, 0x3efcf601 +1, 25600, 25600, 1024, 2048, 0x86bd01fa 0, 3, 3, 1, 230400, 0x62cdc018 -1, 26624, 26624, 1024, 2048, 0x3e1e0566 -1, 27648, 27648, 1024, 2048, 0x2cfe0308 -1, 28672, 28672, 1024, 2048, 0x1ceaf702 -1, 29696, 29696, 1024, 2048, 0x38a9f3d1 -1, 30720, 30720, 1024, 2048, 0x6c3306b7 -1, 31744, 31744, 1024, 2048, 0x600f0579 -1, 32768, 32768, 1024, 2048, 0x3e5afa28 -1, 33792, 33792, 1024, 2048, 0x053ff47a -1, 34816, 34816, 1024, 2048, 0x0d28fed9 +1, 26624, 26624, 1024, 2048, 0x2cd00562 +1, 27648, 27648, 1024, 2048, 0xc9ee0204 +1, 28672, 28672, 1024, 2048, 0x00faf605 +1, 29696, 29696, 1024, 2048, 0xb031f4cd +1, 30720, 30720, 1024, 2048, 0xcb3f03b5 +1, 31744, 31744, 1024, 2048, 0xb11e067a +1, 32768, 32768, 1024, 2048, 0x3fb4f725 +1, 33792, 33792, 1024, 2048, 0x010df577 +1, 34816, 34816, 1024, 2048, 0xcc6bfbd9 0, 4, 4, 1, 230400, 0x248ad058 -1, 35840, 35840, 1024, 2048, 0x279805cc -1, 36864, 36864, 1024, 2048, 0xb16a0a12 -1, 37888, 37888, 1024, 2048, 0xb45af340 -1, 38912, 38912, 1024, 2048, 0x1834f972 -1, 39936, 39936, 1024, 2048, 0xb5d206ae -1, 40960, 40960, 1024, 2048, 0xc5760375 -1, 41984, 41984, 1024, 2048, 0x503800ce -1, 43008, 43008, 1024, 2048, 0xa3bbf4af -1, 44032, 44032, 68, 136, 0xc8d751c7 +1, 35840, 35840, 1024, 2048, 0xf2f606c7 +1, 36864, 36864, 1024, 2048, 0x35560716 +1, 37888, 37888, 1024, 2048, 0x41c0f43f +1, 38912, 38912, 1024, 2048, 0x28f7f672 +1, 39936, 39936, 1024, 2048, 0x96a006a7 +1, 40960, 40960, 1024, 2048, 0x22cb0176 +1, 41984, 41984, 1024, 2048, 0x8bedffc2 +1, 43008, 43008, 1024, 2048, 0xbfaef5ae +1, 44032, 44032, 68, 136, 0xc35a50c5 0, 5, 5, 1, 230400, 0x223d134f 1, 44100, 44100, 9600, 19200, 0x00000000 0, 6, 6, 1, 230400, 0xbf1c3d34 @@ -68,143 +68,143 @@ 0, 9, 9, 1, 230400, 0x6dedf2c0 1, 82500, 82500, 5700, 11400, 0x00000000 0, 10, 10, 1, 230400, 0x88c4d19a -1, 88200, 88200, 1024, 2048, 0x283efb3a -1, 89224, 89224, 1024, 2048, 0x7692fb8f -1, 90248, 90248, 1024, 2048, 0xbaaafcc0 +1, 88200, 88200, 1024, 2048, 0x2906fb3a +1, 89224, 89224, 1024, 2048, 0x83f6fb92 +1, 90248, 90248, 1024, 2048, 0xbe36fcc1 1, 91272, 91272, 1024, 2048, 0xadc8017e -1, 92296, 92296, 1024, 2048, 0x4f4dffdc -1, 93320, 93320, 1024, 2048, 0x7ffbff48 -1, 94344, 94344, 1024, 2048, 0x2f990719 -1, 95368, 95368, 1024, 2048, 0xe2caf65c -1, 96392, 96392, 1024, 2048, 0x825208e4 +1, 92296, 92296, 1024, 2048, 0x5a73ffde +1, 93320, 93320, 1024, 2048, 0x77b1ff47 +1, 94344, 94344, 1024, 2048, 0x3629071b +1, 95368, 95368, 1024, 2048, 0xdb0cf65b +1, 96392, 96392, 1024, 2048, 0x77a808e2 0, 11, 11, 1, 230400, 0x0d77c977 -1, 97416, 97416, 1024, 2048, 0xf563f13b -1, 98440, 98440, 1024, 2048, 0x855d03e9 -1, 99464, 99464, 1024, 2048, 0x0ba9fa4b -1, 100488, 100488, 1024, 2048, 0x83e1fb92 -1, 101512, 101512, 1024, 2048, 0x1162f965 -1, 102536, 102536, 1024, 2048, 0x0cfef73d -1, 103560, 103560, 1024, 2048, 0x5688ff75 -1, 104584, 104584, 1024, 2048, 0xf6c0ede9 -1, 105608, 105608, 1024, 2048, 0xfdb20602 +1, 97416, 97416, 1024, 2048, 0xe961f137 +1, 98440, 98440, 1024, 2048, 0x965103ec +1, 99464, 99464, 1024, 2048, 0x0305fa4b +1, 100488, 100488, 1024, 2048, 0x83c1fb91 +1, 101512, 101512, 1024, 2048, 0x014af961 +1, 102536, 102536, 1024, 2048, 0x186cf73f +1, 103560, 103560, 1024, 2048, 0x4d60ff77 +1, 104584, 104584, 1024, 2048, 0xea04edea +1, 105608, 105608, 1024, 2048, 0xc93204ff 0, 12, 12, 1, 230400, 0x242629d7 -1, 106632, 106632, 1024, 2048, 0x40c5f17b -1, 107656, 107656, 1024, 2048, 0x559600b1 -1, 108680, 108680, 1024, 2048, 0xccc3f930 -1, 109704, 109704, 1024, 2048, 0xdc800045 -1, 110728, 110728, 1024, 2048, 0xdce4fb3e -1, 111752, 111752, 1024, 2048, 0x1e5efba9 -1, 112776, 112776, 1024, 2048, 0x8c2e0832 -1, 113800, 113800, 1024, 2048, 0x5c42f66d +1, 106632, 106632, 1024, 2048, 0x544ff17d +1, 107656, 107656, 1024, 2048, 0x58e200ae +1, 108680, 108680, 1024, 2048, 0xdea9f932 +1, 109704, 109704, 1024, 2048, 0x53ecfe34 +1, 110728, 110728, 1024, 2048, 0x6242fc3b +1, 111752, 111752, 1024, 2048, 0x257efbac +1, 112776, 112776, 1024, 2048, 0x978e0833 +1, 113800, 113800, 1024, 2048, 0x47bcf66e 0, 13, 13, 1, 230400, 0x62cdc018 -1, 114824, 114824, 1024, 2048, 0x08e20b1e -1, 115848, 115848, 1024, 2048, 0x4cf7f903 -1, 116872, 116872, 1024, 2048, 0xe6b90794 -1, 117896, 117896, 1024, 2048, 0x5956f8e6 -1, 118920, 118920, 1024, 2048, 0x6632ff16 -1, 119944, 119944, 1024, 2048, 0x46c8fe11 -1, 120968, 120968, 1024, 2048, 0x7431f732 -1, 121992, 121992, 1024, 2048, 0xa258049f -1, 123016, 123016, 1024, 2048, 0xdb71f00e +1, 114824, 114824, 1024, 2048, 0xebbb0b1a +1, 115848, 115848, 1024, 2048, 0x45b8f805 +1, 116872, 116872, 1024, 2048, 0xf73b0796 +1, 117896, 117896, 1024, 2048, 0x56a6f9df +1, 118920, 118920, 1024, 2048, 0x80ccff1a +1, 119944, 119944, 1024, 2048, 0x4f06fe14 +1, 120968, 120968, 1024, 2048, 0x8177f733 +1, 121992, 121992, 1024, 2048, 0xb64404a4 +1, 123016, 123016, 1024, 2048, 0xce65f00a 0, 14, 14, 1, 230400, 0x248ad058 -1, 124040, 124040, 1024, 2048, 0xa89b0359 -1, 125064, 125064, 1024, 2048, 0xe0aff0f2 -1, 126088, 126088, 1024, 2048, 0xc33e0085 -1, 127112, 127112, 1024, 2048, 0x9d09f379 -1, 128136, 128136, 1024, 2048, 0x8c78fd06 -1, 129160, 129160, 1024, 2048, 0x532bfbdd -1, 130184, 130184, 1024, 2048, 0xfc36f5cd -1, 131208, 131208, 1024, 2048, 0x2e8f0699 -1, 132232, 132232, 1024, 2048, 0x52382578 -1, 133256, 133256, 1024, 2048, 0x97ed1a28 -1, 134280, 134280, 1024, 2048, 0xabcdf73f -1, 135304, 135304, 1024, 2048, 0x3a24082c -1, 136328, 136328, 1024, 2048, 0xbe1cfc3d -1, 137352, 137352, 1024, 2048, 0xad5800a5 -1, 138376, 138376, 1024, 2048, 0x90b80522 -1, 139400, 139400, 1024, 2048, 0x1fa1f912 -1, 140424, 140424, 1024, 2048, 0x733a0878 -1, 141448, 141448, 1024, 2048, 0x9a3eee47 -1, 142472, 142472, 1024, 2048, 0x5d900759 -1, 143496, 143496, 1024, 2048, 0x1287f540 -1, 144520, 144520, 1024, 2048, 0x941cfe5d -1, 145544, 145544, 1024, 2048, 0x1587f8a9 -1, 146568, 146568, 1024, 2048, 0xb9e7f888 -1, 147592, 147592, 1024, 2048, 0xe9defbe2 -1, 148616, 148616, 1024, 2048, 0x3a5ef312 -1, 149640, 149640, 1024, 2048, 0xdcbe0544 -1, 150664, 150664, 1024, 2048, 0xbe51ecc5 -1, 151688, 151688, 1024, 2048, 0x21a60721 -1, 152712, 152712, 1024, 2048, 0xf29ff318 -1, 153736, 153736, 1024, 2048, 0xcd4c02ea -1, 154760, 154760, 1024, 2048, 0xa424faac -1, 155784, 155784, 1024, 2048, 0xbaedfdab -1, 156808, 156808, 1024, 2048, 0xcbff047c -1, 157832, 157832, 1024, 2048, 0x9ac8f96b -1, 158856, 158856, 1024, 2048, 0x43220bee -1, 159880, 159880, 1024, 2048, 0x547bf351 -1, 160904, 160904, 1024, 2048, 0x7dd10d6e -1, 161928, 161928, 1024, 2048, 0x77cbf603 -1, 162952, 162952, 1024, 2048, 0xb6fcff50 -1, 163976, 163976, 1024, 2048, 0x927bfde5 -1, 165000, 165000, 1024, 2048, 0x5bd0fca5 -1, 166024, 166024, 1024, 2048, 0x672cff2a -1, 167048, 167048, 1024, 2048, 0x3e3ef01c -1, 168072, 168072, 1024, 2048, 0xe52607af -1, 169096, 169096, 1024, 2048, 0x66bceaf5 -1, 170120, 170120, 1024, 2048, 0xe065046b -1, 171144, 171144, 1024, 2048, 0x350bf21f -1, 172168, 172168, 1024, 2048, 0x60b1fca4 -1, 173192, 173192, 1024, 2048, 0x8b1efa55 -1, 174216, 174216, 1024, 2048, 0xf86ff855 -1, 175240, 175240, 1024, 2048, 0x6934061b -1, 176264, 176264, 136, 272, 0x4a458a45 +1, 124040, 124040, 1024, 2048, 0xb1b5035b +1, 125064, 125064, 1024, 2048, 0xe2eff0f3 +1, 126088, 126088, 1024, 2048, 0xd3740083 +1, 127112, 127112, 1024, 2048, 0xf0eff27f +1, 128136, 128136, 1024, 2048, 0x6ceafd03 +1, 129160, 129160, 1024, 2048, 0x640bfbe1 +1, 130184, 130184, 1024, 2048, 0xd8daf5c9 +1, 131208, 131208, 1024, 2048, 0x239b0696 +1, 132232, 132232, 1024, 2048, 0x34ca2574 +1, 133256, 133256, 1024, 2048, 0x70971a20 +1, 134280, 134280, 1024, 2048, 0xb9f3f740 +1, 135304, 135304, 1024, 2048, 0x2c5a0824 +1, 136328, 136328, 1024, 2048, 0xe408fc40 +1, 137352, 137352, 1024, 2048, 0xcb32019a +1, 138376, 138376, 1024, 2048, 0xfe19042b +1, 139400, 139400, 1024, 2048, 0xec08fa0c +1, 140424, 140424, 1024, 2048, 0x7a00087c +1, 141448, 141448, 1024, 2048, 0xa390ee4a +1, 142472, 142472, 1024, 2048, 0x7af00762 +1, 143496, 143496, 1024, 2048, 0x11f9f541 +1, 144520, 144520, 1024, 2048, 0x71f1ff60 +1, 145544, 145544, 1024, 2048, 0x05a3f8a6 +1, 146568, 146568, 1024, 2048, 0xd0a3f88a +1, 147592, 147592, 1024, 2048, 0xf4cefbe9 +1, 148616, 148616, 1024, 2048, 0x34dcf316 +1, 149640, 149640, 1024, 2048, 0x263d043a +1, 150664, 150664, 1024, 2048, 0xe741eccf +1, 151688, 151688, 1024, 2048, 0x01e40715 +1, 152712, 152712, 1024, 2048, 0x037ef319 +1, 153736, 153736, 1024, 2048, 0x4faf00e5 +1, 154760, 154760, 1024, 2048, 0x9ec1fba7 +1, 155784, 155784, 1024, 2048, 0xb575fdae +1, 156808, 156808, 1024, 2048, 0x152b0381 +1, 157832, 157832, 1024, 2048, 0x76c0f96a +1, 158856, 158856, 1024, 2048, 0x02200ce5 +1, 159880, 159880, 1024, 2048, 0xd816f252 +1, 160904, 160904, 1024, 2048, 0x9a210d74 +1, 161928, 161928, 1024, 2048, 0xdf52f701 +1, 162952, 162952, 1024, 2048, 0xb1acff54 +1, 163976, 163976, 1024, 2048, 0xe059fce7 +1, 165000, 165000, 1024, 2048, 0x5fbafca5 +1, 166024, 166024, 1024, 2048, 0x065f0044 +1, 167048, 167048, 1024, 2048, 0x138af014 +1, 168072, 168072, 1024, 2048, 0x011907b6 +1, 169096, 169096, 1024, 2048, 0x56d6eaf1 +1, 170120, 170120, 1024, 2048, 0x0862046a +1, 171144, 171144, 1024, 2048, 0x2480f12a +1, 172168, 172168, 1024, 2048, 0x13fffc9c +1, 173192, 173192, 1024, 2048, 0x996afa59 +1, 174216, 174216, 1024, 2048, 0xb859f84e +1, 175240, 175240, 1024, 2048, 0x38170512 +1, 176264, 176264, 136, 272, 0x48418a43 0, 20, 20, 1, 230400, 0x88c4d19a 1, 176400, 176400, 1024, 2048, 0xdb0cfe95 -1, 177424, 177424, 1024, 2048, 0xcff3fdf1 -1, 178448, 178448, 1024, 2048, 0x070cf585 -1, 179472, 179472, 1024, 2048, 0xe9b8007f -1, 180496, 180496, 1024, 2048, 0xc51ffd64 -1, 181520, 181520, 1024, 2048, 0xede2fbf9 -1, 182544, 182544, 1024, 2048, 0x51510410 -1, 183568, 183568, 1024, 2048, 0x198af498 -1, 184592, 184592, 1024, 2048, 0xae3603a2 +1, 177424, 177424, 1024, 2048, 0xc8b3fdf1 +1, 178448, 178448, 1024, 2048, 0x01aef583 +1, 179472, 179472, 1024, 2048, 0x79be017e +1, 180496, 180496, 1024, 2048, 0xd00ffd65 +1, 181520, 181520, 1024, 2048, 0x4513fcf8 +1, 182544, 182544, 1024, 2048, 0x55a30411 +1, 183568, 183568, 1024, 2048, 0x30f9f596 +1, 184592, 184592, 1024, 2048, 0xbdf203a3 0, 21, 21, 1, 230400, 0x0d77c977 -1, 185616, 185616, 1024, 2048, 0x6200f7a1 -1, 186640, 186640, 1024, 2048, 0xe6e3fe32 -1, 187664, 187664, 1024, 2048, 0xb2e2fd77 -1, 188688, 188688, 1024, 2048, 0x063dff2f -1, 189712, 189712, 1024, 2048, 0xa89ffe21 -1, 190736, 190736, 1024, 2048, 0x9e6ffa6d -1, 191760, 191760, 1024, 2048, 0x028b004e -1, 192784, 192784, 1024, 2048, 0x57edfa23 -1, 193808, 193808, 1024, 2048, 0x6d8efe1f +1, 185616, 185616, 1024, 2048, 0x466af89f +1, 186640, 186640, 1024, 2048, 0xeb8bfe33 +1, 187664, 187664, 1024, 2048, 0x5335fe73 +1, 188688, 188688, 1024, 2048, 0x159bff32 +1, 189712, 189712, 1024, 2048, 0x1b81ff1e +1, 190736, 190736, 1024, 2048, 0xaa2ffa70 +1, 191760, 191760, 1024, 2048, 0x0441004f +1, 192784, 192784, 1024, 2048, 0x8433fb21 +1, 193808, 193808, 1024, 2048, 0x6a9afe1d 0, 22, 22, 1, 230400, 0x242629d7 -1, 194832, 194832, 1024, 2048, 0x774bfe54 -1, 195856, 195856, 1024, 2048, 0xa931fcfb -1, 196880, 196880, 1024, 2048, 0x3505004b -1, 197904, 197904, 1024, 2048, 0x5001f576 -1, 198928, 198928, 1024, 2048, 0x78ea049b -1, 199952, 199952, 1024, 2048, 0xd45bf733 -1, 200976, 200976, 1024, 2048, 0x6395fead -1, 202000, 202000, 1024, 2048, 0xc126015e +1, 194832, 194832, 1024, 2048, 0x7bd2ff53 +1, 195856, 195856, 1024, 2048, 0xbe15fcfe +1, 196880, 196880, 1024, 2048, 0xfc12014a +1, 197904, 197904, 1024, 2048, 0x49dbf575 +1, 198928, 198928, 1024, 2048, 0xfe400599 +1, 199952, 199952, 1024, 2048, 0xd7bdf732 +1, 200976, 200976, 1024, 2048, 0xb70cffac +1, 202000, 202000, 1024, 2048, 0xc46a015f 0, 23, 23, 1, 230400, 0x62cdc018 -1, 203024, 203024, 1024, 2048, 0xbecff8aa -1, 204048, 204048, 1024, 2048, 0x0fea06c3 -1, 205072, 205072, 1024, 2048, 0xdea6f351 -1, 206096, 206096, 1024, 2048, 0x35b808f0 -1, 207120, 207120, 1024, 2048, 0x5487ee73 -1, 208144, 208144, 1024, 2048, 0xac69050e -1, 209168, 209168, 1024, 2048, 0xcc5ffb00 -1, 210192, 210192, 1024, 2048, 0x328c00cb -1, 211216, 211216, 1024, 2048, 0xa707fd82 +1, 203024, 203024, 1024, 2048, 0xcf07f9a9 +1, 204048, 204048, 1024, 2048, 0x108c06c2 +1, 205072, 205072, 1024, 2048, 0xd340f350 +1, 206096, 206096, 1024, 2048, 0x0a7b09f0 +1, 207120, 207120, 1024, 2048, 0x4299ee71 +1, 208144, 208144, 1024, 2048, 0x43ff060d +1, 209168, 209168, 1024, 2048, 0xbe31fafb +1, 210192, 210192, 1024, 2048, 0xaaae01cb +1, 211216, 211216, 1024, 2048, 0xa7abfd7f 0, 24, 24, 1, 230400, 0x248ad058 -1, 212240, 212240, 1024, 2048, 0xe442f73d -1, 213264, 213264, 1024, 2048, 0x545c0418 -1, 214288, 214288, 1024, 2048, 0x744ff3f7 -1, 215312, 215312, 1024, 2048, 0x01aa04fd -1, 216336, 216336, 1024, 2048, 0xa885f7cd -1, 217360, 217360, 1024, 2048, 0xcfca04f4 -1, 218384, 218384, 1024, 2048, 0x67fdf91b -1, 219408, 219408, 1024, 2048, 0xce2b001d +1, 212240, 212240, 1024, 2048, 0x0b0cf839 +1, 213264, 213264, 1024, 2048, 0x5cec0417 +1, 214288, 214288, 1024, 2048, 0x6909f4f5 +1, 215312, 215312, 1024, 2048, 0xf89104fb +1, 216336, 216336, 1024, 2048, 0x51daf8c8 +1, 217360, 217360, 1024, 2048, 0xc66004f4 +1, 218384, 218384, 1024, 2048, 0xd48efa17 +1, 219408, 219408, 1024, 2048, 0xb6ed001a 1, 220432, 220432, 68, 136, 0x33e64a0d diff --git a/tests/ref/fate/filter-concat-vfr b/tests/ref/fate/filter-concat-vfr index 3d984a4968..ca86993edb 100644 --- a/tests/ref/fate/filter-concat-vfr +++ b/tests/ref/fate/filter-concat-vfr @@ -9,54 +9,54 @@ #sample_rate 1: 44100 #channel_layout_name 1: mono 0, 0, 0, 200000, 230400, 0x88c4d19a -1, 0, 0, 1024, 2048, 0xb3f10192 -1, 1024, 1024, 1024, 2048, 0xb340fe4e -1, 2048, 2048, 1024, 2048, 0x0a5f0111 -1, 3072, 3072, 1024, 2048, 0x51be06b8 -1, 4096, 4096, 1024, 2048, 0x71a1ffcb -1, 5120, 5120, 1024, 2048, 0x7f64f50f -1, 6144, 6144, 1024, 2048, 0x70a8fa17 -1, 7168, 7168, 1024, 2048, 0x0dad072a -1, 8192, 8192, 1024, 2048, 0x5e810c51 +1, 0, 0, 1024, 2048, 0xb59f0193 +1, 1024, 1024, 1024, 2048, 0xba70fe4e +1, 2048, 2048, 1024, 2048, 0xaa83fe05 +1, 3072, 3072, 1024, 2048, 0x487e06b5 +1, 4096, 4096, 1024, 2048, 0xb0abfcca +1, 5120, 5120, 1024, 2048, 0x869ef510 +1, 6144, 6144, 1024, 2048, 0x547cf717 +1, 7168, 7168, 1024, 2048, 0xca830826 +1, 8192, 8192, 1024, 2048, 0xf7700954 0, 200000, 200000, 200000, 230400, 0x0d77c977 -1, 9216, 9216, 1024, 2048, 0xbe5bf462 -1, 10240, 10240, 1024, 2048, 0xbcd9faeb -1, 11264, 11264, 1024, 2048, 0x0d5bfe9c -1, 12288, 12288, 1024, 2048, 0x97d80297 -1, 13312, 13312, 1024, 2048, 0xba0f0894 -1, 14336, 14336, 1024, 2048, 0xcc22f291 -1, 15360, 15360, 1024, 2048, 0x11a9fa03 -1, 16384, 16384, 1024, 2048, 0x9a920378 -1, 17408, 17408, 1024, 2048, 0x901b0525 +1, 9216, 9216, 1024, 2048, 0x3759f55c +1, 10240, 10240, 1024, 2048, 0x0ca9f7ee +1, 11264, 11264, 1024, 2048, 0xfb78fe99 +1, 12288, 12288, 1024, 2048, 0x93580191 +1, 13312, 13312, 1024, 2048, 0x079f0797 +1, 14336, 14336, 1024, 2048, 0xcf5ff38b +1, 15360, 15360, 1024, 2048, 0xb201f701 +1, 16384, 16384, 1024, 2048, 0x7aac0476 +1, 17408, 17408, 1024, 2048, 0xd89b0222 0, 400000, 400000, 200000, 230400, 0x242629d7 -1, 18432, 18432, 1024, 2048, 0x74b2003f -1, 19456, 19456, 1024, 2048, 0xa20ef3ed -1, 20480, 20480, 1024, 2048, 0x44cef9de -1, 21504, 21504, 1024, 2048, 0x4b2e039b -1, 22528, 22528, 1024, 2048, 0x198509a1 -1, 23552, 23552, 1024, 2048, 0xcab6f9e5 -1, 24576, 24576, 1024, 2048, 0x67f8f608 -1, 25600, 25600, 1024, 2048, 0x8d7f03fa +1, 18432, 18432, 1024, 2048, 0x160b013e +1, 19456, 19456, 1024, 2048, 0x950ef0eb +1, 20480, 20480, 1024, 2048, 0x9b51fada +1, 21504, 21504, 1024, 2048, 0xed610097 +1, 22528, 22528, 1024, 2048, 0x40b90a9d +1, 23552, 23552, 1024, 2048, 0x21eaf6e7 +1, 24576, 24576, 1024, 2048, 0x3efcf601 +1, 25600, 25600, 1024, 2048, 0x86bd01fa 0, 600000, 600000, 200000, 230400, 0x62cdc018 -1, 26624, 26624, 1024, 2048, 0x3e1e0566 -1, 27648, 27648, 1024, 2048, 0x2cfe0308 -1, 28672, 28672, 1024, 2048, 0x1ceaf702 -1, 29696, 29696, 1024, 2048, 0x38a9f3d1 -1, 30720, 30720, 1024, 2048, 0x6c3306b7 -1, 31744, 31744, 1024, 2048, 0x600f0579 -1, 32768, 32768, 1024, 2048, 0x3e5afa28 -1, 33792, 33792, 1024, 2048, 0x053ff47a -1, 34816, 34816, 1024, 2048, 0x0d28fed9 +1, 26624, 26624, 1024, 2048, 0x2cd00562 +1, 27648, 27648, 1024, 2048, 0xc9ee0204 +1, 28672, 28672, 1024, 2048, 0x00faf605 +1, 29696, 29696, 1024, 2048, 0xb031f4cd +1, 30720, 30720, 1024, 2048, 0xcb3f03b5 +1, 31744, 31744, 1024, 2048, 0xb11e067a +1, 32768, 32768, 1024, 2048, 0x3fb4f725 +1, 33792, 33792, 1024, 2048, 0x010df577 +1, 34816, 34816, 1024, 2048, 0xcc6bfbd9 0, 800000, 800000, 200000, 230400, 0x248ad058 -1, 35840, 35840, 1024, 2048, 0x279805cc -1, 36864, 36864, 1024, 2048, 0xb16a0a12 -1, 37888, 37888, 1024, 2048, 0xb45af340 -1, 38912, 38912, 1024, 2048, 0x1834f972 -1, 39936, 39936, 1024, 2048, 0xb5d206ae -1, 40960, 40960, 1024, 2048, 0xc5760375 -1, 41984, 41984, 1024, 2048, 0x503800ce -1, 43008, 43008, 1024, 2048, 0xa3bbf4af -1, 44032, 44032, 68, 136, 0xc8d751c7 +1, 35840, 35840, 1024, 2048, 0xf2f606c7 +1, 36864, 36864, 1024, 2048, 0x35560716 +1, 37888, 37888, 1024, 2048, 0x41c0f43f +1, 38912, 38912, 1024, 2048, 0x28f7f672 +1, 39936, 39936, 1024, 2048, 0x96a006a7 +1, 40960, 40960, 1024, 2048, 0x22cb0176 +1, 41984, 41984, 1024, 2048, 0x8bedffc2 +1, 43008, 43008, 1024, 2048, 0xbfaef5ae +1, 44032, 44032, 68, 136, 0xc35a50c5 0, 1000000, 1000000, 200000, 230400, 0x223d134f 1, 44100, 44100, 9600, 19200, 0x00000000 0, 1200000, 1200000, 200000, 230400, 0xbf1c3d34 @@ -68,156 +68,156 @@ 0, 1800000, 1800000, 200000, 230400, 0x6dedf2c0 1, 82500, 82500, 5700, 11400, 0x00000000 0, 2000000, 2000000, 66667, 230400, 0x88c4d19a -1, 88200, 88200, 1024, 2048, 0x283efb3a -1, 89224, 89224, 1024, 2048, 0x7692fb8f -1, 90248, 90248, 1024, 2048, 0xbaaafcc0 +1, 88200, 88200, 1024, 2048, 0x2906fb3a +1, 89224, 89224, 1024, 2048, 0x83f6fb92 +1, 90248, 90248, 1024, 2048, 0xbe36fcc1 0, 2066667, 2066667, 66667, 230400, 0x5bbc2f63 1, 91272, 91272, 1024, 2048, 0xadc8017e -1, 92296, 92296, 1024, 2048, 0x4f4dffdc -1, 93320, 93320, 1024, 2048, 0x7ffbff48 +1, 92296, 92296, 1024, 2048, 0x5a73ffde +1, 93320, 93320, 1024, 2048, 0x77b1ff47 0, 2133333, 2133333, 66667, 230400, 0x3becbfad -1, 94344, 94344, 1024, 2048, 0x2f990719 -1, 95368, 95368, 1024, 2048, 0xe2caf65c -1, 96392, 96392, 1024, 2048, 0x825208e4 +1, 94344, 94344, 1024, 2048, 0x3629071b +1, 95368, 95368, 1024, 2048, 0xdb0cf65b +1, 96392, 96392, 1024, 2048, 0x77a808e2 0, 2200000, 2200000, 66667, 230400, 0x0d77c977 -1, 97416, 97416, 1024, 2048, 0xf563f13b -1, 98440, 98440, 1024, 2048, 0x855d03e9 -1, 99464, 99464, 1024, 2048, 0x0ba9fa4b +1, 97416, 97416, 1024, 2048, 0xe961f137 +1, 98440, 98440, 1024, 2048, 0x965103ec +1, 99464, 99464, 1024, 2048, 0x0305fa4b 0, 2266667, 2266667, 66667, 230400, 0x436cf4b2 -1, 100488, 100488, 1024, 2048, 0x83e1fb92 -1, 101512, 101512, 1024, 2048, 0x1162f965 -1, 102536, 102536, 1024, 2048, 0x0cfef73d +1, 100488, 100488, 1024, 2048, 0x83c1fb91 +1, 101512, 101512, 1024, 2048, 0x014af961 +1, 102536, 102536, 1024, 2048, 0x186cf73f 0, 2333333, 2333333, 66667, 230400, 0x39210f27 -1, 103560, 103560, 1024, 2048, 0x5688ff75 -1, 104584, 104584, 1024, 2048, 0xf6c0ede9 -1, 105608, 105608, 1024, 2048, 0xfdb20602 +1, 103560, 103560, 1024, 2048, 0x4d60ff77 +1, 104584, 104584, 1024, 2048, 0xea04edea +1, 105608, 105608, 1024, 2048, 0xc93204ff 0, 2400000, 2400000, 66667, 230400, 0x242629d7 -1, 106632, 106632, 1024, 2048, 0x40c5f17b -1, 107656, 107656, 1024, 2048, 0x559600b1 -1, 108680, 108680, 1024, 2048, 0xccc3f930 +1, 106632, 106632, 1024, 2048, 0x544ff17d +1, 107656, 107656, 1024, 2048, 0x58e200ae +1, 108680, 108680, 1024, 2048, 0xdea9f932 0, 2466667, 2466667, 66667, 230400, 0x771c2293 -1, 109704, 109704, 1024, 2048, 0xdc800045 -1, 110728, 110728, 1024, 2048, 0xdce4fb3e +1, 109704, 109704, 1024, 2048, 0x53ecfe34 +1, 110728, 110728, 1024, 2048, 0x6242fc3b 0, 2533333, 2533333, 66667, 230400, 0xec2af9a9 -1, 111752, 111752, 1024, 2048, 0x1e5efba9 -1, 112776, 112776, 1024, 2048, 0x8c2e0832 -1, 113800, 113800, 1024, 2048, 0x5c42f66d +1, 111752, 111752, 1024, 2048, 0x257efbac +1, 112776, 112776, 1024, 2048, 0x978e0833 +1, 113800, 113800, 1024, 2048, 0x47bcf66e 0, 2600000, 2600000, 66667, 230400, 0x62cdc018 -1, 114824, 114824, 1024, 2048, 0x08e20b1e -1, 115848, 115848, 1024, 2048, 0x4cf7f903 -1, 116872, 116872, 1024, 2048, 0xe6b90794 +1, 114824, 114824, 1024, 2048, 0xebbb0b1a +1, 115848, 115848, 1024, 2048, 0x45b8f805 +1, 116872, 116872, 1024, 2048, 0xf73b0796 0, 2666667, 2666667, 66667, 230400, 0xf02c8693 -1, 117896, 117896, 1024, 2048, 0x5956f8e6 -1, 118920, 118920, 1024, 2048, 0x6632ff16 -1, 119944, 119944, 1024, 2048, 0x46c8fe11 +1, 117896, 117896, 1024, 2048, 0x56a6f9df +1, 118920, 118920, 1024, 2048, 0x80ccff1a +1, 119944, 119944, 1024, 2048, 0x4f06fe14 0, 2733333, 2733333, 66667, 230400, 0x14436efb -1, 120968, 120968, 1024, 2048, 0x7431f732 -1, 121992, 121992, 1024, 2048, 0xa258049f -1, 123016, 123016, 1024, 2048, 0xdb71f00e +1, 120968, 120968, 1024, 2048, 0x8177f733 +1, 121992, 121992, 1024, 2048, 0xb64404a4 +1, 123016, 123016, 1024, 2048, 0xce65f00a 0, 2800000, 2800000, 66667, 230400, 0x248ad058 -1, 124040, 124040, 1024, 2048, 0xa89b0359 -1, 125064, 125064, 1024, 2048, 0xe0aff0f2 -1, 126088, 126088, 1024, 2048, 0xc33e0085 +1, 124040, 124040, 1024, 2048, 0xb1b5035b +1, 125064, 125064, 1024, 2048, 0xe2eff0f3 +1, 126088, 126088, 1024, 2048, 0xd3740083 0, 2866667, 2866667, 66667, 230400, 0xe87f6c52 -1, 127112, 127112, 1024, 2048, 0x9d09f379 -1, 128136, 128136, 1024, 2048, 0x8c78fd06 -1, 129160, 129160, 1024, 2048, 0x532bfbdd +1, 127112, 127112, 1024, 2048, 0xf0eff27f +1, 128136, 128136, 1024, 2048, 0x6ceafd03 +1, 129160, 129160, 1024, 2048, 0x640bfbe1 0, 2933333, 2933333, 66667, 230400, 0x6a0c196b -1, 130184, 130184, 1024, 2048, 0xfc36f5cd -1, 131208, 131208, 1024, 2048, 0x2e8f0699 -1, 132232, 132232, 1024, 2048, 0x52382578 -1, 133256, 133256, 1024, 2048, 0x97ed1a28 -1, 134280, 134280, 1024, 2048, 0xabcdf73f -1, 135304, 135304, 1024, 2048, 0x3a24082c -1, 136328, 136328, 1024, 2048, 0xbe1cfc3d -1, 137352, 137352, 1024, 2048, 0xad5800a5 -1, 138376, 138376, 1024, 2048, 0x90b80522 -1, 139400, 139400, 1024, 2048, 0x1fa1f912 -1, 140424, 140424, 1024, 2048, 0x733a0878 -1, 141448, 141448, 1024, 2048, 0x9a3eee47 -1, 142472, 142472, 1024, 2048, 0x5d900759 -1, 143496, 143496, 1024, 2048, 0x1287f540 -1, 144520, 144520, 1024, 2048, 0x941cfe5d -1, 145544, 145544, 1024, 2048, 0x1587f8a9 -1, 146568, 146568, 1024, 2048, 0xb9e7f888 -1, 147592, 147592, 1024, 2048, 0xe9defbe2 -1, 148616, 148616, 1024, 2048, 0x3a5ef312 -1, 149640, 149640, 1024, 2048, 0xdcbe0544 -1, 150664, 150664, 1024, 2048, 0xbe51ecc5 -1, 151688, 151688, 1024, 2048, 0x21a60721 -1, 152712, 152712, 1024, 2048, 0xf29ff318 -1, 153736, 153736, 1024, 2048, 0xcd4c02ea -1, 154760, 154760, 1024, 2048, 0xa424faac -1, 155784, 155784, 1024, 2048, 0xbaedfdab -1, 156808, 156808, 1024, 2048, 0xcbff047c -1, 157832, 157832, 1024, 2048, 0x9ac8f96b -1, 158856, 158856, 1024, 2048, 0x43220bee -1, 159880, 159880, 1024, 2048, 0x547bf351 -1, 160904, 160904, 1024, 2048, 0x7dd10d6e -1, 161928, 161928, 1024, 2048, 0x77cbf603 -1, 162952, 162952, 1024, 2048, 0xb6fcff50 -1, 163976, 163976, 1024, 2048, 0x927bfde5 -1, 165000, 165000, 1024, 2048, 0x5bd0fca5 -1, 166024, 166024, 1024, 2048, 0x672cff2a -1, 167048, 167048, 1024, 2048, 0x3e3ef01c -1, 168072, 168072, 1024, 2048, 0xe52607af -1, 169096, 169096, 1024, 2048, 0x66bceaf5 -1, 170120, 170120, 1024, 2048, 0xe065046b -1, 171144, 171144, 1024, 2048, 0x350bf21f -1, 172168, 172168, 1024, 2048, 0x60b1fca4 -1, 173192, 173192, 1024, 2048, 0x8b1efa55 -1, 174216, 174216, 1024, 2048, 0xf86ff855 -1, 175240, 175240, 1024, 2048, 0x6934061b -1, 176264, 176264, 136, 272, 0x4a458a45 +1, 130184, 130184, 1024, 2048, 0xd8daf5c9 +1, 131208, 131208, 1024, 2048, 0x239b0696 +1, 132232, 132232, 1024, 2048, 0x34ca2574 +1, 133256, 133256, 1024, 2048, 0x70971a20 +1, 134280, 134280, 1024, 2048, 0xb9f3f740 +1, 135304, 135304, 1024, 2048, 0x2c5a0824 +1, 136328, 136328, 1024, 2048, 0xe408fc40 +1, 137352, 137352, 1024, 2048, 0xcb32019a +1, 138376, 138376, 1024, 2048, 0xfe19042b +1, 139400, 139400, 1024, 2048, 0xec08fa0c +1, 140424, 140424, 1024, 2048, 0x7a00087c +1, 141448, 141448, 1024, 2048, 0xa390ee4a +1, 142472, 142472, 1024, 2048, 0x7af00762 +1, 143496, 143496, 1024, 2048, 0x11f9f541 +1, 144520, 144520, 1024, 2048, 0x71f1ff60 +1, 145544, 145544, 1024, 2048, 0x05a3f8a6 +1, 146568, 146568, 1024, 2048, 0xd0a3f88a +1, 147592, 147592, 1024, 2048, 0xf4cefbe9 +1, 148616, 148616, 1024, 2048, 0x34dcf316 +1, 149640, 149640, 1024, 2048, 0x263d043a +1, 150664, 150664, 1024, 2048, 0xe741eccf +1, 151688, 151688, 1024, 2048, 0x01e40715 +1, 152712, 152712, 1024, 2048, 0x037ef319 +1, 153736, 153736, 1024, 2048, 0x4faf00e5 +1, 154760, 154760, 1024, 2048, 0x9ec1fba7 +1, 155784, 155784, 1024, 2048, 0xb575fdae +1, 156808, 156808, 1024, 2048, 0x152b0381 +1, 157832, 157832, 1024, 2048, 0x76c0f96a +1, 158856, 158856, 1024, 2048, 0x02200ce5 +1, 159880, 159880, 1024, 2048, 0xd816f252 +1, 160904, 160904, 1024, 2048, 0x9a210d74 +1, 161928, 161928, 1024, 2048, 0xdf52f701 +1, 162952, 162952, 1024, 2048, 0xb1acff54 +1, 163976, 163976, 1024, 2048, 0xe059fce7 +1, 165000, 165000, 1024, 2048, 0x5fbafca5 +1, 166024, 166024, 1024, 2048, 0x065f0044 +1, 167048, 167048, 1024, 2048, 0x138af014 +1, 168072, 168072, 1024, 2048, 0x011907b6 +1, 169096, 169096, 1024, 2048, 0x56d6eaf1 +1, 170120, 170120, 1024, 2048, 0x0862046a +1, 171144, 171144, 1024, 2048, 0x2480f12a +1, 172168, 172168, 1024, 2048, 0x13fffc9c +1, 173192, 173192, 1024, 2048, 0x996afa59 +1, 174216, 174216, 1024, 2048, 0xb859f84e +1, 175240, 175240, 1024, 2048, 0x38170512 +1, 176264, 176264, 136, 272, 0x48418a43 0, 4000000, 4000000, 125000, 230400, 0x88c4d19a 1, 176400, 176400, 1024, 2048, 0xdb0cfe95 -1, 177424, 177424, 1024, 2048, 0xcff3fdf1 -1, 178448, 178448, 1024, 2048, 0x070cf585 -1, 179472, 179472, 1024, 2048, 0xe9b8007f -1, 180496, 180496, 1024, 2048, 0xc51ffd64 -1, 181520, 181520, 1024, 2048, 0xede2fbf9 +1, 177424, 177424, 1024, 2048, 0xc8b3fdf1 +1, 178448, 178448, 1024, 2048, 0x01aef583 +1, 179472, 179472, 1024, 2048, 0x79be017e +1, 180496, 180496, 1024, 2048, 0xd00ffd65 +1, 181520, 181520, 1024, 2048, 0x4513fcf8 0, 4125000, 4125000, 125000, 230400, 0x05c1b733 -1, 182544, 182544, 1024, 2048, 0x51510410 -1, 183568, 183568, 1024, 2048, 0x198af498 -1, 184592, 184592, 1024, 2048, 0xae3603a2 -1, 185616, 185616, 1024, 2048, 0x6200f7a1 -1, 186640, 186640, 1024, 2048, 0xe6e3fe32 +1, 182544, 182544, 1024, 2048, 0x55a30411 +1, 183568, 183568, 1024, 2048, 0x30f9f596 +1, 184592, 184592, 1024, 2048, 0xbdf203a3 +1, 185616, 185616, 1024, 2048, 0x466af89f +1, 186640, 186640, 1024, 2048, 0xeb8bfe33 0, 4250000, 4250000, 125000, 230400, 0x0446ec19 -1, 187664, 187664, 1024, 2048, 0xb2e2fd77 -1, 188688, 188688, 1024, 2048, 0x063dff2f -1, 189712, 189712, 1024, 2048, 0xa89ffe21 -1, 190736, 190736, 1024, 2048, 0x9e6ffa6d -1, 191760, 191760, 1024, 2048, 0x028b004e -1, 192784, 192784, 1024, 2048, 0x57edfa23 +1, 187664, 187664, 1024, 2048, 0x5335fe73 +1, 188688, 188688, 1024, 2048, 0x159bff32 +1, 189712, 189712, 1024, 2048, 0x1b81ff1e +1, 190736, 190736, 1024, 2048, 0xaa2ffa70 +1, 191760, 191760, 1024, 2048, 0x0441004f +1, 192784, 192784, 1024, 2048, 0x8433fb21 0, 4375000, 4375000, 125000, 230400, 0x0f9b1744 -1, 193808, 193808, 1024, 2048, 0x6d8efe1f -1, 194832, 194832, 1024, 2048, 0x774bfe54 -1, 195856, 195856, 1024, 2048, 0xa931fcfb -1, 196880, 196880, 1024, 2048, 0x3505004b -1, 197904, 197904, 1024, 2048, 0x5001f576 +1, 193808, 193808, 1024, 2048, 0x6a9afe1d +1, 194832, 194832, 1024, 2048, 0x7bd2ff53 +1, 195856, 195856, 1024, 2048, 0xbe15fcfe +1, 196880, 196880, 1024, 2048, 0xfc12014a +1, 197904, 197904, 1024, 2048, 0x49dbf575 0, 4500000, 4500000, 125000, 230400, 0x30cf070a -1, 198928, 198928, 1024, 2048, 0x78ea049b -1, 199952, 199952, 1024, 2048, 0xd45bf733 -1, 200976, 200976, 1024, 2048, 0x6395fead -1, 202000, 202000, 1024, 2048, 0xc126015e -1, 203024, 203024, 1024, 2048, 0xbecff8aa +1, 198928, 198928, 1024, 2048, 0xfe400599 +1, 199952, 199952, 1024, 2048, 0xd7bdf732 +1, 200976, 200976, 1024, 2048, 0xb70cffac +1, 202000, 202000, 1024, 2048, 0xc46a015f +1, 203024, 203024, 1024, 2048, 0xcf07f9a9 0, 4625000, 4625000, 125000, 230400, 0x9175aaa9 -1, 204048, 204048, 1024, 2048, 0x0fea06c3 -1, 205072, 205072, 1024, 2048, 0xdea6f351 -1, 206096, 206096, 1024, 2048, 0x35b808f0 -1, 207120, 207120, 1024, 2048, 0x5487ee73 -1, 208144, 208144, 1024, 2048, 0xac69050e -1, 209168, 209168, 1024, 2048, 0xcc5ffb00 +1, 204048, 204048, 1024, 2048, 0x108c06c2 +1, 205072, 205072, 1024, 2048, 0xd340f350 +1, 206096, 206096, 1024, 2048, 0x0a7b09f0 +1, 207120, 207120, 1024, 2048, 0x4299ee71 +1, 208144, 208144, 1024, 2048, 0x43ff060d +1, 209168, 209168, 1024, 2048, 0xbe31fafb 0, 4750000, 4750000, 125000, 230400, 0x597f5628 -1, 210192, 210192, 1024, 2048, 0x328c00cb -1, 211216, 211216, 1024, 2048, 0xa707fd82 -1, 212240, 212240, 1024, 2048, 0xe442f73d -1, 213264, 213264, 1024, 2048, 0x545c0418 -1, 214288, 214288, 1024, 2048, 0x744ff3f7 +1, 210192, 210192, 1024, 2048, 0xaaae01cb +1, 211216, 211216, 1024, 2048, 0xa7abfd7f +1, 212240, 212240, 1024, 2048, 0x0b0cf839 +1, 213264, 213264, 1024, 2048, 0x5cec0417 +1, 214288, 214288, 1024, 2048, 0x6909f4f5 0, 4875000, 4875000, 125000, 230400, 0x38a45a85 -1, 215312, 215312, 1024, 2048, 0x01aa04fd -1, 216336, 216336, 1024, 2048, 0xa885f7cd -1, 217360, 217360, 1024, 2048, 0xcfca04f4 -1, 218384, 218384, 1024, 2048, 0x67fdf91b -1, 219408, 219408, 1024, 2048, 0xce2b001d +1, 215312, 215312, 1024, 2048, 0xf89104fb +1, 216336, 216336, 1024, 2048, 0x51daf8c8 +1, 217360, 217360, 1024, 2048, 0xc66004f4 +1, 218384, 218384, 1024, 2048, 0xd48efa17 +1, 219408, 219408, 1024, 2048, 0xb6ed001a 1, 220432, 220432, 68, 136, 0x33e64a0d diff --git a/tests/ref/fate/filter-crazychannels b/tests/ref/fate/filter-crazychannels index db4e63a833..d48bf5cd92 100644 --- a/tests/ref/fate/filter-crazychannels +++ b/tests/ref/fate/filter-crazychannels @@ -328,69 +328,69 @@ #codec_id 65: pcm_s16le #sample_rate 65: 44100 #channel_layout_name 65: 1 channels (FR) -0, 0, 0, 1024, 2048, 0xd782fb56 +0, 0, 0, 1024, 2048, 0x902ff75a 1, 0, 0, 1024, 2048, 0x00000000 -2, 0, 0, 1024, 2048, 0xd501f2b4 +2, 0, 0, 1024, 2048, 0x8d14eeb7 3, 0, 0, 1024, 2048, 0x3281ecb5 -4, 0, 0, 1024, 2048, 0xffb00086 +4, 0, 0, 1024, 2048, 0x6eadf483 5, 0, 0, 1024, 2048, 0xe9b7f252 -6, 0, 0, 1024, 2048, 0x53e6f849 +6, 0, 0, 1024, 2048, 0x0c93f44d 7, 0, 0, 1024, 2048, 0xacb9f526 -8, 0, 0, 1024, 2048, 0xa79b0dcb +8, 0, 0, 1024, 2048, 0x0a94eddc 9, 0, 0, 1024, 2048, 0xa4eaf5c8 -10, 0, 0, 1024, 2048, 0x31010ff1 +10, 0, 0, 1024, 2048, 0xa2d4e80a 11, 0, 0, 1024, 2048, 0xdfaa053a -12, 0, 0, 1024, 2048, 0x7321fac9 +12, 0, 0, 1024, 2048, 0x2bcef6cd 13, 0, 0, 1024, 2048, 0x0786f54d -14, 0, 0, 1024, 2048, 0x32c7fcb7 +14, 0, 0, 1024, 2048, 0xeb65f8bb 15, 0, 0, 1024, 2048, 0x23e8ee40 16, 0, 0, 1024, 2048, 0xaddef714 -17, 0, 0, 1024, 2048, 0x1c6ffa69 +17, 0, 0, 1024, 2048, 0xd50df66d 18, 0, 0, 1024, 2048, 0x493bfb48 -19, 0, 0, 1024, 2048, 0x8e26106e +19, 0, 0, 1024, 2048, 0x0008e887 20, 0, 0, 1024, 2048, 0x0d47f953 -21, 0, 0, 1024, 2048, 0x49a90415 +21, 0, 0, 1024, 2048, 0x02560019 22, 0, 0, 1024, 2048, 0x5349cdcf -23, 0, 0, 1024, 2048, 0x20410430 +23, 0, 0, 1024, 2048, 0xd8df0034 24, 0, 0, 1024, 2048, 0xd3f7ffbe -25, 0, 0, 1024, 2048, 0xca8902f8 +25, 0, 0, 1024, 2048, 0x3986f6f5 26, 0, 0, 1024, 2048, 0xfe9ffcff -27, 0, 0, 1024, 2048, 0xf1c0fd21 +27, 0, 0, 1024, 2048, 0xaa6df925 28, 0, 0, 1024, 2048, 0x6007e947 -29, 0, 0, 1024, 2048, 0x33310ce6 -30, 0, 0, 1024, 2048, 0x04f103a1 +29, 0, 0, 1024, 2048, 0x961becf7 +30, 0, 0, 1024, 2048, 0xbbc1ff95 31, 0, 0, 1024, 2048, 0xf84bf6df -32, 0, 0, 1024, 2048, 0xc597027d +32, 0, 0, 1024, 2048, 0x7d9efe71 33, 0, 0, 1024, 2048, 0x7391ff47 -34, 0, 0, 1024, 2048, 0xd6ab0226 +34, 0, 0, 1024, 2048, 0x45a8f623 35, 0, 0, 1024, 2048, 0x4b98fd12 -36, 0, 0, 1024, 2048, 0xb2510d31 +36, 0, 0, 1024, 2048, 0x154aed42 37, 0, 0, 1024, 2048, 0x11e0e994 -38, 0, 0, 1024, 2048, 0xfa5cfa07 +38, 0, 0, 1024, 2048, 0xb309f60b 39, 0, 0, 1024, 2048, 0x494cf951 -40, 0, 0, 1024, 2048, 0xf87401ca +40, 0, 0, 1024, 2048, 0x6771f5c7 41, 0, 0, 1024, 2048, 0x188ffd8f -42, 0, 0, 1024, 2048, 0xc673f7fd +42, 0, 0, 1024, 2048, 0x7f20f401 43, 0, 0, 1024, 2048, 0x3020cead 44, 0, 0, 1024, 2048, 0x0f34f9ec -45, 0, 0, 1024, 2048, 0x2f15053e +45, 0, 0, 1024, 2048, 0xe4f50141 46, 0, 0, 1024, 2048, 0x4cc9e880 -47, 0, 0, 1024, 2048, 0xa7d0015a +47, 0, 0, 1024, 2048, 0x5f77fd4e 48, 0, 0, 1024, 2048, 0x20c3fcb7 -49, 0, 0, 1024, 2048, 0xb6f80160 +49, 0, 0, 1024, 2048, 0x25f5f55d 50, 0, 0, 1024, 2048, 0x28f88d75 -51, 0, 0, 1024, 2048, 0xf20502a2 +51, 0, 0, 1024, 2048, 0xaab2fe97 52, 0, 0, 1024, 2048, 0x7f88f6f8 -53, 0, 0, 1024, 2048, 0x02690489 +53, 0, 0, 1024, 2048, 0xbb07008d 54, 0, 0, 1024, 2048, 0x306af8c2 -55, 0, 0, 1024, 2048, 0xbe9a1052 -56, 0, 0, 1024, 2048, 0x344bfc0b -57, 0, 0, 1024, 2048, 0xb2a00b99 -58, 0, 0, 1024, 2048, 0x0cbe045d +55, 0, 0, 1024, 2048, 0x307ce86b +56, 0, 0, 1024, 2048, 0x34c9fc0c +57, 0, 0, 1024, 2048, 0x1599ebaa +58, 0, 0, 1024, 2048, 0x7bacf85a 59, 0, 0, 1024, 2048, 0x5830fd09 -60, 0, 0, 1024, 2048, 0x8c7900bd +60, 0, 0, 1024, 2048, 0x4448fcb1 61, 0, 0, 1024, 2048, 0x4a20f705 -62, 0, 0, 1024, 2048, 0x282201f6 +62, 0, 0, 1024, 2048, 0xe0c0fdeb 63, 0, 0, 1024, 2048, 0xfbb2fafa -64, 0, 0, 1024, 2048, 0x308b8f8f +64, 0, 0, 1024, 2048, 0xbc6b6ca4 65, 0, 0, 1024, 2048, 0x187bfced diff --git a/tests/ref/fate/shortest b/tests/ref/fate/shortest index 0690799d8d..8961cab2d9 100644 --- a/tests/ref/fate/shortest +++ b/tests/ref/fate/shortest @@ -8,60 +8,60 @@ #codec_id 1: ac3 #sample_rate 1: 44100 #channel_layout_name 1: mono -1, -256, -256, 1536, 416, 0x69efcbcc +1, -256, -256, 1536, 416, 0xcedecce4 0, 0, 0, 1, 27867, 0x1426a0d6, S=1, 8 -1, 1280, 1280, 1536, 418, 0xa0ccc09d +1, 1280, 1280, 1536, 418, 0x4ebabf82 0, 1, 1, 1, 9806, 0xbebc2826, F=0x0, S=1, 8 -1, 2816, 2816, 1536, 418, 0xb873cb60 +1, 2816, 2816, 1536, 418, 0xfad7bb69 0, 2, 2, 1, 10453, 0x4a188450, F=0x0, S=1, 8 -1, 4352, 4352, 1536, 418, 0x1366c008 +1, 4352, 4352, 1536, 418, 0x0927c4d0 0, 3, 3, 1, 10248, 0x4c831c08, F=0x0, S=1, 8 -1, 5888, 5888, 1536, 418, 0xeb24c8da +1, 5888, 5888, 1536, 418, 0x66e8cc96 0, 4, 4, 1, 11680, 0x5508c44d, F=0x0, S=1, 8 -1, 7424, 7424, 1536, 418, 0xc75ac55e +1, 7424, 7424, 1536, 418, 0x6f2fbb2d 0, 5, 5, 1, 11046, 0x096ca433, F=0x0, S=1, 8 -1, 8960, 8960, 1536, 418, 0xe336d28d -1, 10496, 10496, 1536, 418, 0xd0acc452 +1, 8960, 8960, 1536, 418, 0xeb8fd747 +1, 10496, 10496, 1536, 418, 0xeb3cc502 0, 6, 6, 1, 9888, 0x440a5b45, F=0x0, S=1, 8 -1, 12032, 12032, 1536, 418, 0xae88c75f +1, 12032, 12032, 1536, 418, 0xb9b2ccec 0, 7, 7, 1, 10165, 0x116d4909, F=0x0, S=1, 8 -1, 13568, 13568, 1536, 418, 0xa200b8f0 +1, 13568, 13568, 1536, 418, 0x50fac2e5 0, 8, 8, 1, 11704, 0xb334a24c, F=0x0, S=1, 8 -1, 15104, 15104, 1536, 418, 0x009dccf6 +1, 15104, 15104, 1536, 418, 0xa276ca76 0, 9, 9, 1, 11059, 0x49aa6515, F=0x0, S=1, 8 -1, 16640, 16640, 1536, 418, 0x585ec129 +1, 16640, 16640, 1536, 418, 0x11e1c91a 0, 10, 10, 1, 8764, 0x8214fab0, F=0x0, S=1, 8 -1, 18176, 18176, 1536, 418, 0xda1acf75 +1, 18176, 18176, 1536, 418, 0x41eec2ee 0, 11, 11, 1, 9328, 0x92987740, F=0x0, S=1, 8 -1, 19712, 19712, 1536, 418, 0xd326d279 +1, 19712, 19712, 1536, 418, 0xa791c67c 0, 12, 12, 1, 27955, 0xe25edb6c, S=1, 8 -1, 21248, 21248, 1536, 418, 0x1b54bf76 -1, 22784, 22784, 1536, 418, 0xdb39cbd1 +1, 21248, 21248, 1536, 418, 0x9485bc1a +1, 22784, 22784, 1536, 418, 0x1afdc658 0, 13, 13, 1, 11181, 0x3cf56687, F=0x0, S=1, 8 -1, 24320, 24320, 1536, 418, 0x6813cefa +1, 24320, 24320, 1536, 418, 0xd79dbfe5 0, 14, 14, 1, 12002, 0x87942530, F=0x0, S=1, 8 -1, 25856, 25856, 1536, 418, 0xb402d2ec +1, 25856, 25856, 1536, 418, 0x2085c28a 0, 15, 15, 1, 10122, 0xbb10e8d9, F=0x0, S=1, 8 -1, 27392, 27392, 1536, 418, 0x80c4c8d2 +1, 27392, 27392, 1536, 418, 0x0ab9cc60 0, 16, 16, 1, 9715, 0xa4a1325c, F=0x0, S=1, 8 -1, 28928, 28928, 1536, 418, 0xaeaac123 +1, 28928, 28928, 1536, 418, 0xe7bfc22b 0, 17, 17, 1, 11222, 0x15118a48, F=0x0, S=1, 8 -1, 30464, 30464, 1536, 418, 0xe2c9c038 +1, 30464, 30464, 1536, 418, 0xd782bcb8 0, 18, 18, 1, 11384, 0xd4304391, F=0x0, S=1, 8 -1, 32000, 32000, 1536, 418, 0x3f37c65b +1, 32000, 32000, 1536, 418, 0xd92dbd04 0, 19, 19, 1, 9141, 0xabd1eb90, F=0x0, S=1, 8 -1, 33536, 33536, 1536, 418, 0xf9a2cf98 -1, 35072, 35072, 1536, 418, 0xc951cbb5 +1, 33536, 33536, 1536, 418, 0x964fd01a +1, 35072, 35072, 1536, 418, 0x502ec400 0, 20, 20, 1, 10049, 0x5b388bc2, F=0x0, S=1, 8 -1, 36608, 36608, 1536, 418, 0x4e92be94 +1, 36608, 36608, 1536, 418, 0xc72dc10a 0, 21, 21, 1, 9049, 0x214505c3, F=0x0, S=1, 8 -1, 38144, 38144, 1536, 418, 0xa9d8c8d0 +1, 38144, 38144, 1536, 418, 0xd254c694 0, 22, 22, 1, 9101, 0xdba6e5ba, F=0x0, S=1, 8 -1, 39680, 39680, 1536, 418, 0xe4c8bc20 +1, 39680, 39680, 1536, 418, 0xdd6cc85c 0, 23, 23, 1, 10351, 0x0aea5644, F=0x0, S=1, 8 -1, 41216, 41216, 1536, 418, 0x2ccac571 +1, 41216, 41216, 1536, 418, 0x62c5c754 0, 24, 24, 1, 27864, 0xd0287877, S=1, 8 -1, 42752, 42752, 1536, 418, 0xd2a0cbff +1, 42752, 42752, 1536, 418, 0x5970ce11 0, 25, 25, 1, 9026, 0x01ec7d47, F=0x0, S=1, 8 1, 44288, 44288, 1536, 418, 0xffadb489 1, 45824, 45824, 1536, 418, 0x1246cae7 diff --git a/tests/ref/fate/swr-async-firstpts b/tests/ref/fate/swr-async-firstpts index 3f6b290bab..37304293d5 100644 --- a/tests/ref/fate/swr-async-firstpts +++ b/tests/ref/fate/swr-async-firstpts @@ -3,22 +3,22 @@ #codec_id 0: pcm_s16le #sample_rate 0: 1000 #channel_layout_name 0: mono -0, 0, 0, 132, 264, 0xc2981f45 -0, 132, 132, 68, 136, 0xe78e468d -0, 200, 200, 100, 200, 0xd55c67d0 -0, 300, 300, 100, 200, 0xd55c67d0 -0, 400, 400, 100, 200, 0xd55c67d0 -0, 500, 500, 93, 186, 0x85ca5db4 -0, 593, 593, 110, 220, 0xa2655d0b -0, 703, 703, 108, 216, 0x95cb6f01 -0, 811, 811, 108, 216, 0xf35668b8 +0, 0, 0, 132, 264, 0xa7b31d47 +0, 132, 132, 68, 136, 0xbea94291 +0, 200, 200, 100, 200, 0xf5045fd8 +0, 300, 300, 100, 200, 0xf5045fd8 +0, 400, 400, 100, 200, 0xf5045fd8 +0, 500, 500, 93, 186, 0x87605db8 +0, 593, 593, 110, 220, 0xa3cb5d0c +0, 703, 703, 108, 216, 0x98a96f08 +0, 811, 811, 108, 216, 0xabc167bc 0, 919, 919, 149, 298, 0xc273245f -0, 1068, 1068, 136, 272, 0xedeb6e0a -0, 1204, 1204, 98, 196, 0xea18668e -0, 1302, 1302, 98, 196, 0x412861e7 -0, 1400, 1400, 98, 196, 0x7ec361b2 -0, 1498, 1498, 110, 220, 0xf3ae6a6a -0, 1608, 1608, 108, 216, 0xab2f6c93 -0, 1716, 1716, 107, 214, 0x50de6eb9 -0, 1823, 1823, 106, 212, 0x67b8656d +0, 1068, 1068, 136, 272, 0xefcf6e0f +0, 1204, 1204, 98, 196, 0xebbc668f +0, 1302, 1302, 98, 196, 0x42d461ea +0, 1400, 1400, 98, 196, 0x802961b5 +0, 1498, 1498, 110, 220, 0xf57a6a71 +0, 1608, 1608, 108, 216, 0xacb36c97 +0, 1716, 1716, 107, 214, 0x52586ebf +0, 1823, 1823, 106, 212, 0x696c6571 0, 1929, 1929, 18, 36, 0x2b7911c6

1 0