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

avfilter/vf_guided: clean up commands support
by Paul B Mahol 02 May '22

02 May '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon May 2 23:19:16 2022 +0200| [e40cec0609f5323de8d85c1658b7339880ee232e] | committer: Paul B Mahol avfilter/vf_guided: clean up commands support Some options can not be changed at runtime. Remove pointless wrapper. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e40cec0609f5323de… --- libavfilter/vf_guided.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/libavfilter/vf_guided.c b/libavfilter/vf_guided.c index 7636cd2cdc..893a247ac4 100644 --- a/libavfilter/vf_guided.c +++ b/libavfilter/vf_guided.c @@ -63,19 +63,20 @@ typedef struct GuidedContext { } GuidedContext; #define OFFSET(x) offsetof(GuidedContext, x) -#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM +#define TFLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_RUNTIME_PARAM +#define FLAGS AV_OPT_FLAG_VIDEO_PARAM|AV_OPT_FLAG_FILTERING_PARAM static const AVOption guided_options[] = { - { "radius", "set the box radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64 = 3 }, 1, 20, FLAGS }, - { "eps", "set the regularization parameter (with square)", OFFSET(eps), AV_OPT_TYPE_FLOAT, {.dbl = 0.01 }, 0.0, 1, FLAGS }, - { "mode", "set filtering mode (0: basic mode; 1: fast mode)", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = BASIC}, BASIC, NB_MODES - 1, FLAGS, "mode" }, - { "basic", "basic guided filter", 0, AV_OPT_TYPE_CONST, {.i64 = BASIC}, 0, 0, FLAGS, "mode" }, - { "fast", "fast guided filter", 0, AV_OPT_TYPE_CONST, {.i64 = FAST }, 0, 0, FLAGS, "mode" }, - { "sub", "subsampling ratio for fast mode", OFFSET(sub), AV_OPT_TYPE_INT, {.i64 = 4 }, 2, 64, FLAGS }, - { "guidance", "set guidance mode (0: off mode; 1: on mode)", OFFSET(guidance), AV_OPT_TYPE_INT, {.i64 = OFF }, OFF, NB_GUIDANCE_MODES - 1, FLAGS, "guidance" }, - { "off", "only one input is enabled", 0, AV_OPT_TYPE_CONST, {.i64 = OFF }, 0, 0, FLAGS, "guidance" }, - { "on", "two inputs are required", 0, AV_OPT_TYPE_CONST, {.i64 = ON }, 0, 0, FLAGS, "guidance" }, - { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 0xF, FLAGS }, + { "radius", "set the box radius", OFFSET(radius), AV_OPT_TYPE_INT, {.i64 = 3 }, 1, 20, TFLAGS }, + { "eps", "set the regularization parameter (with square)", OFFSET(eps), AV_OPT_TYPE_FLOAT, {.dbl = 0.01 }, 0.0, 1, TFLAGS }, + { "mode", "set filtering mode (0: basic mode; 1: fast mode)", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = BASIC}, BASIC, NB_MODES - 1, TFLAGS, "mode" }, + { "basic", "basic guided filter", 0, AV_OPT_TYPE_CONST, {.i64 = BASIC}, 0, 0, TFLAGS, "mode" }, + { "fast", "fast guided filter", 0, AV_OPT_TYPE_CONST, {.i64 = FAST }, 0, 0, TFLAGS, "mode" }, + { "sub", "subsampling ratio for fast mode", OFFSET(sub), AV_OPT_TYPE_INT, {.i64 = 4 }, 2, 64, TFLAGS }, + { "guidance", "set guidance mode (0: off mode; 1: on mode)", OFFSET(guidance), AV_OPT_TYPE_INT, {.i64 = OFF }, OFF, NB_GUIDANCE_MODES - 1, FLAGS, "guidance" }, + { "off", "only one input is enabled", 0, AV_OPT_TYPE_CONST, {.i64 = OFF }, 0, 0, FLAGS, "guidance" }, + { "on", "two inputs are required", 0, AV_OPT_TYPE_CONST, {.i64 = ON }, 0, 0, FLAGS, "guidance" }, + { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 0xF, TFLAGS }, { NULL } }; @@ -455,21 +456,6 @@ static av_cold void uninit(AVFilterContext *ctx) return; } -static int process_command(AVFilterContext *ctx, - const char *cmd, - const char *arg, - char *res, - int res_len, - int flags) -{ - int ret = ff_filter_process_command(ctx, cmd, arg, res, res_len, flags); - - if (ret < 0) - return ret; - - return 0; -} - static const AVFilterPad guided_outputs[] = { { .name = "default", @@ -491,5 +477,5 @@ const AVFilter ff_vf_guided = { FILTER_PIXFMTS_ARRAY(pix_fmts), .flags = AVFILTER_FLAG_DYNAMIC_INPUTS | AVFILTER_FLAG_SLICE_THREADS | AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC, - .process_command = process_command, + .process_command = ff_filter_process_command, };

