May 2022 - ffmpeg-cvslog - lists.ffmpeg.org

fftools/ffmpeg: reuse the encoding code for flushing encoders
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Mar 30 17:05:48 2022 +0200| [2ecb333fe415b4b54d73b74e2009027d1883fa62] | committer: Anton Khirnov fftools/ffmpeg: reuse the encoding code for flushing encoders > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2ecb333fe415b4b54… --- fftools/ffmpeg.c | 84 ++++++++++++++------------------------------------------ 1 file changed, 21 insertions(+), 63 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e62c39522..9b69a5a2c9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -836,12 +836,12 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) AVCodecContext *enc = ost->enc_ctx; AVPacket *pkt = ost->pkt; const char *type_desc = av_get_media_type_string(enc->codec_type); + const char *action = frame ? "encode" : "flush"; int ret; + if (frame) { ost->frames_encoded++; - update_benchmark(NULL); - if (debug_ts) { av_log(NULL, AV_LOG_INFO, "encoder <- type:%s " "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", @@ -849,9 +849,12 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base), enc->time_base.num, enc->time_base.den); } + } + + update_benchmark(NULL); ret = avcodec_send_frame(enc, frame); - if (ret < 0) { + if (ret < 0 && !(ret == AVERROR_EOF && !frame)) { av_log(NULL, AV_LOG_ERROR, "Error submitting %s frame to the encoder\n", type_desc); return ret; @@ -859,11 +862,20 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) while (1) { ret = avcodec_receive_packet(enc, pkt); - update_benchmark("encode_%s %d.%d", type_desc, + update_benchmark("%s_%s %d.%d", action, type_desc, ost->file_index, ost->index); - if (ret == AVERROR(EAGAIN)) + + /* if two pass, output log on success and EOF */ + if ((ret >= 0 || ret == AVERROR_EOF) && ost->logfile && enc->stats_out) + fprintf(ost->logfile, "%s", enc->stats_out); + + if (ret == AVERROR(EAGAIN)) { + av_assert0(frame); // should never happen during flushing return 0; - else if (ret < 0) { + } else if (ret == AVERROR_EOF) { + output_packet(of, pkt, ost, 1); + return ret; + } else if (ret < 0) { av_log(NULL, AV_LOG_ERROR, "%s encoding failed\n", type_desc); return ret; } @@ -894,10 +906,6 @@ static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) do_video_stats(ost, pkt->size); output_packet(of, pkt, ost, 0); - - /* if two pass, output log */ - if (ost->logfile && enc->stats_out) - fprintf(ost->logfile, "%s", enc->stats_out); } av_assert0(0); @@ -1762,59 +1770,9 @@ static void flush_encoders(void) if (enc->codec_type != AVMEDIA_TYPE_VIDEO && enc->codec_type != AVMEDIA_TYPE_AUDIO) continue; - for (;;) { - const char *desc = NULL; - AVPacket *pkt = ost->pkt; - int pkt_size; - - switch (enc->codec_type) { - case AVMEDIA_TYPE_AUDIO: - desc = "audio"; - break; - case AVMEDIA_TYPE_VIDEO: - desc = "video"; - break; - default: - av_assert0(0); - } - - update_benchmark(NULL); - - while ((ret = avcodec_receive_packet(enc, pkt)) == AVERROR(EAGAIN)) { - ret = avcodec_send_frame(enc, NULL); - if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n", - desc, - av_err2str(ret)); - exit_program(1); - } - } - - update_benchmark("flush_%s %d.%d", desc, ost->file_index, ost->index); - if (ret < 0 && ret != AVERROR_EOF) { - av_log(NULL, AV_LOG_FATAL, "%s encoding failed: %s\n", - desc, - av_err2str(ret)); - exit_program(1); - } - if (ost->logfile && enc->stats_out) { - fprintf(ost->logfile, "%s", enc->stats_out); - } - if (ret == AVERROR_EOF) { - output_packet(of, pkt, ost, 1); - break; - } - if (ost->finished & MUXER_FINISHED) { - av_packet_unref(pkt); - continue; - } - av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); - pkt_size = pkt->size; - output_packet(of, pkt, ost, 0); - if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) { - do_video_stats(ost, pkt_size); - } - } + ret = encode_frame(of, ost, NULL); + if (ret != AVERROR_EOF) + exit_program(1); } }

1 0

fftools/ffmpeg: share the code encoding a single frame between video and audio
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Mar 30 13:10:34 2022 +0200| [a11ab647304307d0340fd052e04cf638b6bef309] | committer: Anton Khirnov fftools/ffmpeg: share the code encoding a single frame between video and audio Call do_video_stats() for every video packet produced by the encoder, rather than for every frame sent to the encoder. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a11ab647304307d03… --- fftools/ffmpeg.c | 145 +++++++++++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 85 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index a85ed18b08..0e62c39522 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -831,63 +831,96 @@ static int init_output_stream_wrapper(OutputStream *ost, AVFrame *frame, return ret; } -static void do_audio_out(OutputFile *of, OutputStream *ost, - AVFrame *frame) +static int encode_frame(OutputFile *of, OutputStream *ost, AVFrame *frame) { - AVCodecContext *enc = ost->enc_ctx; - AVPacket *pkt = ost->pkt; + AVCodecContext *enc = ost->enc_ctx; + AVPacket *pkt = ost->pkt; + const char *type_desc = av_get_media_type_string(enc->codec_type); int ret; - adjust_frame_pts_to_encoder_tb(of, ost, frame); - - if (!check_recording_time(ost)) - return; - - if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0) - frame->pts = ost->sync_opts; - ost->sync_opts = frame->pts + frame->nb_samples; - ost->samples_encoded += frame->nb_samples; ost->frames_encoded++; update_benchmark(NULL); + if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder <- type:audio " + av_log(NULL, AV_LOG_INFO, "encoder <- type:%s " "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", + type_desc, av_ts2str(frame->pts), av_ts2timestr(frame->pts, &enc->time_base), enc->time_base.num, enc->time_base.den); } ret = avcodec_send_frame(enc, frame); - if (ret < 0) - goto error; + if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "Error submitting %s frame to the encoder\n", + type_desc); + return ret; + } while (1) { ret = avcodec_receive_packet(enc, pkt); + update_benchmark("encode_%s %d.%d", type_desc, + ost->file_index, ost->index); if (ret == AVERROR(EAGAIN)) - break; - if (ret < 0) - goto error; + return 0; + else if (ret < 0) { + av_log(NULL, AV_LOG_ERROR, "%s encoding failed\n", type_desc); + return ret; + } - update_benchmark("encode_audio %d.%d", ost->file_index, ost->index); + if (debug_ts) { + av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " + "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " + "duration:%s duration_time:%s\n", + type_desc, + av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), + av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), + av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); + } av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder -> type:audio " + av_log(NULL, AV_LOG_INFO, "encoder -> type:%s " "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " "duration:%s duration_time:%s\n", + type_desc, av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); } + if (enc->codec_type == AVMEDIA_TYPE_VIDEO && vstats_filename) + do_video_stats(ost, pkt->size); + output_packet(of, pkt, ost, 0); + + /* if two pass, output log */ + if (ost->logfile && enc->stats_out) + fprintf(ost->logfile, "%s", enc->stats_out); } - return; -error: - av_log(NULL, AV_LOG_FATAL, "Audio encoding failed\n"); - exit_program(1); + av_assert0(0); +} + +static void do_audio_out(OutputFile *of, OutputStream *ost, + AVFrame *frame) +{ + int ret; + + adjust_frame_pts_to_encoder_tb(of, ost, frame); + + if (!check_recording_time(ost)) + return; + + if (frame->pts == AV_NOPTS_VALUE || audio_sync_method < 0) + frame->pts = ost->sync_opts; + ost->sync_opts = frame->pts + frame->nb_samples; + ost->samples_encoded += frame->nb_samples; + + ret = encode_frame(of, ost, frame); + if (ret < 0) + exit_program(1); } static void do_subtitle_out(OutputFile *of, @@ -979,14 +1012,12 @@ static void do_video_out(OutputFile *of, AVFrame *next_picture) { int ret; - AVPacket *pkt = ost->pkt; AVCodecContext *enc = ost->enc_ctx; AVRational frame_rate; int nb_frames, nb0_frames, i; double delta, delta0; double duration = 0; double sync_ipts = AV_NOPTS_VALUE; - int frame_size = 0; InputStream *ist = NULL; AVFilterContext *filter = ost->filter->filter; @@ -1179,73 +1210,17 @@ static void do_video_out(OutputFile *of, av_log(NULL, AV_LOG_DEBUG, "Forced keyframe at time %f\n", pts_time); } - update_benchmark(NULL); - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder <- type:video " - "frame_pts:%s frame_pts_time:%s time_base:%d/%d\n", - av_ts2str(in_picture->pts), av_ts2timestr(in_picture->pts, &enc->time_base), - enc->time_base.num, enc->time_base.den); - } - - ost->frames_encoded++; - - ret = avcodec_send_frame(enc, in_picture); + ret = encode_frame(of, ost, in_picture); if (ret < 0) - goto error; - // Make sure Closed Captions will not be duplicated - av_frame_remove_side_data(in_picture, AV_FRAME_DATA_A53_CC); - - while (1) { - ret = avcodec_receive_packet(enc, pkt); - update_benchmark("encode_video %d.%d", ost->file_index, ost->index); - if (ret == AVERROR(EAGAIN)) - break; - if (ret < 0) - goto error; - - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder -> type:video " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " - "duration:%s duration_time:%s\n", - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &enc->time_base), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &enc->time_base), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &enc->time_base)); - } - - av_packet_rescale_ts(pkt, enc->time_base, ost->mux_timebase); - - if (debug_ts) { - av_log(NULL, AV_LOG_INFO, "encoder -> type:video " - "pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s " - "duration:%s duration_time:%s\n", - av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ost->mux_timebase), - av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ost->mux_timebase), - av_ts2str(pkt->duration), av_ts2timestr(pkt->duration, &ost->mux_timebase)); - } - - frame_size = pkt->size; - output_packet(of, pkt, ost, 0); + exit_program(1); - /* if two pass, output log */ - if (ost->logfile && enc->stats_out) { - fprintf(ost->logfile, "%s", enc->stats_out); - } - } ost->sync_opts++; ost->frame_number++; - - if (vstats_filename && frame_size) - do_video_stats(ost, frame_size); } av_frame_unref(ost->last_frame); if (next_picture) av_frame_move_ref(ost->last_frame, next_picture); - - return; -error: - av_log(NULL, AV_LOG_FATAL, "Video encoding failed\n"); - exit_program(1); } static double psnr(double d)

