From patchwork Sat Aug 24 18:18:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14692 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 40B0B44918A for ; Sat, 24 Aug 2019 21:26:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29E8968A774; Sat, 24 Aug 2019 21:26:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFC926808AE for ; Sat, 24 Aug 2019 21:26:35 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1i1aeQ-0007Dh-4S for ffmpeg-devel@ffmpeg.org; Sat, 24 Aug 2019 20:20:34 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 1adRiqaHswlys1adRitODg; Sat, 24 Aug 2019 20:19:33 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=E5OzWpVl c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=pGLkceISAAAA:8 a=_oLOcFVozvCa6BNXNKMA:9 a=pHzHmUro8NiASowvMSCR:22 a=n87TN5wuljxrRezIQYnT:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 24 Aug 2019 20:18:25 +0200 Message-Id: <20190824181829.25724-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190824181829.25724-1-michael@niedermayer.cc> References: <20190824181829.25724-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfLJyJk9zOXdBBKl+yiH1S4QwzUr2znbxnFFA2vafryaBEVRa3g1iHn3Qwty3kkVPKV5PJTDGnnZwXbMK0hvn6ADtPoDhUWgwHhilJyMC6vYGpUDPoOp1 PhOfK7W3gYMwMgsyy+FYEUpzRxbQRD3Z/1l+Ia4LUPsVFzNLwdGqhboVtfHc5Pwk32bKtXhOyBxuW6CPGYEk/z25QfWVQYuoIdY= Subject: [FFmpeg-devel] [PATCH 2/6] avcodec: add FF_CODEC_CAP_SETS_PKT_POS 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: James Almer Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Suggested-by: James Almer Signed-off-by: Michael Niedermayer --- libavcodec/decode.c | 2 +- libavcodec/internal.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index cf9676e2ac..5976da78c8 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -434,7 +434,7 @@ static int decode_simple_internal(AVCodecContext *avctx, AVFrame *frame) if (!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_DTS)) frame->pkt_dts = pkt->dts; if (avctx->codec->type == AVMEDIA_TYPE_VIDEO) { - if(!avctx->has_b_frames) + if(!(avctx->codec->caps_internal & FF_CODEC_CAP_SETS_PKT_POS) && !avctx->has_b_frames) frame->pkt_pos = pkt->pos; //FIXME these should be under if(!avctx->has_b_frames) /* get_buffer is supposed to set frame parameters */ diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 5f964148fd..f9e87eacc6 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -68,6 +68,13 @@ * Codec initializes slice-based threading with a main function */ #define FF_CODEC_CAP_SLICE_THREAD_HAS_MF (1 << 5) +/** + * Decoders marked with FF_CODEC_CAP_SETS_PKT_POS want to set + * AVFrame.pkt_pos manually. If the flag is set, decode.c won't overwrite + * this field. If it's unset, decode.c tries to guess the pkt_pos field + * from the input AVPacket. + */ +#define FF_CODEC_CAP_SETS_PKT_POS (1 << 6) #ifdef TRACE # define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__)