1 0

avcodec/pcm-blurayenc: fix flawed logic in previous change
by Paul B Mahol 02 May '22

02 May '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon May 2 19:35:35 2022 +0200| [a84b95dc08da1174b4477e6250077bf22bb543b0] | committer: Paul B Mahol avcodec/pcm-blurayenc: fix flawed logic in previous change > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a84b95dc08da1174b… --- libavcodec/pcm-blurayenc.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/pcm-blurayenc.c b/libavcodec/pcm-blurayenc.c index 62c5dacdec..a139b54fe0 100644 --- a/libavcodec/pcm-blurayenc.c +++ b/libavcodec/pcm-blurayenc.c @@ -38,11 +38,11 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx) switch (avctx->sample_fmt) { case AV_SAMPLE_FMT_S16: avctx->bits_per_coded_sample = 16; - frame_size = 120; + frame_size = 240; quant = 1; break; case AV_SAMPLE_FMT_S32: - frame_size = 180; + frame_size = 360; avctx->bits_per_coded_sample = 24; quant = 3; break; @@ -55,19 +55,15 @@ static av_cold int pcm_bluray_encode_init(AVCodecContext *avctx) freq = 1; break; case 96000: - frame_size *= 2; freq = 4; break; case 192000: - frame_size *= 4; freq = 5; break; default: return AVERROR_BUG; } - frame_size *= avctx->ch_layout.nb_channels; - switch (avctx->ch_layout.u.mask) { case AV_CH_LAYOUT_MONO: ch_layout = 1;

1 0

lavc/videotoolboxenc: Speed/Quality prioriry setting
by Simone Karin Lehmann 02 May '22

02 May '22