1 0

lavfi/vf_v360: implement output mask for barrelsplit
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu May 19 15:36:44 2022 +0200| [fa26e17747bbc292d20da2ba7cb0f14d049c640c] | committer: Anton Khirnov lavfi/vf_v360: implement output mask for barrelsplit The top/bottom of the barrel are each coded as two semicircles inside a square block in the frame. Mask out the parts of the square that lie outside of these semicircles, so they are made transparent when alpha_mask=1. Fixes the other part of #9725. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa26e17747bbc292d… --- libavfilter/vf_v360.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 0c6a1a7d25..55aa05c35c 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -3744,6 +3744,7 @@ static int barrelsplit_to_xyz(const V360Context *s, const float x = (i + 0.5f) / width; const float y = (j + 0.5f) / height; float l_x, l_y, l_z; + int ret; if (x < 2.f / 3.f) { const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width * 2.f / 3.f) : 1.f - s->out_pad; @@ -3762,6 +3763,8 @@ static int barrelsplit_to_xyz(const V360Context *s, l_x = cos_theta * sin_phi; l_y = sin_theta; l_z = cos_theta * cos_phi; + + ret = 1; } else { const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width / 3.f) : 1.f - s->out_pad; const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad; @@ -3787,13 +3790,14 @@ static int barrelsplit_to_xyz(const V360Context *s, l_x = (0.5f - uf) / scalew; l_y = 0.5f * dir_vert; l_z = (vf - 0.5f) * dir_vert / scaleh; + ret = (l_x * l_x * scalew * scalew + l_z * l_z * scaleh * scaleh) < 0.5f * 0.5f; } vec[0] = l_x; vec[1] = l_y; vec[2] = l_z; - return 1; + return ret; } /**

