From patchwork Wed Oct 31 10:23:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10859 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 4133C44C53F for ; Wed, 31 Oct 2018 12:54:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ACADC68A83C; Wed, 31 Oct 2018 12:54:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-112.126.com (m15-112.126.com [220.181.15.112]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 44D1368A744 for ; Wed, 31 Oct 2018 12:54:10 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=AoUBRL5i3YS7E0Fnoa 6i+fyq2vR9ofs3helriz3TDMc=; b=ZJZu8lyOpU1tsoKq0A2wLeg+juwp3k/klA NfQvvp4k295MdOBh1Ykb2agziniZ9j96Paxh/ousmHu73zbDhruRoAg/iTeN6mcz +m+FeSlWQEDLDu4uGCZ4m0v7K3Y7Om9SD9erJMbZfFzmt0FSjrkyUlkfCp2UuNnG TwwJ3ZOj4= Received: from localhost.localdomain (unknown [162.105.162.85]) by smtp2 (Coremail) with SMTP id DMmowAA3uoq5gtlbLHRICQ--.19287S5; Wed, 31 Oct 2018 18:23:55 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 Oct 2018 18:23:51 +0800 Message-Id: <1540981431-6995-3-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1540981431-6995-1-git-send-email-hwrenx@126.com> References: <1540981431-6995-1-git-send-email-hwrenx@126.com> X-CM-TRANSID: DMmowAA3uoq5gtlbLHRICQ--.19287S5 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1xurWrGr1rCF4DCF4rZrb_yoWDZrcEyF 1UJ395Ar1UWa1xJa1UJ3y5A3yfu3WF9r48K3W7trnaqrn3Ww4DXF4DXw1Ivw1F9w4Fqa4r CrW8Cr1vyw4DWjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0omhUUUUUU== X-Originating-IP: [162.105.162.85] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi4hvw6VpD6t9NQgAAsD Subject: [FFmpeg-devel] [PATCH v2 3/3] lavc/libdavs2: correct frame type setting 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" Signed-off-by: hwren --- libavcodec/libdavs2.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index a1815d2..d7bcaa3 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -94,11 +94,26 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, pic->widths[plane] * bytes_per_sample); } + switch (pic->type) { + case DAVS2_PIC_I: + frame->pict_type = AV_PICTURE_TYPE_I; + break; + case DAVS2_PIC_P: + frame->pict_type = AV_PICTURE_TYPE_P; + break; + case DAVS2_PIC_B: + case DAVS2_PIC_F: + frame->pict_type = AV_PICTURE_TYPE_B; + break; + default: + frame->pict_type = AV_PICTURE_TYPE_NONE; + } + frame->width = cad->headerset.width; frame->height = cad->headerset.height; frame->pts = cad->out_frame.pts; - frame->pict_type = pic->type; frame->format = avctx->pix_fmt; + frame->key_frame = pic->type == DAVS2_PIC_I ? 1 : 0; return 1; }