From patchwork Wed Dec 5 11:42:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11285 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 1F8F744CA83 for ; Wed, 5 Dec 2018 13:42:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD60068A690; Wed, 5 Dec 2018 13:42:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC54D68A634 for ; Wed, 5 Dec 2018 13:42:39 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id j2so19360647wrw.1 for ; Wed, 05 Dec 2018 03:42:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=EeUa3le9Qp9qL4P5WMwHCLS4wHjW322Be4le52wxFpM=; b=eaJptqmx6aN8sEmA24CLBf60BVVPWD3fcL5lEv8yQgTcExjdz5IGI2BgjsEIavsTyi azgvbGkDI+exLhjzaehWVbQLjhXYElWsqsHHp5F31QB0s5vxwgVaSMrrINz9q0zNljl5 S31CfOJU8evrSbaV4EVoCCO7qHmFG1KZcknjRh+RkXYe7NfFuXlVVLJJDuWjDQVq4jHA /9k82YeloBVR29B7uxcQWlWp0dhLpp2cuXtD96y28exbcIRtuUZMgsmiSvuTeXu6d7Tu ZAYXASKOaKoXZBbp+uSez3QYSvepyojur6JhCeSEgtgNOqev+0D26qtg6ziLRyYnhjMm cayw== 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; bh=EeUa3le9Qp9qL4P5WMwHCLS4wHjW322Be4le52wxFpM=; b=M0NL1tX5xYOxiisuRc/bDTO3Mq5E6K9OakvLZqDsi9PVwukXUKQB6ujXgHbDDIE0ON 4vriyLWwDmN4xSwkADdNcsxP7oidt+oGQ9GNUT3vQAMvsCUUPN/+6mz6M0NN3J8lzRST RoUC5zP15/w9sJqPesnJ6E9CmBkEq0uQ5jn6D/uigjfzH9eSxXcRc88EetftwQ993LJm oflSIZ+tF2lAuFwVAucId5rnMbGpvStcOX3/ABPhhzSv4dnZxJfsntSurtyWMu6waJ0G rXxujn+Kr18PsRFw4yMzY2017ZeoKEZrbnO3lSX2kNSxZGc6HmeN2j8U4qB6Wm91idcS x1WA== X-Gm-Message-State: AA+aEWaJUqLO8TxHsF3sfOmFBwHeCXunv2KqfDFRoCMaBeIshgoCv2y0 9ZL0tyhiYsNkVnRsTodojrD7b+DN X-Google-Smtp-Source: AFSGD/W952FmpjhpsOTvcVPfScObFTm5g76JuYw4mH/axn+OxIqXeAq8F0083SZTEruFhzHu82VKjw== X-Received: by 2002:adf:9168:: with SMTP id j95mr21115932wrj.217.1544010168013; Wed, 05 Dec 2018 03:42:48 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id c77sm17059678wmh.12.2018.12.05.03.42.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 03:42:47 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Dec 2018 12:42:39 +0100 Message-Id: <20181205114239.32233-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/h264dec: get field_order for typical frames 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is normally set by parser but parsing is not always enabled. Signed-off-by: Paul B Mahol --- libavcodec/h264dec.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 00d922fbe9..39142da7af 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -1018,6 +1018,24 @@ static int h264_decode_frame(AVCodecContext *avctx, void *data, } } + if (h->picture_structure == PICT_FRAME) { + if (h->ps.sps->pic_struct_present_flag && h->sei.picture_timing.present) { + switch (h->sei.picture_timing.pic_struct) { + case H264_SEI_PIC_STRUCT_TOP_BOTTOM: + case H264_SEI_PIC_STRUCT_TOP_BOTTOM_TOP: + avctx->field_order = AV_FIELD_TT; + break; + case H264_SEI_PIC_STRUCT_BOTTOM_TOP: + case H264_SEI_PIC_STRUCT_BOTTOM_TOP_BOTTOM: + avctx->field_order = AV_FIELD_BB; + break; + default: + avctx->field_order = AV_FIELD_PROGRESSIVE; + break; + } + } + } + av_assert0(pict->buf[0] || !*got_frame); ff_h264_unref_picture(h, &h->last_pic_for_ec);