From patchwork Thu Aug 6 08:04:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21510 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 87A6E448957 for ; Thu, 6 Aug 2020 11:04:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FC6468BAAD; Thu, 6 Aug 2020 11:04:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57CC168B703 for ; Thu, 6 Aug 2020 11:04:44 +0300 (EEST) IronPort-SDR: W0eMhQvM837ZZvwCtCf4mxdkk6srQa4soFCY8013GGmLIcGdPEur8UQ19WMx5BYAmkRQFk6stw p87IuI1jaN8A== X-IronPort-AV: E=McAfee;i="6000,8403,9704"; a="140349967" X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="140349967" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2020 01:04:41 -0700 IronPort-SDR: hDceBXgDsnu07I6472DKRtc86mpciYfJIcDtaWYxqmSkB5mEmrsnGffKB5TFbx83hTIQE2YNXV M2ICFSKcS9Dg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="493587688" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga005.fm.intel.com with ESMTP; 06 Aug 2020 01:04:40 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Thu, 6 Aug 2020 16:04:12 +0800 Message-Id: <20200806080416.17691-2-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806080416.17691-1-guangxin.xu@intel.com> References: <20200806080416.17691-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 1/5] av1_parser: parser_obu_header, return has_size_flag 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Xu Guangxin we need check has_size_flag for low overhead obu --- libavcodec/av1_parse.c | 4 ++-- libavcodec/av1_parse.h | 8 ++++---- libavformat/av1.c | 12 ++++++------ libavformat/av1dec.c | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c index 59ea0bc6e7..b59b4e5e45 100644 --- a/libavcodec/av1_parse.c +++ b/libavcodec/av1_parse.c @@ -29,11 +29,11 @@ int ff_av1_extract_obu(AV1OBU *obu, const uint8_t *buf, int length, void *logctx) { int64_t obu_size; - int start_pos, type, temporal_id, spatial_id; + int start_pos, type, temporal_id, spatial_id, has_size_flag; int len; len = parse_obu_header(buf, length, &obu_size, &start_pos, - &type, &temporal_id, &spatial_id); + &type, &temporal_id, &spatial_id, &has_size_flag); if (len < 0) return len; diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 01bcd646c2..a3b39f039c 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -99,10 +99,10 @@ static inline int64_t leb128(GetBitContext *gb) { static inline int parse_obu_header(const uint8_t *buf, int buf_size, int64_t *obu_size, int *start_pos, int *type, - int *temporal_id, int *spatial_id) + int *temporal_id, int *spatial_id, int *has_size_flag) { GetBitContext gb; - int ret, extension_flag, has_size_flag; + int ret, extension_flag; int64_t size; ret = init_get_bits8(&gb, buf, FFMIN(buf_size, 2 + 8)); // OBU header fields + max leb128 length @@ -114,7 +114,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, *type = get_bits(&gb, 4); extension_flag = get_bits1(&gb); - has_size_flag = get_bits1(&gb); + *has_size_flag = get_bits1(&gb); skip_bits1(&gb); // obu_reserved_1bit if (extension_flag) { @@ -125,7 +125,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, *temporal_id = *spatial_id = 0; } - *obu_size = has_size_flag ? leb128(&gb) + *obu_size = *has_size_flag ? leb128(&gb) : buf_size - 1 - extension_flag; if (get_bits_left(&gb) < 0) diff --git a/libavformat/av1.c b/libavformat/av1.c index 0cbffb1fd8..10d6815d1f 100644 --- a/libavformat/av1.c +++ b/libavformat/av1.c @@ -34,7 +34,7 @@ static int av1_filter_obus(AVIOContext *pb, const uint8_t *buf, { const uint8_t *start = buf, *end = buf + size; int64_t obu_size; - int off, start_pos, type, temporal_id, spatial_id; + int off, start_pos, type, temporal_id, spatial_id, has_size_flag; enum { START_NOT_FOUND, START_FOUND, @@ -45,7 +45,7 @@ static int av1_filter_obus(AVIOContext *pb, const uint8_t *buf, off = size = 0; while (buf < end) { int len = parse_obu_header(buf, end - buf, &obu_size, &start_pos, - &type, &temporal_id, &spatial_id); + &type, &temporal_id, &spatial_id, &has_size_flag); if (len < 0) return len; @@ -334,14 +334,14 @@ static int parse_sequence_header(AV1SequenceParameters *seq_params, const uint8_ int ff_av1_parse_seq_header(AV1SequenceParameters *seq, const uint8_t *buf, int size) { int64_t obu_size; - int start_pos, type, temporal_id, spatial_id; + int start_pos, type, temporal_id, spatial_id, has_size_flag; if (size <= 0) return AVERROR_INVALIDDATA; while (size > 0) { int len = parse_obu_header(buf, size, &obu_size, &start_pos, - &type, &temporal_id, &spatial_id); + &type, &temporal_id, &spatial_id, &has_size_flag); if (len < 0) return len; @@ -369,7 +369,7 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) uint8_t header[4], *meta; const uint8_t *seq; int64_t obu_size; - int start_pos, type, temporal_id, spatial_id; + int start_pos, type, temporal_id, spatial_id, has_size_flag; int ret, nb_seq = 0, seq_size, meta_size; if (size <= 0) @@ -381,7 +381,7 @@ int ff_isom_write_av1c(AVIOContext *pb, const uint8_t *buf, int size) while (size > 0) { int len = parse_obu_header(buf, size, &obu_size, &start_pos, - &type, &temporal_id, &spatial_id); + &type, &temporal_id, &spatial_id, &has_size_flag); if (len < 0) { ret = len; goto fail; diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 1be2fac1c1..297e87cc52 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -57,13 +57,13 @@ static int leb(AVIOContext *pb, uint32_t *len) { return i; } -static int read_obu(const uint8_t *buf, int size, int64_t *obu_size, int *type) +static int read_obu(const uint8_t *buf, int size, int64_t *obu_size, int *type, int *has_size_flag) { int start_pos, temporal_id, spatial_id; int len; len = parse_obu_header(buf, size, obu_size, &start_pos, - type, &temporal_id, &spatial_id); + type, &temporal_id, &spatial_id, has_size_flag); if (len < 0) return len; @@ -76,7 +76,7 @@ static int annexb_probe(const AVProbeData *p) int64_t obu_size; uint32_t temporal_unit_size, frame_unit_size, obu_unit_size; int seq = 0; - int ret, type, cnt = 0; + int ret, type, cnt = 0, has_size_flag; ffio_init_context(&pb, p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL); @@ -103,7 +103,7 @@ static int annexb_probe(const AVProbeData *p) return 0; // Check that the first OBU is a Temporal Delimiter. - ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, obu_unit_size), &obu_size, &type); + ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, obu_unit_size), &obu_size, &type, &has_size_flag); if (ret < 0 || type != AV1_OBU_TEMPORAL_DELIMITER || obu_size > 0) return 0; cnt += obu_unit_size; @@ -118,7 +118,7 @@ static int annexb_probe(const AVProbeData *p) if (pb.eof_reached || pb.error) return 0; - ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, obu_unit_size), &obu_size, &type); + ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, obu_unit_size), &obu_size, &type, &has_size_flag); if (ret < 0) return 0; cnt += obu_unit_size; From patchwork Thu Aug 6 08:04:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21511 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 9E771448957 for ; Thu, 6 Aug 2020 11:04:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 88AFA68BABC; Thu, 6 Aug 2020 11:04:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CDE968B5E0 for ; Thu, 6 Aug 2020 11:04:45 +0300 (EEST) IronPort-SDR: /OSp8v3V7oDY4IUmkhzCAHtakYTHksvVIxlG094GfszhyDiXwADwlUUwDdBStxw4TB2/glfURi +ZSR+PPcK0Jg== X-IronPort-AV: E=McAfee;i="6000,8403,9704"; a="140349974" X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="140349974" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2020 01:04:42 -0700 IronPort-SDR: lbPqh1S0vpOI3MfiX+NRcmA8EAiVr0uw3ylrNcCQJO2MAIFJrkxSw5lbewcfdgaxCXFLHHKESp npTK08EuFfrA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="493587698" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga005.fm.intel.com with ESMTP; 06 Aug 2020 01:04:41 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Thu, 6 Aug 2020 16:04:13 +0800 Message-Id: <20200806080416.17691-3-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806080416.17691-1-guangxin.xu@intel.com> References: <20200806080416.17691-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 2/5] av1_parser: do not check buf_size if we have size in obu header 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" for low overhead obu, we can't forsee the obu size. we can only get it when we parsed the obu header. --- libavcodec/av1_parse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index a3b39f039c..823bdedd5e 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -135,7 +135,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, size = *obu_size + *start_pos; - if (size > buf_size) + if (!*has_size_flag && size > buf_size) return AVERROR_INVALIDDATA; return size; From patchwork Thu Aug 6 08:04:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21512 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 9C336448957 for ; Thu, 6 Aug 2020 11:04:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84B6468BAD4; Thu, 6 Aug 2020 11:04:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F49C68BAB6 for ; Thu, 6 Aug 2020 11:04:48 +0300 (EEST) IronPort-SDR: 3Kq466BWlAu3T+QZGJdI9y2CT/jeuMCGMLYdgsi8XJZtG0dOA/4uQMEYxfyjyY8BydY8SjCriH iCWnsU5pU/rQ== X-IronPort-AV: E=McAfee;i="6000,8403,9704"; a="140349982" X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="140349982" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2020 01:04:43 -0700 IronPort-SDR: 3Z5Q8bN9AfzedRrWtBUIsRgZupDDLm6nmVpbPsPIgmYjg+WsZGYos5WFlvrv7Su3Nombmebut6 8pBE5uF14/sQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="493587712" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga005.fm.intel.com with ESMTP; 06 Aug 2020 01:04:42 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Thu, 6 Aug 2020 16:04:14 +0800 Message-Id: <20200806080416.17691-4-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806080416.17691-1-guangxin.xu@intel.com> References: <20200806080416.17691-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/av1dec: refact, do not overide return value in read_obu 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" we need them later --- libavformat/av1dec.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 297e87cc52..ec66152e03 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -60,14 +60,9 @@ static int leb(AVIOContext *pb, uint32_t *len) { static int read_obu(const uint8_t *buf, int size, int64_t *obu_size, int *type, int *has_size_flag) { int start_pos, temporal_id, spatial_id; - int len; - len = parse_obu_header(buf, size, obu_size, &start_pos, + return parse_obu_header(buf, size, obu_size, &start_pos, type, &temporal_id, &spatial_id, has_size_flag); - if (len < 0) - return len; - - return 0; } static int annexb_probe(const AVProbeData *p) @@ -137,8 +132,8 @@ static int annexb_probe(const AVProbeData *p) break; } - temporal_unit_size -= obu_unit_size + ret; - frame_unit_size -= obu_unit_size + ret; + temporal_unit_size -= obu_unit_size; + frame_unit_size -= obu_unit_size; } while (frame_unit_size); return 0; From patchwork Thu Aug 6 08:04:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21513 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 89D0B448957 for ; Thu, 6 Aug 2020 11:04:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F36D68BADC; Thu, 6 Aug 2020 11:04:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BBB068BABA for ; Thu, 6 Aug 2020 11:04:50 +0300 (EEST) IronPort-SDR: HteyN5Pv2KcSDpHeElPoFQB/71uEm1xwTi3pDSUI5KNmG62V83l5U4Ud0f170xEZTtoVt36rw+ avyNfR+Xg3JA== X-IronPort-AV: E=McAfee;i="6000,8403,9704"; a="140349993" X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="140349993" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2020 01:04:45 -0700 IronPort-SDR: v2s4OpWO88p9tFTu9sO/tuypq5N+C+VnMHHsPFFmnVtWPSzX6Jf2UEYsf7UWiLMJAvOyClMMt3 rGenVmdMJOZg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="493587720" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga005.fm.intel.com with ESMTP; 06 Aug 2020 01:04:44 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Thu, 6 Aug 2020 16:04:15 +0800 Message-Id: <20200806080416.17691-5-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806080416.17691-1-guangxin.xu@intel.com> References: <20200806080416.17691-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 4/5] avormat/av1dec: add low-overhead bitstream format 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It's defined in Section 5.2, used by netflix. see http://download.opencontent.netflix.com/?prefix=AV1/Chimera/ --- libavformat/allformats.c | 1 + libavformat/av1dec.c | 193 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 185 insertions(+), 9 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index fd9e46e233..8eead5619d 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -75,6 +75,7 @@ extern AVOutputFormat ff_asf_stream_muxer; extern AVInputFormat ff_au_demuxer; extern AVOutputFormat ff_au_muxer; extern AVInputFormat ff_av1_demuxer; +extern AVInputFormat ff_av1_low_overhead_demuxer; extern AVInputFormat ff_avi_demuxer; extern AVOutputFormat ff_avi_muxer; extern AVInputFormat ff_avisynth_demuxer; diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index ec66152e03..0c5d172a0f 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -28,6 +28,9 @@ #include "avio_internal.h" #include "internal.h" +//2 + max leb 128 size +#define MAX_HEAD_SIZE 10 + typedef struct AnnexBContext { const AVClass *class; AVBSFContext *bsf; @@ -139,9 +142,8 @@ static int annexb_probe(const AVProbeData *p) return 0; } -static int annexb_read_header(AVFormatContext *s) +static int read_header(AVFormatContext *s, AVRational framerate, AVBSFContext **bsf, void *c) { - AnnexBContext *c = s->priv_data; const AVBitStreamFilter *filter = av_bsf_get_by_name("av1_frame_merge"); AVStream *st; int ret; @@ -160,25 +162,32 @@ static int annexb_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_AV1; st->need_parsing = AVSTREAM_PARSE_HEADERS; - st->internal->avctx->framerate = c->framerate; + st->internal->avctx->framerate = framerate; // taken from rawvideo demuxers avpriv_set_pts_info(st, 64, 1, 1200000); - ret = av_bsf_alloc(filter, &c->bsf); + ret = av_bsf_alloc(filter, bsf); if (ret < 0) return ret; - ret = avcodec_parameters_copy(c->bsf->par_in, st->codecpar); + ret = avcodec_parameters_copy((*bsf)->par_in, st->codecpar); if (ret < 0) { - av_bsf_free(&c->bsf); + av_bsf_free(bsf); return ret; } - ret = av_bsf_init(c->bsf); + ret = av_bsf_init(*bsf); if (ret < 0) - av_bsf_free(&c->bsf); + av_bsf_free(bsf); return ret; + +} + +static int annexb_read_header(AVFormatContext *s) +{ + AnnexBContext *c = s->priv_data; + return read_header(s, c->framerate, &c->bsf, c); } static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -246,12 +255,158 @@ static int annexb_read_close(AVFormatContext *s) return 0; } -#define OFFSET(x) offsetof(AnnexBContext, x) +typedef struct LowOverheadContext { + const AVClass *class; + AVBSFContext *bsf; + AVRational framerate; + uint8_t prefetched[MAX_HEAD_SIZE]; + //prefetched len + int len; +} LowOverheadContext; + +static int low_overhead_probe(const AVProbeData *p) +{ + AVIOContext pb; + int64_t obu_size; + int ret, type, cnt = 0, has_size_flag; + + ffio_init_context(&pb, p->buf, p->buf_size, 0, + NULL, NULL, NULL, NULL); + + // Check that the first OBU is a Temporal Delimiter. + ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, MAX_HEAD_SIZE), &obu_size, &type, &has_size_flag); + if (ret < 0 || type != AV1_OBU_TEMPORAL_DELIMITER || obu_size != 0 || !has_size_flag) + return 0; + cnt += ret; + + ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, MAX_HEAD_SIZE), &obu_size, &type, &has_size_flag); + if (ret < 0 || type != AV1_OBU_SEQUENCE_HEADER || !has_size_flag) + return 0; + cnt += ret; + + ret = read_obu(p->buf + cnt, FFMIN(p->buf_size - cnt, MAX_HEAD_SIZE), &obu_size, &type, &has_size_flag); + if (ret < 0 || (type != AV1_OBU_FRAME && type != AV1_OBU_FRAME_HEADER) || obu_size <= 0 || !has_size_flag) + return 0; + return AVPROBE_SCORE_EXTENSION + 1; +} + +static int low_overhead_read_header(AVFormatContext *s) +{ + LowOverheadContext *c = s->priv_data; + return read_header(s, c->framerate, &c->bsf, c); +} + +static int low_overhead_prefetch(AVFormatContext *s) +{ + LowOverheadContext *c = s->priv_data; + int ret; + int size = MAX_HEAD_SIZE - c->len; + if (size > 0 && !avio_feof(s->pb)) { + ret = avio_read(s->pb, &c->prefetched[c->len], size); + if (ret < 0) + return ret; + c->len += ret; + } + return c->len; +} + +static int low_overhead_read_data(AVFormatContext *s, AVPacket *pkt, int size) +{ + int left; + LowOverheadContext *c = s->priv_data; + int ret = av_new_packet(pkt, size); + if (ret < 0) { + av_log(c, AV_LOG_ERROR, "Failed to allocate packet for obu\n"); + return ret; + } + if (size <= c->len) { + memcpy(pkt->data, c->prefetched, size); + + left = c->len - size; + memcpy(c->prefetched, c->prefetched + size, left); + c->len = left; + } else { + memcpy(pkt->data, c->prefetched, c->len); + left = size - c->len; + ret = avio_read(s->pb, pkt->data + c->len, left); + if (ret != left) { + av_log(c, AV_LOG_ERROR, "Failed to read %d frome file\n", left); + return ret; + } + c->len = 0; + } + return 0; +} + +static int low_overhead_get_packet(AVFormatContext *s, AVPacket *pkt) +{ + int64_t obu_size; + int ret, type, has_size_flag; + LowOverheadContext *c = s->priv_data; + ret = low_overhead_prefetch(s); + if (ret < 0) + return ret; + if (ret) { + ret = read_obu(c->prefetched, c->len, &obu_size, &type, &has_size_flag); + if (ret < 0 && !has_size_flag) { + av_log(c, AV_LOG_ERROR, "Failed to read obu\n"); + return ret; + } + ret = low_overhead_read_data(s, pkt, ret); + } + return ret; +} + +static int low_overhead_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + LowOverheadContext *c = s->priv_data; + int ret; + + while (1) { + ret = low_overhead_get_packet(s, pkt); + if (ret < 0) + return ret; + ret = av_bsf_send_packet(c->bsf, pkt); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Failed to send packet to " + "av1_frame_merge filter\n"); + return ret; + } + ret = av_bsf_receive_packet(c->bsf, pkt); + if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) + av_log(s, AV_LOG_ERROR, "av1_frame_merge filter failed to " + "send output packet\n"); + + if (ret != AVERROR(EAGAIN)) + break; + } + + return ret; +} + +static int low_overhead_read_close(AVFormatContext *s) +{ + LowOverheadContext *c = s->priv_data; + + av_bsf_free(&c->bsf); + return 0; +} + #define DEC AV_OPT_FLAG_DECODING_PARAM + +#define OFFSET(x) offsetof(AnnexBContext, x) static const AVOption annexb_options[] = { { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, { NULL }, }; +#undef OFFSET + +#define OFFSET(x) offsetof(LowOverheadContext, x) +static const AVOption low_overhead_options[] = { + { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, + { NULL }, +}; +#undef OFFSET static const AVClass annexb_demuxer_class = { .class_name = "AV1 Annex B demuxer", @@ -272,3 +427,23 @@ AVInputFormat ff_av1_demuxer = { .flags = AVFMT_GENERIC_INDEX, .priv_class = &annexb_demuxer_class, }; + +static const AVClass low_overhead_demuxer_class = { + .class_name = "AV1 low overhead OBU demuxer", + .item_name = av_default_item_name, + .option = low_overhead_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_av1_low_overhead_demuxer = { + .name = "av1", + .long_name = NULL_IF_CONFIG_SMALL("AV1 low overhead OBU"), + .priv_data_size = sizeof(LowOverheadContext), + .read_probe = low_overhead_probe, + .read_header = low_overhead_read_header, + .read_packet = low_overhead_read_packet, + .read_close = low_overhead_read_close, + .extensions = "obu", + .flags = AVFMT_GENERIC_INDEX, + .priv_class = &low_overhead_demuxer_class, +}; From patchwork Thu Aug 6 08:04:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21514 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 95253448957 for ; Thu, 6 Aug 2020 11:04:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 797B068BADD; Thu, 6 Aug 2020 11:04:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A17368BAE8 for ; Thu, 6 Aug 2020 11:04:51 +0300 (EEST) IronPort-SDR: UeLWzSeXFVYY4njzIhhfVLSdM8Z+3P+uSL+m83ilxujlX90XaN3fdndxGjJFtocvJNpFSOK88V IdqTnEkm2x8Q== X-IronPort-AV: E=McAfee;i="6000,8403,9704"; a="140349999" X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="140349999" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Aug 2020 01:04:47 -0700 IronPort-SDR: aHY5YsHU0wlLkrNrIFbtECwqDm+lXt787z9hnWzgiMDYMUrBnWOyfzZm/1BhTKcnbLLgC8qlMh zEyUH0+hewFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,441,1589266800"; d="scan'208";a="493587727" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by fmsmga005.fm.intel.com with ESMTP; 06 Aug 2020 01:04:45 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Thu, 6 Aug 2020 16:04:16 +0800 Message-Id: <20200806080416.17691-6-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200806080416.17691-1-guangxin.xu@intel.com> References: <20200806080416.17691-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH 5/5] fate: av1dec, add test clip for low overhead obu 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- tests/fate/demux.mak | 3 +++ tests/ref/fate/av1-low-overhead-demux | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 tests/ref/fate/av1-low-overhead-demux diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index 9f3a6be276..763452a533 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -13,6 +13,9 @@ fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy FATE_SAMPLES_DEMUX-$(CONFIG_AV1_DEMUXER) += fate-av1-annexb-demux fate-av1-annexb-demux: CMD = framecrc -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy +FATE_SAMPLES_DEMUX-$(CONFIG_AV1_DEMUXER) += fate-av1-low-overhead-demux +fate-av1-low-overhead-demux: CMD = framecrc -i $(TARGET_SAMPLES)/av1/low_overhead.obu -c:v copy + FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy diff --git a/tests/ref/fate/av1-low-overhead-demux b/tests/ref/fate/av1-low-overhead-demux new file mode 100644 index 0000000000..62635bba89 --- /dev/null +++ b/tests/ref/fate/av1-low-overhead-demux @@ -0,0 +1,16 @@ +#extradata 0: 13, 0x12ed043e +#tb 0: 1/1200000 +#media_type 0: video +#codec_id 0: av1 +#dimensions 0: 176x144 +#sar 0: 0/1 +0, 0, 0, 48000, 9106, 0x09d4b5fe +0, 48000, 48000, 48000, 10218, 0xafe5dad1, F=0x0 +0, 96000, 96000, 48000, 5, 0x016200e5, F=0x0 +0, 144000, 144000, 48000, 697, 0x96cb5a52, F=0x0 +0, 192000, 192000, 48000, 5, 0x015200d5, F=0x0 +0, 240000, 240000, 48000, 2000, 0x34b2ea8e, F=0x0 +0, 288000, 288000, 48000, 5, 0x01920115, F=0x0 +0, 336000, 336000, 48000, 836, 0x8a1b9294, F=0x0 +0, 384000, 384000, 48000, 761, 0x407a72d4, F=0x0 +0, 432000, 432000, 48000, 27, 0x4bde0706, F=0x0