ffmpeg | branch: master | Simone Karin Lehmann <simone(a)lisanet.de> | Sun May 1 21:07:47 2022 +0200| [b67572c7c707d508b15ce0543519208cf5d1fcfb] | committer: Rick Kern lavc/videotoolboxenc: Speed/Quality prioriry setting Add options to h264, hevc and prores encoders to prioritize speed. Speeds up encoding by 50% - 70% Signed-off-by: Simone Karin Lehmann <simone(a)lisanet.de> Signed-off-by: Rick Kern <kernrj(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b67572c7c707d508b… --- libavcodec/videotoolboxenc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 270496b7a7..69d9fe75bf 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -100,6 +100,7 @@ static struct{ CFStringRef kVTCompressionPropertyKey_RealTime; CFStringRef kVTCompressionPropertyKey_TargetQualityForAlpha; + CFStringRef kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality; CFStringRef kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder; CFStringRef kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder; @@ -161,6 +162,8 @@ static void loadVTEncSymbols(){ GET_SYM(kVTCompressionPropertyKey_RealTime, "RealTime"); GET_SYM(kVTCompressionPropertyKey_TargetQualityForAlpha, "TargetQualityForAlpha"); + GET_SYM(kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality, + "PrioritizeEncodingSpeedOverQuality"); GET_SYM(kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder, "EnableHardwareAcceleratedVideoEncoder"); @@ -237,6 +240,7 @@ typedef struct VTEncContext { int allow_sw; int require_sw; double alpha_quality; + int prio_speed; bool flushing; int has_b_frames; @@ -1146,6 +1150,15 @@ static int vtenc_create_encoder(AVCodecContext *avctx, return AVERROR_EXTERNAL; } + if (vtctx->prio_speed >= 0) { + status = VTSessionSetProperty(vtctx->session, + compat_keys.kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality, + vtctx->prio_speed ? kCFBooleanTrue : kCFBooleanFalse); + if (status) { + av_log(avctx, AV_LOG_WARNING, "PrioritizeEncodingSpeedOverQuality property is not supported on this device. Ignoring.\n"); + } + } + if ((vtctx->codec_id == AV_CODEC_ID_H264 || vtctx->codec_id == AV_CODEC_ID_HEVC) && max_rate > 0) { bytes_per_second_value = max_rate >> 3; @@ -2682,7 +2695,9 @@ static const enum AVPixelFormat prores_pix_fmts[] = { { "frames_before", "Other frames will come before the frames in this session. This helps smooth concatenation issues.", \ OFFSET(frames_before), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ { "frames_after", "Other frames will come after the frames in this session. This helps smooth concatenation issues.", \ - OFFSET(frames_after), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + OFFSET(frames_after), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, \ + { "prio_speed", "prioritize encoding speed", OFFSET(prio_speed), AV_OPT_TYPE_BOOL, \ + { .i64 = -1 }, -1, 1, VE }, \ #define OFFSET(x) offsetof(VTEncContext, x) static const AVOption h264_options[] = {

1 0

movenc: add write_btrt option
by erankor 02 May '22

02 May '22

ffmpeg | branch: master | erankor <eran.kornblau(a)kaltura.com> | Thu Apr 7 11:33:56 2022 +0300| [4d52d8c9f6a7fb5c035aff8cfeb8774a1de1123c] | committer: Zhao Zhili movenc: add write_btrt option supports forcing or disabling the writing of the btrt atom. the default behavior is to write the atom only for mp4 mode. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d52d8c9f6a7fb5c0… --- libavformat/movenc.c | 16 +++++++++++----- libavformat/movenc.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index d2cd5bc6f4..c2aed6329f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -109,6 +109,7 @@ static const AVOption options[] = { { "encryption_key", "The media encryption key (hex)", offsetof(MOVMuxContext, encryption_key), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "encryption_kid", "The media encryption key identifier (hex)", offsetof(MOVMuxContext, encryption_kid), AV_OPT_TYPE_BINARY, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "use_stream_ids_as_track_ids", "use stream ids as track ids", offsetof(MOVMuxContext, use_stream_ids_as_track_ids), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_ENCODING_PARAM}, + { "write_btrt", "force or disable writing btrt", offsetof(MOVMuxContext, write_btrt), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, { "write_tmcd", "force or disable writing tmcd", offsetof(MOVMuxContext, write_tmcd), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, { "write_prft", "Write producer reference time box with specified time source", offsetof(MOVMuxContext, write_prft), AV_OPT_TYPE_INT, {.i64 = MOV_PRFT_NONE}, 0, MOV_PRFT_NB-1, AV_OPT_FLAG_ENCODING_PARAM, "prft"}, { "wallclock", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = MOV_PRFT_SRC_WALLCLOCK}, 0, 0, AV_OPT_FLAG_ENCODING_PARAM, "prft"}, @@ -1308,7 +1309,7 @@ static int mov_write_audio_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex return ret; } - if (track->mode == MODE_MP4 && + if (mov->write_btrt && ((ret = mov_write_btrt_tag(pb, track)) < 0)) return ret; @@ -1809,8 +1810,9 @@ static int mov_write_fiel_tag(AVIOContext *pb, MOVTrack *track, int field_order) return 10; } -static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track) +static int mov_write_subtitle_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { + MOVMuxContext *mov = s->priv_data; int ret = AVERROR_BUG; int64_t pos = avio_tell(pb); avio_wb32(pb, 0); /* size */ @@ -1846,7 +1848,7 @@ static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track) } else if (track->par->extradata_size) avio_write(pb, track->par->extradata, track->par->extradata_size); - if (track->mode == MODE_MP4 && + if (mov->write_btrt && ((ret = mov_write_btrt_tag(pb, track)) < 0)) return ret; @@ -2313,7 +2315,7 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex ff_mov_cenc_write_sinf_tag(track, pb, mov->encryption_kid); } - if (track->mode == MODE_MP4 && + if (mov->write_btrt && ((ret = mov_write_btrt_tag(pb, track)) < 0)) return ret; @@ -2438,7 +2440,7 @@ static int mov_write_stsd_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContext else if (track->par->codec_type == AVMEDIA_TYPE_AUDIO) ret = mov_write_audio_tag(s, pb, mov, track); else if (track->par->codec_type == AVMEDIA_TYPE_SUBTITLE) - ret = mov_write_subtitle_tag(pb, track); + ret = mov_write_subtitle_tag(s, pb, track); else if (track->par->codec_tag == MKTAG('r','t','p',' ')) ret = mov_write_rtp_tag(pb, track); else if (track->par->codec_tag == MKTAG('t','m','c','d')) @@ -6677,6 +6679,10 @@ static int mov_init(AVFormatContext *s) mov->nb_streams++; } + if (mov->write_btrt < 0) { + mov->write_btrt = mov->mode == MODE_MP4; + } + if ( mov->write_tmcd == -1 && (mov->mode == MODE_MOV || mov->mode == MODE_MP4) || mov->write_tmcd == 1) { AVDictionaryEntry *global_tcr = av_dict_get(s->metadata, "timecode", diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 67d6d4fb66..ca507e0e04 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -239,6 +239,7 @@ typedef struct MOVMuxContext { int use_stream_ids_as_track_ids; int track_ids_ok; + int write_btrt; int write_tmcd; MOVPrftBox write_prft; int empty_hdlr_name;

1 0

doc/examples/transcode_aac: Bump date
by Andreas Unterweger 02 May '22

02 May '22

ffmpeg | branch: master | Andreas Unterweger <dustsigns(a)gmail.com> | Thu Apr 28 15:07:32 2022 +0200| [40f2ea971fb881ef0cfbd8915ccd62b91bce23c4] | committer: Gyan Doshi doc/examples/transcode_aac: Bump date Signed-off-by: Andreas Unterweger <dustsigns(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=40f2ea971fb881ef0… --- doc/examples/transcode_aac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 5982891661..2d4f9a59d3 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2018 Andreas Unterweger + * Copyright (c) 2013-2022 Andreas Unterweger * * This file is part of FFmpeg. *

1 0

doc/examples/transcode_aac: AAC encoder is no longer experimental
by Andreas Unterweger 02 May '22

02 May '22

ffmpeg | branch: master | Andreas Unterweger <dustsigns(a)gmail.com> | Thu Apr 28 15:07:16 2022 +0200| [04642de4b48862fe021d416ced93db3233adfa0a] | committer: Gyan Doshi doc/examples/transcode_aac: AAC encoder is no longer experimental Signed-off-by: Andreas Unterweger <dustsigns(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04642de4b48862fe0… --- doc/examples/transcode_aac.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index b18ba7e75d..5982891661 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -211,9 +211,6 @@ static int open_output_file(const char *filename, avctx->sample_fmt = output_codec->sample_fmts[0]; avctx->bit_rate = OUTPUT_BIT_RATE; - /* Allow the use of the experimental AAC encoder. */ - avctx->strict_std_compliance = FF_COMPLIANCE_EXPERIMENTAL; - /* Set the sample rate for the container. */ stream->time_base.den = input_codec_context->sample_rate; stream->time_base.num = 1;

1 0

doc/examples/transcode_aac: Set decoder packet timebase
by Andreas Unterweger 02 May '22

02 May '22

ffmpeg | branch: master | Andreas Unterweger <dustsigns(a)gmail.com> | Thu Apr 28 15:06:53 2022 +0200| [3c7382e36876dd82b4ca83fc6c60fd9f2ecd3e98] | committer: Gyan Doshi doc/examples/transcode_aac: Set decoder packet timebase Previously, the default timebase caused two warnings during decoding about not being able to update timestamps for skipped and discarded samples, respectively. Signed-off-by: Andreas Unterweger <dustsigns(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c7382e36876dd82b… --- doc/examples/transcode_aac.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index d608847f18..b18ba7e75d 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -62,6 +62,7 @@ static int open_input_file(const char *filename, { AVCodecContext *avctx; const AVCodec *input_codec; + const AVStream *stream; int error; /* Open the input file to read from it. */ @@ -89,8 +90,10 @@ static int open_input_file(const char *filename, return AVERROR_EXIT; } + stream = (*input_format_context)->streams[0]; + /* Find a decoder for the audio stream. */ - if (!(input_codec = avcodec_find_decoder((*input_format_context)->streams[0]->codecpar->codec_id))) { + if (!(input_codec = avcodec_find_decoder(stream->codecpar->codec_id))) { fprintf(stderr, "Could not find input codec\n"); avformat_close_input(input_format_context); return AVERROR_EXIT; @@ -105,7 +108,7 @@ static int open_input_file(const char *filename, } /* Initialize the stream parameters with demuxer information. */ - error = avcodec_parameters_to_context(avctx, (*input_format_context)->streams[0]->codecpar); + error = avcodec_parameters_to_context(avctx, stream->codecpar); if (error < 0) { avformat_close_input(input_format_context); avcodec_free_context(&avctx); @@ -121,6 +124,9 @@ static int open_input_file(const char *filename, return error; } + /* Set the packet timebase for the decoder. */ + avctx->pkt_timebase = stream->time_base; + /* Save the decoder context for easier access later. */ *input_codec_context = avctx;

1 0

doc/examples/transcode_aac: Don't ignore last encoded frame
by Andreas Unterweger 02 May '22

02 May '22

ffmpeg | branch: master | Andreas Unterweger <dustsigns(a)gmail.com> | Wed Feb 23 14:08:13 2022 +0100| [e13429c9c4a3e9fb614379a0afb2d8439870755a] | committer: Gyan Doshi doc/examples/transcode_aac: Don't ignore last encoded frame The last encoded frame is now fetched on EOF. It was previously left in the encoder and caused a "1 frame left in queue" warning. Signed-off-by: Andreas Unterweger <dustsigns(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e13429c9c4a3e9fb6… --- doc/examples/transcode_aac.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/examples/transcode_aac.c b/doc/examples/transcode_aac.c index 9102e55f16..d608847f18 100644 --- a/doc/examples/transcode_aac.c +++ b/doc/examples/transcode_aac.c @@ -377,6 +377,8 @@ static int decode_audio_frame(AVFrame *frame, if (error < 0) return error; + *data_present = 0; + *finished = 0; /* Read one audio frame from the input file into a temporary packet. */ if ((error = av_read_frame(input_format_context, input_packet)) < 0) { /* If we are at the end of the file, flush the decoder below. */ @@ -555,7 +557,7 @@ static int read_decode_convert_and_store(AVAudioFifo *fifo, AVFrame *input_frame = NULL; /* Temporary storage for the converted input samples. */ uint8_t **converted_input_samples = NULL; - int data_present = 0; + int data_present; int ret = AVERROR_EXIT; /* Initialize temporary storage for one input frame. */ @@ -676,17 +678,16 @@ static int encode_audio_frame(AVFrame *frame, pts += frame->nb_samples; } + *data_present = 0; /* Send the audio frame stored in the temporary packet to the encoder. * The output audio stream encoder is used to do this. */ error = avcodec_send_frame(output_codec_context, frame); - /* The encoder signals that it has nothing more to encode. */ - if (error == AVERROR_EOF) { - error = 0; - goto cleanup; - } else if (error < 0) { - fprintf(stderr, "Could not send packet for encoding (error '%s')\n", - av_err2str(error)); - goto cleanup; + /* Check for errors, but proceed with fetching encoded samples if the + * encoder signals that it has nothing more to encode. */ + if (error < 0 && error != AVERROR_EOF) { + fprintf(stderr, "Could not send packet for encoding (error '%s')\n", + av_err2str(error)); + goto cleanup; } /* Receive one encoded frame from the encoder. */ @@ -857,7 +858,6 @@ int main(int argc, char **argv) int data_written; /* Flush the encoder as it may have delayed frames. */ do { - data_written = 0; if (encode_audio_frame(NULL, output_format_context, output_codec_context, &data_written)) goto cleanup;

1 0

avfilter/vf_overlay: improve premultiplied alpha overlay for YUV
by Paul B Mahol 01 May '22

01 May '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun May 1 19:57:44 2022 +0200| [bdf01a9609e49ff602b38826420252356d98ba2a] | committer: Paul B Mahol avfilter/vf_overlay: improve premultiplied alpha overlay for YUV > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdf01a9609e49ff60… --- libavfilter/vf_overlay.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c index 685b6069a6..f560d54dae 100644 --- a/libavfilter/vf_overlay.c +++ b/libavfilter/vf_overlay.c @@ -538,12 +538,13 @@ static av_always_inline void blend_plane_##depth##_##nbits##bits(AVFilterContext if (i && yuv) \ *d = av_clip((*d * (max - alpha) + *s * alpha) / max + *s - mid, -mid, mid) + mid; \ else \ - *d = FFMIN((*d * (max - alpha) + *s * alpha) / max + *s, max); \ + *d = av_clip_uintp2((*d * (max - alpha) + *s * alpha) / max + *s - (16<<(nbits-8)),\ + nbits);\ } else { \ if (i && yuv) \ *d = av_clip(FAST_DIV255((*d - mid) * (max - alpha)) + *s - mid, -mid, mid) + mid; \ else \ - *d = FFMIN(FAST_DIV255(*d * (max - alpha)) + *s, max); \ + *d = av_clip_uint8(FAST_DIV255(*d * (255 - alpha)) + *s - 16); \ } \ } \ s++; \

1 0

avcodec/x86/hevc_mc: Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl
by Felix LeClair 01 May '22

01 May '22

ffmpeg | branch: master | Felix LeClair <felix.leclair123(a)hotmail.com> | Thu Apr 28 13:17:22 2022 -0400| [987d2c1083d9bc9464000c8732c3353c7bf7e9ca] | committer: Marton Balint avcodec/x86/hevc_mc: Fix AVX-512-VNNI_hevc_qpel_filters_avx512icl Issue: On extremely new hardware using either IceLake or super sets of Intel IceLakes avx512 instructions, commit d4cd8830bdac3e26c8e75cd92e574c159fecc4f7 causes build issues. Specifically a NASM macro expansion of qpel_filter_v is never properly defined/initialized. The issue is the definition was erroneously placed inside a conditional which will not trigger unless the original definition failed (has to do with if PIC is defined, becomes a bit of a catch 22) Specifically the error is X86ASM libavcodec/x86/hevc_mc.o libavcodec/x86/hevc_mc.asm:1854: error: symbol `..(a)88472.table' not defined libavcodec/x86/hevc_mc.asm:1806: ... from macro `HEVC_PUT_HEVC_QPEL_HV_AVX512ICL' defined here libavcodec/x86/hevc_mc.asm:1730: ... from macro `QPEL_FILTER_V' defined here ... repeats a few times... ... make: *** [ffbuild/common.mak:100: libavcodec/x86/hevc_mc.o] Error 1 ``` Specific error was discussed by kurosu and myself (fclc) on the ffmpeg-devel irc. This commit fixes the above by swapping lines 1796 and 1795, moving the define out of the conditional Side note: It seems fate didn't pick up on this, may merit looking into (as mentioned by nevcairiel). Reviewed-by: Wu Jianhua <toqsxw(a)outlook.com> Signed-off-by: Felix LeClair (FCLC) <felix.leclair123(a)hotmail.com> Signed-off-by: Marton Balint <cus(a)passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=987d2c1083d9bc946… --- libavcodec/x86/hevc_mc.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/hevc_mc.asm b/libavcodec/x86/hevc_mc.asm index c07948dd9b..e159adccc7 100644 --- a/libavcodec/x86/hevc_mc.asm +++ b/libavcodec/x86/hevc_mc.asm @@ -1792,8 +1792,8 @@ cglobal hevc_put_hevc_qpel_hv%1_%2, 6, 7, 27, dst, src, srcstride, height, mx, m sub srcq, tmpq sub myq, 1 shl myq, 5 -%ifdef PIC %define %%table hevc_qpel_filters_avx512icl_v_%1 +%ifdef PIC lea tmpq, [%%table] %define FILTER tmpq %else

1 0