1 0

lavfi/vf_v360: fix barrelsplit transform with padding
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu May 19 15:36:44 2022 +0200| [83a5ef51131ab1a9b22bf886f826ae899bc5ff66] | committer: Anton Khirnov lavfi/vf_v360: fix barrelsplit transform with padding Make it match Facebook's transform360 (https://github.com/facebook/transform360) Fixes one part of #9725. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83a5ef51131ab1a9b… --- libavfilter/vf_v360.c | 51 +++++++++++++++++++++++---------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 620a995733..0c6a1a7d25 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -3676,37 +3676,39 @@ static int xyz_to_barrelsplit(const V360Context *s, } else { const float scalew = s->fin_pad > 0 ? 1.f - s->fin_pad / (width / 3.f) : 1.f - s->in_pad; const float scaleh = s->fin_pad > 0 ? 1.f - s->fin_pad / (height / 4.f) : 1.f - s->in_pad; - int v_offset = 0; ew = width / 3; eh = height / 4; u_shift = 2 * ew; + uf = vec[0] / vec[1] * scalew; + vf = vec[2] / vec[1] * scaleh; + if (theta <= 0.f && theta >= -M_PI_2 && phi <= M_PI_2 && phi >= -M_PI_2) { - uf = -vec[0] / vec[1]; - vf = -vec[2] / vec[1]; + // front top + uf *= -1.0f; + vf = -(vf + 1.f) * scaleh + 1.f; v_shift = 0; - v_offset = -eh; } else if (theta >= 0.f && theta <= M_PI_2 && phi <= M_PI_2 && phi >= -M_PI_2) { - uf = vec[0] / vec[1]; - vf = -vec[2] / vec[1]; + // front bottom + vf = -(vf - 1.f) * scaleh; v_shift = height * 0.25f; } else if (theta <= 0.f && theta >= -M_PI_2) { - uf = vec[0] / vec[1]; - vf = vec[2] / vec[1]; + // back top + vf = (vf - 1.f) * scaleh + 1.f; v_shift = height * 0.5f; - v_offset = -eh; } else { - uf = -vec[0] / vec[1]; - vf = vec[2] / vec[1]; + // back bottom + uf *= -1.0f; + vf = (vf + 1.f) * scaleh; v_shift = height * 0.75f; } - uf = 0.5f * width / 3.f * (uf * scalew + 1.f); - vf = height * 0.25f * (vf * scaleh + 1.f) + v_offset; + uf = 0.5f * width / 3.f * (uf + 1.f); + vf *= height * 0.25f; } ui = floorf(uf); @@ -3764,29 +3766,22 @@ static int barrelsplit_to_xyz(const V360Context *s, const float scalew = s->fout_pad > 0 ? 1.f - s->fout_pad / (width / 3.f) : 1.f - s->out_pad; const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad; - const int face = floorf(y * 4.f); + const float facef = floorf(y * 4.f); + const int face = facef; const float dir_vert = (face == 1 || face == 3) ? 1.0f : -1.0f; float uf, vf; uf = x * 3.f - 2.f; switch (face) { - case 0: - vf = y * 2.f; + case 0: // front top + case 1: // front bottom uf = 1.f - uf; - vf = 0.5f - vf; - break; - case 1: - vf = y * 2.f; - uf = 1.f - uf; - vf = 1.f - (vf - 0.5f); - break; - case 2: - vf = y * 2.f - 0.5f; - vf = 1.f - (1.f - vf); + vf = (0.5f - 2.f * y) / scaleh + facef; break; - case 3: - vf = y * 2.f - 1.5f; + case 2: // back top + case 3: // back bottom + vf = (y * 2.f - 1.5f) / scaleh + 3.f - facef; break; } l_x = (0.5f - uf) / scalew;

