From patchwork Sun Apr 14 22:04:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12738 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 87413449948 for ; Mon, 15 Apr 2019 01:05:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 63C7B68A720; Mon, 15 Apr 2019 01:05:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f196.google.com (mail-qk1-f196.google.com [209.85.222.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAF5368A715 for ; Mon, 15 Apr 2019 01:05:11 +0300 (EEST) Received: by mail-qk1-f196.google.com with SMTP id w20so8753490qka.7 for ; Sun, 14 Apr 2019 15:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xPbCWrYVYWTP60hzh6OK0BqE3YR4mlzPGnQccB3n08I=; b=T2VNl5zktgShOgPos/CmpCVDmgp4Jnp8inWtEBlcaIE2nWSn26+0cBKNZO+9vZe5Ds cMfOxDySqUhRuhQHjRBKt9fGA5Hz5FJjyE/qMl2NpAZpPnmwRpXfBGQg9+ILBwCc0Pp7 ogVvygoR4rI67U+RrPI/oI8MvoDR5PB7XwH0EdSl8nNm16bbP0plCsc4vDTRIicBAX7h wNIqArvlqJKT3gxtIGXrpCDnb/Wenn8+HvJgppCMF95DCgXU2MF4SPJxk8swPfrkluIF a8DMaYoSdT3CPp1k8bq4ijYvgBwyIdIFTWKkrafzzcAdl+J62N9xD33zCNzsMYtFH6iN h0cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xPbCWrYVYWTP60hzh6OK0BqE3YR4mlzPGnQccB3n08I=; b=tODXTfoOwfevmumDKxdzS8W3XD33+VhNCiC49OlAkxta7Rd1CajMPEAO94/x/KMeuK Cg1Q6IYwNHwNlPIwnxPkI9g6NnLfcVYyGqCC1F6FkXmw10Nj2qlJ1iG80RwRqk0kNAZV hquWdFwQHqtcEuwVd+t/K+6h4N2H0pM+N6G+4UvcLvL3YaS5cypbjXRB5/t52BRbHke1 h4o8t/fDlNoHTjBbFWU53qmj8Bv7KPp7zSUYFeyksF0wGKUsarztyPsAkZNngv4UQas7 /Fnp5/ZTV4OYiO9LJpuQNwNXCTVUse7J8SavlchqIZ7yd9/wucFH3FMChLGdol5XSsYK U8eA== X-Gm-Message-State: APjAAAVqy4/yOwq1FIcF5Njp5nkmxrj4FvvVi7WnD16TlTj3Q6JLc0rh PMcAHErQjyeyCD7nZpUfEXVeb7Oc X-Google-Smtp-Source: APXvYqydTgtNK+hGaERHw3xzsd5LjzberEZNU/4LeOuMHWPgkw+sdw/1osdwk6n6Fkc1HoB3Bw5Taw== X-Received: by 2002:a37:c203:: with SMTP id i3mr51847388qkm.295.1555279510107; Sun, 14 Apr 2019 15:05:10 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id a188sm19908175qkf.34.2019.04.14.15.05.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Apr 2019 15:05:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 14 Apr 2019 19:04:12 -0300 Message-Id: <20190414220412.8328-1-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/cbs_av1: add support for Scalability Metadata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- This will make the AV1RawObu struct weigh about ~3kb instead of ~1kb. libavcodec/av1.h | 33 ++++++++++++++++++++ libavcodec/cbs_av1.h | 15 +++++++++- libavcodec/cbs_av1_syntax_template.c | 45 ++++++++++++++++++++++++++-- 3 files changed, 90 insertions(+), 3 deletions(-) diff --git a/libavcodec/av1.h b/libavcodec/av1.h index f2ec39c86b..6c0e32485b 100644 --- a/libavcodec/av1.h +++ b/libavcodec/av1.h @@ -127,4 +127,37 @@ enum { AV1_CSP_COLOCATED = 2, // -> AVCHROMA_LOC_TOPLEFT. }; +// Scalability modes (section 6.7.5) +enum { + AV1_SCALABILITY_L1T2 = 0, + AV1_SCALABILITY_L1T3 = 1, + AV1_SCALABILITY_L2T1 = 2, + AV1_SCALABILITY_L2T2 = 3, + AV1_SCALABILITY_L2T3 = 4, + AV1_SCALABILITY_S2T1 = 5, + AV1_SCALABILITY_S2T2 = 6, + AV1_SCALABILITY_S2T3 = 7, + AV1_SCALABILITY_L2T1h = 8, + AV1_SCALABILITY_L2T2h = 9, + AV1_SCALABILITY_L2T3h = 10, + AV1_SCALABILITY_S2T1h = 11, + AV1_SCALABILITY_S2T2h = 12, + AV1_SCALABILITY_S2T3h = 13, + AV1_SCALABILITY_SS = 14, + AV1_SCALABILITY_L3T1 = 15, + AV1_SCALABILITY_L3T2 = 16, + AV1_SCALABILITY_L3T3 = 17, + AV1_SCALABILITY_S3T1 = 18, + AV1_SCALABILITY_S3T2 = 19, + AV1_SCALABILITY_S3T3 = 20, + AV1_SCALABILITY_L3T2_KEY = 21, + AV1_SCALABILITY_L3T3_KEY = 22, + AV1_SCALABILITY_L4T5_KEY = 23, + AV1_SCALABILITY_L4T7_KEY = 24, + AV1_SCALABILITY_L3T2_KEY_SHIFT = 25, + AV1_SCALABILITY_L3T3_KEY_SHIFT = 26, + AV1_SCALABILITY_L4T5_KEY_SHIFT = 27, + AV1_SCALABILITY_L4T7_KEY_SHIFT = 28, +}; + #endif /* AVCODEC_AV1_H */ diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index e799964b72..1fb668ada4 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -325,7 +325,20 @@ typedef struct AV1RawMetadataHDRMDCV { typedef struct AV1RawMetadataScalability { uint8_t scalability_mode_idc; - // TODO: more stuff. + uint8_t spatial_layers_cnt_minus_1; + uint8_t spatial_layer_dimensions_present_flag; + uint8_t spatial_layer_description_present_flag; + uint8_t temporal_group_description_present_flag; + uint8_t scalability_structure_reserved_3bits; + uint16_t spatial_layer_max_width[4]; + uint16_t spatial_layer_max_height[4]; + uint8_t spatial_layer_ref_id[4]; + uint8_t temporal_group_size; + uint8_t temporal_group_temporal_id[255]; + uint8_t temporal_group_temporal_switching_up_point_flag[255]; + uint8_t temporal_group_spatial_switching_up_point_flag[255]; + uint8_t temporal_group_ref_cnt[255]; + uint8_t temporal_group_ref_pic_diff[255][7]; } AV1RawMetadataScalability; typedef struct AV1RawMetadataITUTT35 { diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 0e019aa113..ef48173470 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1653,12 +1653,53 @@ static int FUNC(metadata_hdr_mdcv)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } +static int FUNC(scalability_structure)(CodedBitstreamContext *ctx, RWContext *rw, + AV1RawMetadataScalability *current) +{ + int err, i, j; + + fb(2, spatial_layers_cnt_minus_1); + flag(spatial_layer_dimensions_present_flag); + flag(spatial_layer_description_present_flag); + flag(temporal_group_description_present_flag); + fc(3, scalability_structure_reserved_3bits, 0, 0); + if (current->spatial_layer_dimensions_present_flag) { + for (i = 0; i <= current->spatial_layers_cnt_minus_1; i++) { + fbs(16, spatial_layer_max_width[i], 1, i); + fbs(16, spatial_layer_max_height[i], 1, i); + } + } + if (current->spatial_layer_description_present_flag) { + for (i = 0; i <= current->spatial_layers_cnt_minus_1; i++) + fbs(8, spatial_layer_ref_id[i], 1, i); + } + if (current->temporal_group_description_present_flag) { + fb(8, temporal_group_size); + for (i = 0; i < current->temporal_group_size; i++) { + fbs(3, temporal_group_temporal_id[i], 1, i); + flags(temporal_group_temporal_switching_up_point_flag[i], 1, i); + flags(temporal_group_spatial_switching_up_point_flag[i], 1, i); + fbs(3, temporal_group_ref_cnt[i], 1, i); + for (j = 0; j < current->temporal_group_ref_cnt[i]; j++) { + fbs(8, temporal_group_ref_pic_diff[i][j], 2, i, j); + } + } + } + + return 0; +} + static int FUNC(metadata_scalability)(CodedBitstreamContext *ctx, RWContext *rw, AV1RawMetadataScalability *current) { - // TODO: scalability metadata. + int err; - return AVERROR_PATCHWELCOME; + fb(8, scalability_mode_idc); + + if (current->scalability_mode_idc == AV1_SCALABILITY_SS) + CHECK(FUNC(scalability_structure)(ctx, rw, current)); + + return 0; } static int FUNC(metadata_itut_t35)(CodedBitstreamContext *ctx, RWContext *rw,