From: "Carotti, Elias" <eliascrt@amazon.it> To: "ffmpeg-devel@ffmpeg.org" <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH] Optimization: support for libx264's mb_info Date: Fri, 19 May 2023 10:19:03 +0000 Message-ID: <8eb9290f3c9cdae75b38c45a5d49ee624951a849.camel@amazon.it> (raw) [-- Attachment #1: Type: text/plain, Size: 915 bytes --] Hi again, I am sending this patch again (I had missed a check for NULL), could somebody please have a look at it? It is mainly an optimization when the encoder knows in advance that only portions of the whole frame changed and which areas actually did. The patch allows a user to pass down information to libx264 information about which parts of a frame changed (with respect to the preceding one) to be exploited as a hint for P_SKIP-ing macroblocks which didn't change. This information is encoded in the mb_info field of the x264_param_t much like the quant_offsets which are already used for the AV_FRAME_DATA_REGIONS_OF_INTEREST side information. Best, Elias NICE SRL, viale Monte Grappa 3/5, 20124 Milano, Italia, Registro delle Imprese di Milano Monza Brianza Lodi REA n. 2096882, Capitale Sociale: 10.329,14 EUR i.v., Cod. Fisc. e P.IVA 01133050052, Societa con Socio Unico [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: 0001-Add-support-for-x264-s-MB_INFO.patch --] [-- Type: text/x-patch; name="0001-Add-support-for-x264-s-MB_INFO.patch", Size: 10851 bytes --] diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index cfdd422236..55c64daafa 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -30,6 +30,7 @@ #include "libavutil/stereo3d.h" #include "libavutil/time.h" #include "libavutil/intreadwrite.h" +#include "libavutil/mb_info.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" @@ -48,6 +49,9 @@ // from x264.h, for quant_offsets, Macroblocks are 16x16 // blocks of pixels (with respect to the luma plane) #define MB_SIZE 16 +#define MB_LSIZE 4 +#define MB_FLOOR(x) ((x) >> (MB_LSIZE)) +#define MB_CEIL(x) MB_FLOOR((x) + (MB_SIZE - 1)) typedef struct X264Opaque { #if FF_API_REORDERED_OPAQUE @@ -123,6 +127,8 @@ typedef struct X264Context { * encounter a frame with ROI side data. */ int roi_warned; + + int mb_info; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -295,6 +301,7 @@ static void free_picture(x264_picture_t *pic) av_free(pic->extra_sei.payloads[i].payload); av_freep(&pic->extra_sei.payloads); av_freep(&pic->prop.quant_offsets); + av_freep(&pic->prop.mb_info); pic->extra_sei.num_payloads = 0; } @@ -320,6 +327,45 @@ static enum AVPixelFormat csp_to_pixfmt(int csp) return AV_PIX_FMT_NONE; } +static int setup_mb_info(AVCodecContext *ctx, x264_picture_t *pic, + const AVFrame *frame, const uint8_t *data, + size_t size) +{ + int mb_width = (frame->width + MB_SIZE - 1) / MB_SIZE; + int mb_height = (frame->height + MB_SIZE - 1) / MB_SIZE; + const AVMBInfoRect *mbinfo_rects; + size_t mbinfo_count; + uint8_t *mbinfo; + + mbinfo_rects = (const AVMBInfoRect *)data; + mbinfo_count = size / sizeof(AVMBInfoRect); + + mbinfo = av_calloc(mb_width * mb_height, sizeof(*mbinfo)); + if (!mbinfo) + return AVERROR(ENOMEM); + + /* Sets the default as constant, i.e. P_SKIP-able, then selectively resets the flag */ + memset(mbinfo, X264_MBINFO_CONSTANT, sizeof(*mbinfo) * mb_width * mb_height); + + for (int i = 0; i < mbinfo_count; i++) { + int min_y = MB_FLOOR(mbinfo_rects->y); + int max_y = MB_CEIL(mbinfo_rects->y + mbinfo_rects->height); + int min_x = MB_FLOOR(mbinfo_rects->x); + int max_x = MB_CEIL(mbinfo_rects->x + mbinfo_rects->width); + + for (int mb_y = min_y; mb_y < max_y; ++mb_y) { + memset(mbinfo + mb_y * mb_width + min_x, 0, max_x - min_x); + } + + mbinfo_rects++; + } + + pic->prop.mb_info = mbinfo; + pic->prop.mb_info_free = av_free; + + return 0; +} + static int setup_roi(AVCodecContext *ctx, x264_picture_t *pic, int bit_depth, const AVFrame *frame, const uint8_t *data, size_t size) { @@ -404,6 +450,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, int64_t wallclock = 0; int bit_depth, ret; AVFrameSideData *sd; + AVFrameSideData *mbinfo_sd; *ppic = NULL; if (!frame) @@ -499,6 +546,17 @@ FF_ENABLE_DEPRECATION_WARNINGS goto fail; } + mbinfo_sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MB_INFO); + if (mbinfo_sd) { + int ret = setup_mb_info(ctx, pic, frame, mbinfo_sd->data, mbinfo_sd->size); + if (ret < 0) { + /* No need to fail here, this is not fatal. We just proceed with no + * mb_info and log a message */ + + av_log(ctx, AV_LOG_WARNING, "mb_info setup failure\n"); + } + } + if (x4->udu_sei) { for (int j = 0; j < frame->nb_side_data; j++) { AVFrameSideData *side_data = frame->side_data[j]; @@ -1096,6 +1154,9 @@ static av_cold int X264_init(AVCodecContext *avctx) } } + x4->params.analyse.b_mb_info = x4->mb_info; + x4->params.analyse.b_fast_pskip = 1; + // update AVCodecContext with x264 parameters avctx->has_b_frames = x4->params.i_bframe ? x4->params.i_bframe_pyramid ? 2 : 1 : 0; @@ -1305,6 +1366,7 @@ static const AVOption options[] = { { "noise_reduction", "Noise reduction", OFFSET(noise_reduction), AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX, VE }, { "udu_sei", "Use user data unregistered SEI if available", OFFSET(udu_sei), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "x264-params", "Override the x264 configuration using a :-separated list of key=value parameters", OFFSET(x264_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { "mb_info", "Set mb_info data through AVSideData, only useful when used from the API", OFFSET(mb_info), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL }, }; diff --git a/libavutil/Makefile b/libavutil/Makefile index dc9012f9a8..e99f448213 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -91,6 +91,7 @@ HEADERS = adler32.h \ tea.h \ tx.h \ film_grain_params.h \ + mb_info.h \ ARCH_HEADERS = bswap.h \ intmath.h \ @@ -196,6 +197,7 @@ OBJS-$(CONFIG_VAAPI) += hwcontext_vaapi.o OBJS-$(CONFIG_VIDEOTOOLBOX) += hwcontext_videotoolbox.o OBJS-$(CONFIG_VDPAU) += hwcontext_vdpau.o OBJS-$(CONFIG_VULKAN) += hwcontext_vulkan.o +OBJS-$(CONFIG_LIBX264) += mb_info.o OBJS-$(!CONFIG_VULKAN) += hwcontext_stub.o @@ -219,6 +221,8 @@ SKIPHEADERS-$(CONFIG_VULKAN) += hwcontext_vulkan.h vulkan.h \ vulkan_functions.h \ vulkan_loader.h +SKIPHEADERS-$(CONFIG_LIBX264) += mb_info.h + TESTPROGS = adler32 \ aes \ aes_ctr \ diff --git a/libavutil/frame.h b/libavutil/frame.h index f85d630c5c..9c0fdcf25d 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -214,6 +214,16 @@ enum AVFrameSideDataType { * Ambient viewing environment metadata, as defined by H.274. */ AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT, + + /** + * Provide macro block encoder-specific hinting information for the encoder + * processing. It can be used to pass information about which macroblock + * can be skipped because it hasn't changed from the corresponding one in + * the previous frame. This is useful for applications which know in + * advance this information to speed up real-time encoding. Currently only + * used by libx264. + */ + AV_FRAME_DATA_MB_INFO, }; enum AVActiveFormatDescription { diff --git a/libavutil/mb_info.c b/libavutil/mb_info.c new file mode 100644 index 0000000000..1e4a57b8d4 --- /dev/null +++ b/libavutil/mb_info.c @@ -0,0 +1,51 @@ +/* + * Copyright 2023 Elias Carotti <eliascrt at amazon dot com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <string.h> + +#include "avstring.h" +#include "frame.h" +#include "macros.h" +#include "mem.h" +#include "mb_info.h" + + +AVMBInfoRect *av_mb_info_create_side_data(AVFrame *frame, + AVMBInfoRect *rects, + size_t num_rects) +{ + AVFrameSideData *side_data; + AVMBInfoRect *par; + + side_data = av_frame_new_side_data(frame, + AV_FRAME_DATA_MB_INFO, + num_rects * sizeof(AVMBInfoRect)); + + if (!side_data) + return NULL; + + par = (AVMBInfoRect *)side_data->data; + + /* Just copies the rects over the newly allocated buffer */ + memcpy(par, rects, sizeof(AVMBInfoRect) * num_rects); + + return par; +} + diff --git a/libavutil/mb_info.h b/libavutil/mb_info.h new file mode 100644 index 0000000000..918cf167aa --- /dev/null +++ b/libavutil/mb_info.h @@ -0,0 +1,46 @@ +/** + * Copyright 2023 Elias Carotti <eliascrt at amazon dot com> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVUTIL_MB_INFO_H +#define AVUTIL_MB_INFO_H + +#include <stddef.h> +#include <stdint.h> +#include "libavutil/avassert.h" +#include "libavutil/frame.h" + +typedef struct _AVMBInfoRect { + uint32_t x, y; + uint32_t width, height; +} AVMBInfoRect; + +/** + * Allocate memory for a vector of AVMBInfoRect in the given AVFrame + * {@code frame} as AVFrameSideData of type AV_FRAME_DATA_MB_INFO. + * The side data contains a list of rectangles for the portions of the frame + * which changed from the last encoded one. The rest will be hinted to be + * P_SKIP-ped. Portions of the rects which are not on macroblock boundaries + * are not handled as P_SKIPS. + */ +AVMBInfoRect *av_mb_info_create_side_data(AVFrame *frame, + AVMBInfoRect *rects, + size_t num_rects); + +#endif /* AVUTIL_MB_INFO_H */ [-- Attachment #3: Type: text/plain, Size: 251 bytes --] _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next reply other threads:[~2023-05-19 10:19 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-05-19 10:19 Carotti, Elias [this message] 2023-05-21 23:17 ` Stefano Sabatini 2023-05-22 9:19 ` Carotti, Elias 2023-05-29 17:56 ` Carotti, Elias 2023-06-04 15:29 ` Stefano Sabatini 2023-06-05 15:32 ` Carotti, Elias 2023-06-11 17:15 ` Stefano Sabatini 2023-06-12 8:23 ` Kieran Kunhya 2023-06-12 17:38 ` Carotti, Elias 2023-06-18 10:04 ` Stefano Sabatini 2023-06-12 17:28 ` Carotti, Elias 2023-06-18 10:18 ` Stefano Sabatini 2023-06-21 15:53 ` Carotti, Elias 2023-06-22 8:44 ` Anton Khirnov 2023-06-22 17:23 ` Carotti, Elias 2023-06-24 11:01 ` Anton Khirnov 2023-06-26 9:50 ` Carotti, Elias 2023-06-28 12:55 ` Anton Khirnov 2023-06-30 17:40 ` Carotti, Elias 2023-07-01 8:33 ` Anton Khirnov 2023-07-03 15:51 ` Carotti, Elias 2023-07-07 16:27 ` Carotti, Elias 2023-07-09 11:05 ` [FFmpeg-devel] [PATCH] lavu: add AVVideoHint API Anton Khirnov 2023-07-09 13:10 ` Lynne 2023-07-10 8:13 ` Carotti, Elias 2023-07-10 12:51 ` Carotti, Elias 2023-07-17 22:19 ` Stefano Sabatini 2023-07-23 23:27 ` Stefano Sabatini 2023-07-26 10:52 ` Carotti, Elias 2023-07-28 7:44 ` Stefano Sabatini 2023-08-02 5:36 ` Stefano Sabatini 2023-08-08 8:16 ` Stefano Sabatini 2023-07-10 8:09 ` Carotti, Elias
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=8eb9290f3c9cdae75b38c45a5d49ee624951a849.camel@amazon.it \ --to=eliascrt@amazon.it \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git