1 0

lavfi/vf_v360: factorize vector computation for barrelsplit
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed May 18 11:39:02 2022 +0200| [82784ddf33e3656594b6dc38abd0023a1584cc8e] | committer: Anton Khirnov lavfi/vf_v360: factorize vector computation for barrelsplit > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=82784ddf33e365659… --- libavfilter/vf_v360.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 8f36d207c9..620a995733 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -3765,6 +3765,7 @@ static int barrelsplit_to_xyz(const V360Context *s, const float scaleh = s->fout_pad > 0 ? 1.f - s->fout_pad / (height / 4.f) : 1.f - s->out_pad; const int face = floorf(y * 4.f); + const float dir_vert = (face == 1 || face == 3) ? 1.0f : -1.0f; float uf, vf; uf = x * 3.f - 2.f; @@ -3774,36 +3775,23 @@ static int barrelsplit_to_xyz(const V360Context *s, vf = y * 2.f; uf = 1.f - uf; vf = 0.5f - vf; - - l_x = (0.5f - uf) / scalew; - l_y = -0.5f; - l_z = (0.5f - vf) / scaleh; break; case 1: vf = y * 2.f; uf = 1.f - uf; vf = 1.f - (vf - 0.5f); - - l_x = (0.5f - uf) / scalew; - l_y = 0.5f; - l_z = (-0.5f + vf) / scaleh; break; case 2: vf = y * 2.f - 0.5f; vf = 1.f - (1.f - vf); - - l_x = (0.5f - uf) / scalew; - l_y = -0.5f; - l_z = (0.5f - vf) / scaleh; break; case 3: vf = y * 2.f - 1.5f; - - l_x = (0.5f - uf) / scalew; - l_y = 0.5f; - l_z = (-0.5f + vf) / scaleh; break; } + l_x = (0.5f - uf) / scalew; + l_y = 0.5f * dir_vert; + l_z = (vf - 0.5f) * dir_vert / scaleh; } vec[0] = l_x;

