From patchwork Fri Mar 12 16:54:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26358 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 DFBAF44B7E3 for ; Fri, 12 Mar 2021 18:55:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C5D9C68ACE8; Fri, 12 Mar 2021 18:55:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D70AB68AC91 for ; Fri, 12 Mar 2021 18:55:11 +0200 (EET) Received: by mail-ej1-f47.google.com with SMTP id c10so54534209ejx.9 for ; Fri, 12 Mar 2021 08:55:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=PLx8JJxNzsj8Eq+EBPLPgyAZ+Gu0M3d3LpmmJWpmwfA=; b=KWC1/nX7JOZFvcBc77lFoTOGeWqPfYfpwFPMHUJzcjQwpfxUBlSiWaiqr4t5WgLcPM n+lp9PzFCcEBn+WfQzkuLKFzxeg8tb78M2TSa6PU+i0QJqnmsW+gaL8cmuhhuZDYwJzk BumJ4JfaDb3c8pyskGNuPQdIfrXMiOc6SBhCm6BGqHgC4hdTCf5TRc0cHj6ZKpbP4dGv jm2DRmmL0rJKVOKZz+Z8PlKf8oeSWzoie0wqrJmm3jVRgzssMkcBVEAmXGeTfegKz/n8 kpoRF0Vbm6AtF7B10XXQNd8Ynu/Kx1zdDz1iyKD6VQN3YkA99kksvQp5f0Bjv38JCFOk 4Zbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=PLx8JJxNzsj8Eq+EBPLPgyAZ+Gu0M3d3LpmmJWpmwfA=; b=YcTmgnwnQWNmOgZv8HvJYpDJb0RQ6B/n46LwUsOfz4PqCauMtyKV5HaoLR/js5kQ3D Im9EFQ52bdMR2qXJz2cjsGJAR8129EQATchqSZyW7iLlP1Rrtodz/8Km+sWhdiQsVPqZ OE+Mc5J6ZNIYr9G0v76WOAuLsk1XKmgUxmIK0OlXN2EXwr+JVmPy64p4uqml8TeTZc2L HcL8a60x1izn1FVr1wEA4UxPWFp9J3tb8o5ITcQSs+GQPk/ew+4x0AcoByX2IwfRI2eo EChTxlJACTlqH03IpxVniwkvz1NV/FowmGyOEEvFmsa5bmd27Bp4u2jtvNKVlqojLqKI Zsbg== X-Gm-Message-State: AOAM532/QqulCZh0Sgn88UiZIjfs7DnwSOdaIufQw+rWwXNXsJlKIMK/ 6jQwirEX0QqNq1/RypzawOA9CELj11c= X-Google-Smtp-Source: ABdhPJzWFmfj5u0CZ1UAa49J5qQGBxcxXRo9lKKN7BRO4Y9fJ1cFM45YN6Li2F3F2q+4Z0Ta/znSPQ== X-Received: by 2002:a17:907:b06:: with SMTP id h6mr9476518ejl.144.1615568111080; Fri, 12 Mar 2021 08:55:11 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id n2sm3034879ejl.1.2021.03.12.08.55.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 08:55:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 12 Mar 2021 17:54:41 +0100 Message-Id: <20210312165441.2113452-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210312165441.2113452-1-andreas.rheinhardt@gmail.com> References: <20210312165441.2113452-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/decode: Reindentation 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 49 ++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 73cc3def5f..495e9e8b23 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1723,7 +1723,6 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AVPacket *pkt = avctx->internal->last_pkt_props; - int i; static const struct { enum AVPacketSideDataType packet; enum AVFrameSideDataType frame; @@ -1744,36 +1743,36 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) av_fifo_generic_read(avctx->internal->pkt_props, pkt, sizeof(*pkt), NULL); - frame->pts = pkt->pts; + frame->pts = pkt->pts; #if FF_API_PKT_PTS FF_DISABLE_DEPRECATION_WARNINGS - frame->pkt_pts = pkt->pts; + frame->pkt_pts = pkt->pts; FF_ENABLE_DEPRECATION_WARNINGS #endif - frame->pkt_pos = pkt->pos; - frame->pkt_duration = pkt->duration; - frame->pkt_size = pkt->size; - - for (i = 0; i < FF_ARRAY_ELEMS(sd); i++) { - buffer_size_t size; - uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); - if (packet_sd) { - AVFrameSideData *frame_sd = av_frame_new_side_data(frame, - sd[i].frame, - size); - if (!frame_sd) - return AVERROR(ENOMEM); - - memcpy(frame_sd->data, packet_sd, size); - } + frame->pkt_pos = pkt->pos; + frame->pkt_duration = pkt->duration; + frame->pkt_size = pkt->size; + + for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { + buffer_size_t size; + uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, &size); + if (packet_sd) { + AVFrameSideData *frame_sd = av_frame_new_side_data(frame, + sd[i].frame, + size); + if (!frame_sd) + return AVERROR(ENOMEM); + + memcpy(frame_sd->data, packet_sd, size); } - add_metadata_from_side_data(pkt, frame); + } + add_metadata_from_side_data(pkt, frame); - if (pkt->flags & AV_PKT_FLAG_DISCARD) { - frame->flags |= AV_FRAME_FLAG_DISCARD; - } else { - frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); - } + if (pkt->flags & AV_PKT_FLAG_DISCARD) { + frame->flags |= AV_FRAME_FLAG_DISCARD; + } else { + frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); + } frame->reordered_opaque = avctx->reordered_opaque; if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)