From patchwork Thu Nov 12 20:52:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23605 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 730B144AC00 for ; Thu, 12 Nov 2020 22:52:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AAD468C1C8; Thu, 12 Nov 2020 22:52:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4968868B6DF for ; Thu, 12 Nov 2020 22:52:51 +0200 (EET) Received: by mail-qt1-f196.google.com with SMTP id b16so4906891qtb.6 for ; Thu, 12 Nov 2020 12:52:51 -0800 (PST) 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=ipE0Vv5hMtnBnxYE0BNotTXCIDLgUjLyuV49xgwjo/Q=; b=PE9x/69lTtqvPSYVEOobvGXy1mZB/VrQh4a42PT7NCZ7uOw/vlW+AMpsgkYIwRQEd5 tnDIPdWYKbhQS/XMg5CoXNm1oZe512H8DYfqEc9NwEzasi3Fo1DrWwsCoveWvNrm/k6Q LUt+LnoWXVvkzTRJa0M4U0pm+R9qi7ZysZo6f7QVbFNf/ogacQNO1FL0R1DAejKTWbHD BDwi5du1JoEHaHvy1YwwKZGisyqOa93aci43h1IxEVXdWAMYS/6eDaGwfbchm+jt5/ry bsc5G2EqutoSKQiaRb1nqpuzGtp86Vr3LOgngE9wsOqzJeLRlkeqtpF3DJv0jOJ+8SAh lpRA== 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=ipE0Vv5hMtnBnxYE0BNotTXCIDLgUjLyuV49xgwjo/Q=; b=A0AIpd57ACasnhOXYank6aDQz8uklZLVJZEZXHuw6tUPHHD8MvhzkTKPzbhPdNp/6A jqGAKbAikllDpWWPslHm5Mu52ud5Q6rVvXvFfr+W3Oj2w+ax981L55xRMReCKMHo3nDv Ym88TCnGq6b91bJwnJw4Wz9e4SvYGA4x+fIEeFDq7YO87E3q+Ni7k5jzgXWbOA5Nmn7W UFl2m+1WBFE4V6rxkiIln5hIFciIuWKbpJrYfBEjjzXvspCYYTNYDxZqyrdDDezcCftr xo9OAUktCfO1grMfeWfEpuXoCGkvKWjn6k1X33gcaZjQaABe3Z7WPgqRdtAHtEtfR4ZE f6FA== X-Gm-Message-State: AOAM532V0FF5gPpDA4jXVLnFP9JnWuHstHEt6rX4ONkTiP2Imjfh8T1b 9Dstauk1gYGLXWUggDnLSDScyG9ATbs= X-Google-Smtp-Source: ABdhPJyxvyQ46Fd63e8k7MHPD8AYqVpZZivPMrCpaW/no/8zrULzY5puvsy/n/WhsbUIfcDgrU8EGg== X-Received: by 2002:aed:3809:: with SMTP id j9mr1051007qte.197.1605214369681; Thu, 12 Nov 2020 12:52:49 -0800 (PST) Received: from localhost.localdomain ([181.23.94.194]) by smtp.gmail.com with ESMTPSA id l8sm5335219qtj.93.2020.11.12.12.52.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 12:52:48 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Nov 2020 17:52:11 -0300 Message-Id: <20201112205213.1179-1-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/av1dec: add a reference to the raw frame header to AV1Frames 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 --- libavcodec/av1dec.c | 14 ++++++++++++++ libavcodec/av1dec.h | 3 +++ 2 files changed, 17 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index ad8e7d1dd5..84c9ca93d5 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -442,6 +442,8 @@ static void av1_frame_unref(AVCodecContext *avctx, AV1Frame *f) ff_thread_release_buffer(avctx, &f->tf); av_buffer_unref(&f->hwaccel_priv_buf); f->hwaccel_picture_private = NULL; + av_buffer_unref(&f->header_ref); + f->raw_frame_header = NULL; f->spatial_id = f->temporal_id = 0; f->order_hint = 0; memset(f->skip_mode_frame_idx, 0, @@ -457,6 +459,12 @@ static int av1_frame_ref(AVCodecContext *avctx, AV1Frame *dst, const AV1Frame *s if (ret < 0) return ret; + dst->header_ref = av_buffer_ref(src->header_ref); + if (!dst->header_ref) + goto fail; + + dst->raw_frame_header = src->raw_frame_header; + if (src->hwaccel_picture_private) { dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf); if (!dst->hwaccel_priv_buf) @@ -643,6 +651,12 @@ static int av1_frame_alloc(AVCodecContext *avctx, AV1Frame *f) AVFrame *frame; int ret; + f->header_ref = av_buffer_ref(s->header_ref); + if (!f->header_ref) + return AVERROR(ENOMEM); + + f->raw_frame_header = s->raw_frame_header; + ret = update_context_with_frame_header(avctx, header); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Failed to update context with frame header\n"); diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h index bed9376a36..533ca2b30f 100644 --- a/libavcodec/av1dec.h +++ b/libavcodec/av1dec.h @@ -36,6 +36,9 @@ typedef struct AV1Frame { AVBufferRef *hwaccel_priv_buf; void *hwaccel_picture_private; + AVBufferRef *header_ref; + AV1RawFrameHeader *raw_frame_header; + int temporal_id; int spatial_id;