1 0

lavfi/vf_v360: drop nonsense inline specifier
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue May 17 11:20:46 2022 +0200| [58bb83c7edfd0e1e160cb836a2cc5f2ff3500cce] | committer: Anton Khirnov lavfi/vf_v360: drop nonsense inline specifier This function is always called indirectly, it cannot be inlined. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58bb83c7edfd0e1e1… --- libavfilter/vf_v360.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index 7f377dd8f2..8f36d207c9 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -4239,7 +4239,7 @@ static void set_dimensions(int *outw, int *outh, int w, int h, const AVPixFmtDes } // Calculate remap data -static av_always_inline int v360_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +static int v360_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { V360Context *s = ctx->priv; SliceXYRemap *r = &s->slice_remap[jobnr];

1 0

tests/fate/vcodec: add tests for ffv1 2pass mode
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri May 20 11:33:03 2022 +0200| [60f948dd55641419ab6d92ecd287cc65d52f0d8e] | committer: Anton Khirnov tests/fate/vcodec: add tests for ffv1 2pass mode > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=60f948dd55641419a… --- tests/fate-run.sh | 12 ++++++++++++ tests/fate/vcodec.mak | 7 +++++-- tests/ref/vsynth/vsynth1-ffv1-2pass | 4 ++++ tests/ref/vsynth/vsynth2-ffv1-2pass | 4 ++++ tests/ref/vsynth/vsynth3-ffv1-2pass | 4 ++++ tests/ref/vsynth/vsynth_lena-ffv1-2pass | 4 ++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 6501dea8f8..525e8e5499 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -207,6 +207,7 @@ enc_dec(){ dec_opt_out=$6 dec_opt_in=$7 ffprobe_opts=$8 + twopass=$9 encfile="${outdir}/${test}.${enc_fmt_out}" decfile="${outdir}/${test}.out.${dec_fmt_out}" cleanfiles="$cleanfiles $decfile" @@ -214,6 +215,17 @@ enc_dec(){ tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) tdecfile=$(target_path $decfile) + + if [ -n "$twopass" ]; then + logfile_prefix="${outdir}/${test}.pass1" + cleanfiles="$cleanfiles ${logfile_prefix}-0.log" + tlogfile_prefix=$(target_path $logfile_prefix) + ffmpeg -auto_conversion_filters -f $enc_fmt_in $DEC_OPTS -i $tsrcfile \ + $ENC_OPTS $enc_opt_out $FLAGS -pass 1 -passlogfile $tlogfile_prefix \ + -f $enc_fmt_out -y $tencfile || return + enc_opt_out="$enc_opt_out -pass 2 -passlogfile $tlogfile_prefix" + fi + ffmpeg -auto_conversion_filters -f $enc_fmt_in $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt_out $FLAGS \ -f $enc_fmt_out -y $tencfile || return do_md5sum $encfile diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index c19fb8633a..8ca17950ea 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: DEFAULT_SIZE = -s 352x288 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "" "" ${TWOPASS} fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -155,7 +155,8 @@ $(FATE_VCODEC_DV:%=fate-vsynth\%-%): FMT = dv $(FATE_VCODEC_DV:%=fate-vsynth\%-%): DECOPTS += $(DEFAULT_SIZE) FATE_VCODEC-$(call ENCDEC, FFV1, AVI) += ffv1 ffv1-v0 \ - ffv1-v3-yuv420p + ffv1-v3-yuv420p \ + ffv1-2pass FATE_VCODEC_SCALE-$(call ENCDEC, FFV1, AVI) += ffv1-v3-yuv422p10 ffv1-v3-yuv444p16 \ ffv1-v3-bgr0 ffv1-v3-rgb48 fate-vsynth%-ffv1: ENCOPTS = -slices 4 @@ -173,6 +174,8 @@ fate-vsynth%-ffv1-v3-bgr0: DECOPTS = -sws_flags neighbor+bitexact fate-vsynth%-ffv1-v3-rgb48: ENCOPTS = -level 3 -pix_fmt rgb48 -strict -2 \ -sws_flags neighbor+bitexact fate-vsynth%-ffv1-v3-rgb48: DECOPTS = -sws_flags neighbor+bitexact +fate-vsynth%-ffv1-2pass: TWOPASS = 1 +fate-vsynth%-ffv1-2pass: ENCOPTS = -coder range_tab -context 1 FATE_VCODEC-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16 diff --git a/tests/ref/vsynth/vsynth1-ffv1-2pass b/tests/ref/vsynth/vsynth1-ffv1-2pass new file mode 100644 index 0000000000..c27c9691d2 --- /dev/null +++ b/tests/ref/vsynth/vsynth1-ffv1-2pass @@ -0,0 +1,4 @@ +7332cfda96233acc7178b09868c07ad7 *tests/data/fate/vsynth1-ffv1-2pass.avi +2382244 tests/data/fate/vsynth1-ffv1-2pass.avi +c5ccac874dbf808e9088bc3107860042 *tests/data/fate/vsynth1-ffv1-2pass.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth2-ffv1-2pass b/tests/ref/vsynth/vsynth2-ffv1-2pass new file mode 100644 index 0000000000..26c20db24d --- /dev/null +++ b/tests/ref/vsynth/vsynth2-ffv1-2pass @@ -0,0 +1,4 @@ +2f5af924c6f7de1d4c34ec2dc9fca4ac *tests/data/fate/vsynth2-ffv1-2pass.avi +3530664 tests/data/fate/vsynth2-ffv1-2pass.avi +36d7ca943916e1743cefa609eba0205c *tests/data/fate/vsynth2-ffv1-2pass.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200 diff --git a/tests/ref/vsynth/vsynth3-ffv1-2pass b/tests/ref/vsynth/vsynth3-ffv1-2pass new file mode 100644 index 0000000000..dd0fd615f4 --- /dev/null +++ b/tests/ref/vsynth/vsynth3-ffv1-2pass @@ -0,0 +1,4 @@ +5b658e65541539248035c17da5eada3a *tests/data/fate/vsynth3-ffv1-2pass.avi +53522 tests/data/fate/vsynth3-ffv1-2pass.avi +a038ad7c3c09f776304ef7accdea9c74 *tests/data/fate/vsynth3-ffv1-2pass.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 86700/ 86700 diff --git a/tests/ref/vsynth/vsynth_lena-ffv1-2pass b/tests/ref/vsynth/vsynth_lena-ffv1-2pass new file mode 100644 index 0000000000..9ece86aaa3 --- /dev/null +++ b/tests/ref/vsynth/vsynth_lena-ffv1-2pass @@ -0,0 +1,4 @@ +2e1833cf75da113a6fabbaae07ddd455 *tests/data/fate/vsynth_lena-ffv1-2pass.avi +3490450 tests/data/fate/vsynth_lena-ffv1-2pass.avi +dde5895817ad9d219f79a52d0bdfb001 *tests/data/fate/vsynth_lena-ffv1-2pass.out.rawvideo +stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 7603200/ 7603200

1 0

fftools/ffmpeg: fix 2pass log file names
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri May 20 11:06:20 2022 +0200| [e53940186a08a6ea2dd06857965487ff07eb13d8] | committer: Anton Khirnov fftools/ffmpeg: fix 2pass log file names Use the global stream index rather than an unrelated variable in the filename. Broken in 6d5d9246042. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e53940186a08a6ea2… --- fftools/ffmpeg_opt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index a5cd989d35..2c1b3bd0dd 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1868,7 +1868,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in snprintf(logfilename, sizeof(logfilename), "%s-%d.log", ost->logfile_prefix ? ost->logfile_prefix : DEFAULT_PASS_LOGFILENAME_PREFIX, - i); + nb_output_streams - 1); if (!strcmp(ost->enc->name, "libx264")) { av_dict_set(&ost->encoder_opts, "stats", logfilename, AV_DICT_DONT_OVERWRITE); } else {

1 0

tests/fate-run: give consistent names to enc_dec() arguments
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Fri May 20 10:37:26 2022 +0200| [83560e48f6d184e3ca3a904b77e92c0c7316aee8] | committer: Anton Khirnov tests/fate-run: give consistent names to enc_dec() arguments enc_dec() performs two ffmpeg runs - the first one encoding a source file into a specified output format, the second one decoding previously encoded file. The arguments to this function currently have confusing names - e.g. dec_opt contains _output_ (i.e. encoding) options for the second (decoding) ffmpeg invocation. It is also possible to supply _input_ (i.e. decoding) options for the second ffmpeg run, but the argument is currently unnamed and referred to by number. Add an _in/_out suffix to argument names to make it clear what they are used for. Give a name to input options for the decoding ffmpeg run. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83560e48f6d184e3c… --- tests/fate-run.sh | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 7e3457b3ba..6501dea8f8 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -199,26 +199,27 @@ DEC_OPTS="-threads $threads -thread_type $thread_type -idct simple $FLAGS" ENC_OPTS="-threads 1 -idct simple -dct fastint" enc_dec(){ - src_fmt=$1 + enc_fmt_in=$1 srcfile=$2 - enc_fmt=$3 - enc_opt=$4 - dec_fmt=$5 - dec_opt=$6 + enc_fmt_out=$3 + enc_opt_out=$4 + dec_fmt_out=$5 + dec_opt_out=$6 + dec_opt_in=$7 ffprobe_opts=$8 - encfile="${outdir}/${test}.${enc_fmt}" - decfile="${outdir}/${test}.out.${dec_fmt}" + encfile="${outdir}/${test}.${enc_fmt_out}" + decfile="${outdir}/${test}.out.${dec_fmt_out}" cleanfiles="$cleanfiles $decfile" test "$keep" -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) tdecfile=$(target_path $decfile) - ffmpeg -auto_conversion_filters -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \ - -f $enc_fmt -y $tencfile || return + ffmpeg -auto_conversion_filters -f $enc_fmt_in $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt_out $FLAGS \ + -f $enc_fmt_out -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg -auto_conversion_filters $7 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ - -f $dec_fmt -y $tdecfile || return + ffmpeg -auto_conversion_filters $dec_opt_in $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt_out $FLAGS \ + -f $dec_fmt_out -y $tdecfile || return do_md5sum $decfile tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift test -z $ffprobe_opts || \

1 0

tests/fate/vcodec: drop unnecessary options
by Anton Khirnov 24 May '22

24 May '22

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu May 12 09:36:05 2022 +0200| [aa7d38f27caf9545118ad347e09876cc08dfd4e0] | committer: Anton Khirnov tests/fate/vcodec: drop unnecessary options jpeg2000 will be chosen by default, there is no reason to prescribe it explicitly. No other test does so. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aa7d38f27caf95451… --- tests/fate/vcodec.mak | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 3c9b7f1ff7..c19fb8633a 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: DEFAULT_SIZE = -s 352x288 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "$(DECINOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -218,9 +218,7 @@ fate-vsynth%-jpegls: DECOPTS = -sws_flags area FATE_VCODEC_SCALE-$(call ENCDEC, JPEG2000, AVI) += jpeg2000 jpeg2000-97 fate-vsynth%-jpeg2000: ENCOPTS = -qscale 7 -strict experimental -pred 1 -pix_fmt rgb24 -fate-vsynth%-jpeg2000: DECINOPTS = -c:v jpeg2000 fate-vsynth%-jpeg2000-97: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-jpeg2000-97: DECINOPTS = -c:v jpeg2000 FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1

1 0