From patchwork Sun Nov 12 15:59:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 6012 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1189108jah; Sun, 12 Nov 2017 08:00:00 -0800 (PST) X-Google-Smtp-Source: AGs4zMZN2OKhP8djRvosCW0KGnDYhGotgCyZ96nDrS8Rp5wEn17Ole4U1+ySBU4yEss7Cint90RE X-Received: by 10.28.198.139 with SMTP id w133mr3100364wmf.13.1510502400683; Sun, 12 Nov 2017 08:00:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510502400; cv=none; d=google.com; s=arc-20160816; b=YwxyZRLVgSujaqxqCmg+l7OKWifS+VpLEInfST7JeocL+nNXvMjqdsF1xMoWKg7EZu gs4+Olyyq7pIfUFKm1IRh7ZNQfS9TngT+uwxdLk5qJ08V4sOALdCyhibz+kfotawP3A5 MrpyYjYx9DYA+VgNPSOcrc1UQ9EyTGVsVQ3ULDWcIr8pHzJKnZV/ivdVdnLjcoKz8stw wsD8ZBXo6WYi6yvTwZcUC57aQnkCjvp+PqWk38xzYC8N7ntKoWaOsgE5odBg1JWpPy6i 24L0Dxuhtfl3pFB94WV3P3iZv74V7Nws10QfrvRt3jEgXniK5NouPIjVZg2UVVrkOKAy XDvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=GkKI4+i1qteNg8bo2z4rf24pAe+PSZJY/nbsr2cV0Vk=; b=zoIM4n7SxxJkkTgtDPcCQhbv0ombscpPjcQ0nkMbOqQTceKb9rb5MeV+YMS1KCGAfC PWZidzKDwLKhbqCT0qojtINKBw37YOXSAcXlwKA6+BITlrK4TpZGkr9fvDmvzPhYMG3w hy5481pRYmTG7hAdlnX2wxFHf5+Luo9nplaXWih6iF0CdkZZPC/eeAEL5FNAyPFEVyjb PqUCpFWTtSjZZoeL7gORgHO6EEk5jtMta5on9tuSBI3pnz1TF+t0iisb7KkUK6b8uYJd gk9IcY3vQkxpJO5lJ6a2Z4xk1WucPS2vbnjZwWM4akRfSyiatxU9sphSBTmH989CUQM/ EeJg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l3si4470525wmi.244.2017.11.12.07.59.59; Sun, 12 Nov 2017 08:00:00 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE55C68A451; Sun, 12 Nov 2017 17:59:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe02-3.mx.upcmail.net (vie01a-dmta-pe02-3.mx.upcmail.net [62.179.121.159]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AACCA68A43F for ; Sun, 12 Nov 2017 17:59:38 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe02.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eDufo-00021W-IS for ffmpeg-devel@ffmpeg.org; Sun, 12 Nov 2017 16:59:52 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Z3zo1w00D0S5wYM013zpxJ; Sun, 12 Nov 2017 16:59:49 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 12 Nov 2017 16:59:47 +0100 Message-Id: <20171112155947.13095-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.0 Subject: [FFmpeg-devel] [PATCH] avutil: add API for mb types. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is based on motion_type.h TODO: docs & split into a commit per lib Signed-off-by: Michael Niedermayer --- libavcodec/avcodec.h | 4 ++ libavcodec/options_table.h | 1 + libavutil/block_type.h | 107 +++++++++++++++++++++++++++++++++++++++++++++ libavutil/frame.h | 14 ++++++ 4 files changed, 126 insertions(+) create mode 100644 libavutil/block_type.h diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 15ca871b59..1a49fa0a9a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -923,6 +923,10 @@ typedef struct RcOverride{ * Show all frames before the first keyframe */ #define AV_CODEC_FLAG2_SHOW_ALL (1 << 22) +/** + * Export block types through frame side data + */ +#define AV_CODEC_FLAG2_EXPORT_BLOCKS (1 << 27) /** * Export motion vectors through frame side data */ diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index d89f58d540..0b86b4d0fb 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -74,6 +74,7 @@ static const AVOption avcodec_options[] = { {"chunks", "Frame data might be split into multiple chunks", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_CHUNKS }, INT_MIN, INT_MAX, V|D, "flags2"}, {"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"}, {"export_mvs", "export motion vectors through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_EXPORT_MVS}, INT_MIN, INT_MAX, V|D, "flags2"}, +{"export_blocks", "export block types through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_EXPORT_BLOCKS}, INT_MIN, INT_MAX, V|D, "flags2"}, {"skip_manual", "do not skip samples and export skip information as frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_SKIP_MANUAL}, INT_MIN, INT_MAX, V|D, "flags2"}, {"ass_ro_flush_noop", "do not reset ASS ReadOrder field on flush", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_FLAG2_RO_FLUSH_NOOP}, INT_MIN, INT_MAX, S|D, "flags2"}, {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, INT_MAX}, diff --git a/libavutil/block_type.h b/libavutil/block_type.h new file mode 100644 index 0000000000..3f53f1d082 --- /dev/null +++ b/libavutil/block_type.h @@ -0,0 +1,107 @@ +/* + * 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_BLOCK_TYPE_H +#define AVUTIL_BLOCK_TYPE_H + +#include + + +typedef struct AVBlockType { + /** + * Block type. + * 1: Prediction (this can be spatial prediction or motion compensation for example) + * 2: Transform + * 3: Residual + * 4: Filter + * 5: Metadata + * + * Multiple Filter, Transform and prediction blocks are allowed, for example + * for bidirectional motion compensation. Multiple residuals are allowed, for + * example DC and AC residual. + */ + uint8_t type; + /** + * Bitmask that lists which planes (for example: Y:1,Cb:2,Cr:4,Alpha:8) + * this block applies to. + */ + uint8_t plane_mask; + /** + * The field (top:1, bottom:2) this block applies to. + */ + uint8_t field_mask; + uint8_t name[16]; + /** + * Left Top corner position. This can be outside of the vissible frame. + */ + int32_t x, y; + /** + * Width and height of the block. + */ + uint16_t w, h; + /** + * Number identifying the slice the Block is in. + */ + uint16_t slice_num; + /** + * Location in bits where the block related information is stored. can be -1 + */ + uint32_t block_index, block_bits; + + /** + * Main Direction, 0 is horizontal, 48 is vertical, + * values 0 to 95 follow clockwise direction. + * 255 means that the block has no direction. + * This represents the main direction of a transform, prediction or filter + */ + uint8_t direction; + + /** + * Quantization parameter, a value of 0x8000 means lossless, 0x7FFF means not applicable + * for MC prediction this is the precission of the motion vector. + */ + int16_t qp; + + /** + * Where the prediction comes from; negative value when it comes + * from the past, positive value when it comes from the future. + * 0 For Intra. + */ + int32_t source; + /** + * Motion vector + * src_x = dst_x + motion_x / qp + * src_y = dst_y + motion_y / qp + */ + int32_t motion_x, motion_y; + + /** + * Extra flag information. + */ + uint64_t flags; +#define AV_BLOCK_TYPE_FLAG_INTERLACED 0x0000001 ///< Block is interlaced + +#define AV_BLOCK_TYPE_FLAG_LEAF 0x0001000 ///< Block is a leaf block, it is not further split +#define AV_BLOCK_TYPE_FLAG_ROOT 0x0002000 ///< Block is a root block, it is not contained in a larger block + +#define AV_BLOCK_TYPE_FLAG_CONCEALED 0x0010000 ///< Block has been replaced by error conclealment +#define AV_BLOCK_TYPE_FLAG_DAMAGED 0x0020000 ///< Block has been damaged + +} AVBlockType; + +#endif /* AVUTIL_BLOCK_TYPE_H */ diff --git a/libavutil/frame.h b/libavutil/frame.h index d54bd9a354..fa2edea5b1 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -141,6 +141,20 @@ enum AVFrameSideDataType { * metadata key entry "name". */ AV_FRAME_DATA_ICC_PROFILE, + /** + * Block data exported by some codecs (on demand through the export_blocks + * flag set in the libavcodec AVCodecContext flags2 option). + * The data is the AVBlockType struct defined in + * libavutil/block_type.h. + * + * @code + * 24 byte string identifying the codec. + * u32le number of blocks. + * u32le size in bytes of each block. + * block array. + * @endcode + */ + AV_FRAME_DATA_BLOCK_TYPE, }; enum AVActiveFormatDescription {