From patchwork Fri Aug 23 18:39:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Juan=20De=20Le=C3=B3n?= X-Patchwork-Id: 14681 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7471E448736 for ; Fri, 23 Aug 2019 21:41:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 488CD68A8FD; Fri, 23 Aug 2019 21:41:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 766AA689B32 for ; Fri, 23 Aug 2019 21:41:14 +0300 (EEST) Received: by mail-qk1-f202.google.com with SMTP id j81so9793505qke.23 for ; Fri, 23 Aug 2019 11:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=EXVMDItADjdYYniKnOgbGQol8fV9WiJy1d+2z52MBo0=; b=jU+5qOfBxGT6VPOwgdwl5MRAtboRcLHlj9He3VCHfOgg2MWV+0FvkSmqZB+Jg/uoY5 BtWgYmnH0qktJ68yTHhRSJSfG8FAsNVd8ztAf3C0U8SM/SmNRvTSQHsh2fh4C4a+JWvT xvxlKjoQIXJBNSDE0pRUoP3Wz/vVly24oNVU62v+pt8lx0y5bzQn9XI9/f7+LxltRehe iFnglr1ALcDTV70LUaIcClq0c2K5j3L9dx7QPvGREIxE9zISkXByS6dHj9NfFfydXUhW 4cPwII75C13csSN2mCNMpCTdjN8f5yE6DVVXwh3+rzS6cMBD6vm2x6TO0CC17anxudQz 9YFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=EXVMDItADjdYYniKnOgbGQol8fV9WiJy1d+2z52MBo0=; b=ATiIe5w2e9BncJb7allfJuO4vGVBg6rcbupaiX8/eO+KlxjhiWMkjR2DA0QudEMmv+ v76Im7kkwujtPpcEPeiFxa95iiMWYsA4yfWs+nKudkRZJc8kNfWiZ5dhVfIqzeBbvRJv QxGZTRUZUa/O1W+P0jPt3ACEJsQkohZNOZmD/haogiSCw8rjOJW0hj1RYUNMV90SGNLC 7ZGtOXPjUIr505QlQ6JWcNAsT2AkQNkHugnVWSnzanYs8bSCZOFu1K0kvC9hDmAeyR81 mfJZLX8ZzgY/sWjdedenGVTqWuqvD8L3crGQCMMQD4fnQlIdOIMfkr5uml+B4yIa2DAT 3sqg== X-Gm-Message-State: APjAAAUSgZZxVQiLI5XLgmspqbNBrK8Mhl3Ac+0hbBFRFHgy5PW08yTU V8ottx2+Ifld/OZyFOmkYW4drTm+4ulU22N2RzqCUVHWOMXo89LSxCw7Z160+fIvv4dj9O19u9E ZuvDz+anbiNzKLsPAL8tyvo1qo6ET+N21YR5rJv9QDUrgSFY2RW+5drJmjWnWgHg= X-Google-Smtp-Source: APXvYqycHSU/KW2OUM+eRiTFmCd8trkAScknsS3qKtClc8mqbU+69mp5B7Fjovz5ckLsSXCj/47qGK3j8+w= X-Received: by 2002:a37:e409:: with SMTP id y9mr5517644qkf.423.1566585672863; Fri, 23 Aug 2019 11:41:12 -0700 (PDT) Date: Fri, 23 Aug 2019 11:39:01 -0700 In-Reply-To: <20190823150724.t6a4ox4leokbeffc@phare.normalesup.org> Message-Id: <20190823183859.227439-1-juandl@google.com> Mime-Version: 1.0 References: <20190823150724.t6a4ox4leokbeffc@phare.normalesup.org> X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog From: "=?UTF-8?q?Juan=20De=20Le=C3=B3n?=" To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 1/3] libavutil: AVEncodeInfo data structures X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: =?UTF-8?q?Juan=20De=20Le=C3=B3n?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" AVEncodeInfoFrame data structure to store as AVFrameSideData of type AV_FRAME_DATA_ENCODE_INFO. The structure stores quantization index for each plane, DC/AC deltas for luma and chroma planes, and an array of AVEncodeInfoBlock type denoting position, size, and delta quantizer for each block in the frame. Can be extended to support extraction of other block information. Signed-off-by: Juan De León --- libavutil/Makefile | 2 + libavutil/encode_info.c | 74 +++++++++++++++++++++++++++ libavutil/encode_info.h | 110 ++++++++++++++++++++++++++++++++++++++++ libavutil/frame.c | 1 + libavutil/frame.h | 7 +++ 5 files changed, 194 insertions(+) create mode 100644 libavutil/encode_info.c create mode 100644 libavutil/encode_info.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 57e6e3d7e8..37cfb099e9 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -24,6 +24,7 @@ HEADERS = adler32.h \ dict.h \ display.h \ downmix_info.h \ + encode_info.h \ encryption_info.h \ error.h \ eval.h \ @@ -111,6 +112,7 @@ OBJS = adler32.o \ dict.o \ display.o \ downmix_info.o \ + encode_info.o \ encryption_info.o \ error.o \ eval.o \ diff --git a/libavutil/encode_info.c b/libavutil/encode_info.c new file mode 100644 index 0000000000..0614745948 --- /dev/null +++ b/libavutil/encode_info.c @@ -0,0 +1,74 @@ +/* + * 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 + +#include "libavutil/encode_info.h" +#include "libavutil/mem.h" + + +/** + * Get the size to allocate of AVEncodeInfoFrame and the array of AVEncodeInfoBlock. + * Return SIZE_MAX insted of 0 to make av_malloc() return NULL. + */ +static inline get_encode_info_size (unsigned nb_blocks) +{ + if (nb_blocks > (SIZE_MAX - sizeof(AVEncodeInfoFrame)) / sizeof(AVEncodeInfoBlock) + 1) + return SIZE_MAX; + //AVEncodeInfoFrame already allocates size for one element of AVEncodeInfoBlock + return sizeof(AVEncodeInfoFrame) - sizeof(AVEncodeInfoBlock) + + FFMAX(1, nb_blocks) * sizeof(AVEncodeInfoBlock); +} + +static int init_encode_info_data(AVEncodeInfoFrame *info, unsigned nb_blocks) +{ + info->nb_blocks = nb_blocks; + info->block_size = sizeof(AVEncodeInfoBlock); + info->blocks_offset = offsetof(AVEncodeInfoFrame, blocks); + + for(int i = 0; i < AV_NUM_DATA_POINTERS; i++) + info->plane_q[i] = -1; + + return 0; +} + +AVEncodeInfoFrame *av_encode_info_alloc(unsigned nb_blocks) +{ + size_t size = get_encode_info_size(nb_blocks); + AVEncodeInfoFrame *ptr = av_mallocz(size); + if (!ptr) + return NULL; + + init_encode_info_data(ptr, nb_blocks); + + return ptr; +} + +AVEncodeInfoFrame *av_encode_info_create_side_data(AVFrame *frame, unsigned nb_blocks) +{ + size_t size = get_encode_info_size(nb_blocks); + AVFrameSideData *sd = av_frame_new_side_data(frame, + AV_FRAME_DATA_ENCODE_INFO, + size); + if (!sd) + return NULL; + + memset(sd->data, 0, size); + init_encode_info_data((AVEncodeInfoFrame*)sd->data, nb_blocks); + + return (AVEncodeInfoFrame*)sd->data; +} diff --git a/libavutil/encode_info.h b/libavutil/encode_info.h new file mode 100644 index 0000000000..8afe0c9c9e --- /dev/null +++ b/libavutil/encode_info.h @@ -0,0 +1,110 @@ +/* + * 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_ENCODE_INFO_H +#define AVUTIL_ENCODE_INFO_H + +#include "libavutil/avassert.h" +#include "libavutil/frame.h" + +/** + * Data structure for extracting block data, stored as an array in AVEncodeInfoFrame. + */ +typedef struct AVEncodeInfoBlock{ + /** + * Distance in luma pixels from the top-left corner of the visible frame + * to the top-left corner of the block. + * Can be negative if top/right padding is present on the coded frame. + */ + int src_x, src_y; + /** + * Width and height of the block in luma pixels. + */ + int w, h; + /** + * Delta quantization index for the block with respect to the frame. + */ + int delta_q; +} AVEncodeInfoBlock; + +/** + * Frame encoding info, used as AVFrameSideData. Data in this structure concerns + * the whole frame. + * Additional entries may be added without bumping major before nb_blocks, + * so using the accessor function av_encode_info_get_block() is recommended. + */ +typedef struct AVEncodeInfoFrame { + /** + * Base plane quantizer for the frame, set to -1 when value is unsupported. + */ + int plane_q[AV_NUM_DATA_POINTERS]; + /** + * DC/AC quantizer index delta, set to -1 when value is value unsupported. + */ + int ac_q, dc_q; + /** + * DC/AC chroma quantizer index delta, set to -1 when value is value unsupported. + */ + int ac_chroma_q, dc_chroma_q; + /** + * Number of blocks in the array, may be 0. + */ + unsigned nb_blocks; + /** + * Offset in this structure at which blocks begin in bytes. May not match + * offsetof(AVEncodeInfoFrame, blocks). + */ + size_t blocks_offset; + /* + * Size of each block in bytes. May not match sizeof(AVEncodeInfoBlock). + */ + size_t block_size; + + /* + * Array of blocks, with a total size of block_size*nb_blocks, the [1] + * is meant for compatibility with C++. + */ + AVEncodeInfoBlock blocks[1]; +} AVEncodeInfoFrame; + +/* + * Gets the block at the specified {@code idx}. Must be between 0 and nb_blocks. + */ +static inline AVEncodeInfoBlock *av_encode_info_get_block(AVEncodeInfoFrame *info, unsigned idx) +{ + av_assert0(idx < info->nb_blocks); + + return (AVEncodeInfoBlock *)((uint8_t *)info + info->blocks_offset + idx*info->block_size); +} + +/** + * Allocates memory for AVEncodeInfoFrame plus an array of + * {@code nb_blocks} AVEncodeInfoBlock and initializes the variables. + * Can be freed with a normal av_free() call. + */ +AVEncodeInfoFrame *av_encode_info_alloc(unsigned nb_blocks); + +/** + * Allocates memory for AVEncodeInfoFrame plus an array of + * {@code nb_blocks} AVEncodeInfoBlock in the given AVFrame {@code frame} + * as AVFrameSideData of type AV_FRAME_DATA_ENCODE_INFO + * and initializes the variables. + */ +AVEncodeInfoFrame *av_encode_info_create_side_data(AVFrame *frame, unsigned nb_blocks); + +#endif /* AVUTIL_ENCODE_INFO_H */ diff --git a/libavutil/frame.c b/libavutil/frame.c index dcf1fc3d17..65c25e6cd7 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -842,6 +842,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) #endif case AV_FRAME_DATA_DYNAMIC_HDR_PLUS: return "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)"; case AV_FRAME_DATA_REGIONS_OF_INTEREST: return "Regions Of Interest"; + case AV_FRAME_DATA_ENCODE_INFO: return "AVEncodeInfo"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index 5d3231e7bb..ec112c5d15 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -179,6 +179,13 @@ enum AVFrameSideDataType { * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. */ AV_FRAME_DATA_REGIONS_OF_INTEREST, + /** + * Extract frame and block encode info from supported decoders. The data + * stored is an AVEncodeInfoFrame type, which contains an array of + * AVEncodeInfoBlock. Described in libavuitls/encode_info.h + * Can be allocated in the frame directly with av_encode_info_create_side_data(). + */ + AV_FRAME_DATA_ENCODE_INFO, }; enum AVActiveFormatDescription {