From patchwork Mon Apr 1 23:39:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12559 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 18C1D447332 for ; Tue, 2 Apr 2019 02:39:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0448968ABDF; Tue, 2 Apr 2019 02:39:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAE1D68ABCB for ; Tue, 2 Apr 2019 02:39:55 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id v14so1325364wmf.2 for ; Mon, 01 Apr 2019 16:39:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=F3XklonSBI+KInhrZBDICgQYNIWmI/0a3FFDbllTb38=; b=EZp2M802VoRIP2WPPN7KJTjSJydYggq9hRgQaF1tUAwr1DhEpunsqoSzXfShhVZAtP bl19XMVIVXp4kw8nOpdDVBiLmXNeUoXYBPI6uYlixkE1noS0VQKCNhSrdajBvBWAp4l0 xah3wnoH5xuboA1yMjCZtIf5wsqUEJbceXPQuIeJuDtBvCrNrHdFlVTvbn+Isf+Vcn5f PQto/Aef2kloeQ4NrVn+6TQNmboxdwGEwi2IDoDxOwQpO1bPsQZ+SV7R8NGhii0qstmk GKxU9ICEX8Jqy0a8kWXVND+o2Wlzf68WxxcKilCr68v13S3+KmgtGMiDj+a93k23qZzD flhA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=F3XklonSBI+KInhrZBDICgQYNIWmI/0a3FFDbllTb38=; b=bxz+13es59roc8zqoQNSxYczhdaBJ/X2ljvT6+jo/wIT0cokrCdgvDsAm50qLaiKIk Y+Fb1l4ctsCo30e7xUR7trAJ6vFfnbh9Jsm166dpo/QDlHh+6MPo+szTwXGt3PZNmXsq RJJgbqgvyHukVCuGSj1DFsCRe7jjMjqN9YsanwFvqxjTbe4JyJ2bPGzs85UWcNoMkpPj uow/hKeJK0zeDxmbsvDHpY9wBgrt51fHOs9CZmffyUVp5UF5tquRE3/Sx/Ycwh2CrKLq r6seL2Cc9jWKeA45CZYhogKzJREH9m9C7xgvAOgYf1zjB/0qlmLcxFuwCRQQSOkj5A/V sa0A== X-Gm-Message-State: APjAAAV/Tz0XNqW3WwQQ9ggMFoOfQnBa7XjUijfnw2Ym92WXr9ZjUHPl 4Q1SGSOP5B3BsM6DlwIH9/MYEkVi4b8= X-Google-Smtp-Source: APXvYqzKBM8S4/gxZj7U6bhmHV+xFdNYFJfwakqSIYhCFaJQec9dKSzj2HPn2exq7KoRr+jLk9wS6w== X-Received: by 2002:a7b:c403:: with SMTP id k3mr1434055wmi.58.1554161995002; Mon, 01 Apr 2019 16:39:55 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id r30sm27943044wrr.46.2019.04.01.16.39.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:39:54 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 00:39:40 +0100 Message-Id: <20190401233940.5941-9-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190401233940.5941-1-sw@jkqxz.net> References: <20190401233940.5941-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 9/9] av1_parser: Reindent 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" --- libavcodec/av1_parser.c | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index 4a743d92d4..b848b41050 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -88,43 +88,43 @@ static int av1_parser_parse(AVCodecParserContext *ctx, seq = av1->sequence_header; color = &seq->color_config; - ctx->width = av1->frame_width; - ctx->height = av1->frame_height; - - ctx->key_frame = frame->frame_type == AV1_FRAME_KEY; - - avctx->profile = seq->seq_profile; - avctx->level = seq->seq_level_idx[0]; - - switch (frame->frame_type) { - case AV1_FRAME_KEY: - case AV1_FRAME_INTRA_ONLY: - ctx->pict_type = AV_PICTURE_TYPE_I; - break; - case AV1_FRAME_INTER: - ctx->pict_type = AV_PICTURE_TYPE_P; - break; - case AV1_FRAME_SWITCH: - ctx->pict_type = AV_PICTURE_TYPE_SP; - break; - } - ctx->picture_structure = AV_PICTURE_STRUCTURE_FRAME; - - switch (av1->bit_depth) { - case 8: - ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY8 - : pix_fmts_8bit [color->subsampling_x][color->subsampling_y]; - break; - case 10: - ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY10 - : pix_fmts_10bit[color->subsampling_x][color->subsampling_y]; - break; - case 12: - ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY12 - : pix_fmts_12bit[color->subsampling_x][color->subsampling_y]; - break; - } - av_assert2(ctx->format != AV_PIX_FMT_NONE); + ctx->width = av1->frame_width; + ctx->height = av1->frame_height; + + ctx->key_frame = frame->frame_type == AV1_FRAME_KEY; + + avctx->profile = seq->seq_profile; + avctx->level = seq->seq_level_idx[0]; + + switch (frame->frame_type) { + case AV1_FRAME_KEY: + case AV1_FRAME_INTRA_ONLY: + ctx->pict_type = AV_PICTURE_TYPE_I; + break; + case AV1_FRAME_INTER: + ctx->pict_type = AV_PICTURE_TYPE_P; + break; + case AV1_FRAME_SWITCH: + ctx->pict_type = AV_PICTURE_TYPE_SP; + break; + } + ctx->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + + switch (av1->bit_depth) { + case 8: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY8 + : pix_fmts_8bit [color->subsampling_x][color->subsampling_y]; + break; + case 10: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY10 + : pix_fmts_10bit[color->subsampling_x][color->subsampling_y]; + break; + case 12: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY12 + : pix_fmts_12bit[color->subsampling_x][color->subsampling_y]; + break; + } + av_assert2(ctx->format != AV_PIX_FMT_NONE); end: s->cbc->log_ctx = NULL;