From patchwork Wed Dec 7 09:31:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39641 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp415891pzb; Wed, 7 Dec 2022 01:33:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf47qnDERW/87YfxYAYSp4sNB3Aq292e1hx7nM2JcPAH7Y3sroo+7ou1n+5RDLbtCrnz7M3j X-Received: by 2002:a05:6402:401a:b0:46c:b463:da06 with SMTP id d26-20020a056402401a00b0046cb463da06mr11686775eda.104.1670405596741; Wed, 07 Dec 2022 01:33:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670405596; cv=none; d=google.com; s=arc-20160816; b=wS61Lp9oihtCzWjuF0Y32L/TLOSIdWF72kFQfalGBgH7pfHLV+Fp3NPFqWc6dO27ab DHskMVITcX4235PoUO0C5Fg5EYaVFeUTSW4PeNSs82Hobo+eAYxu9WBYfWMSeX5Lpdn0 655e9s0/T6peL0rzAl12wO5Sqwe1SxpUe5LISMOm1iZ23OCGwZ1p/Juda0gjIEMW5upI olnxuMRfn/6bn8eimxh4FVAXYIFCrPSY482YuipNP5tIah0ED9mXWMdrQqdL8UImJjhG JyiH3rxOYx2DymGKrZFhvBWgVvfVVZOQqTeBxecpK0CTSC3c4PpTGi7ljvAWO6wvFfkZ QPuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=jrNjwN172pzJ+Cz9iCCcdELjgI7vPxMOF9hrll2+ZRU=; b=N4afwanwjwNcFSie0eogUwJdZEfDWcTMUo4s11+vKwR9cPoOJakAej2k+Bxl/PZvg1 5DvjE9cEg9e8G+KWRQLT1TA9bshm0zzKYQCzCUpkY7M2i9l3rrb+vTQTrRO4ozF+RtBX d6xXngDs7dmJqaulJtqbk1D1br8JJ1tKpLkTHOotb1CkNh9y3z62rORu7OUxomco05fw PCpd/VMwogDwCRw9L6hLT1HjAQeIOu0OBRPj9zQUly06iffrDC5whTQ+is/6w58tfAl5 ykR7frlBu0ODm4bfgEYEChu7YPjISUUURf63nOMrOZP46aVH76RfW92RA4Y7+R1C/JJ4 mQ2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WPl3KVl9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hb12-20020a170907160c00b007c10a0c590dsi4321173ejc.25.2022.12.07.01.33.16; Wed, 07 Dec 2022 01:33:16 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WPl3KVl9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2739F68BDE5; Wed, 7 Dec 2022 11:32:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 321CE68BD6C for ; Wed, 7 Dec 2022 11:32:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670405524; bh=UvBKYU1qnWl6tP4/4+Qh+TnghxhTPhPqYHU4eVKNECY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WPl3KVl9mGJwxtpkyaBJ2Wam4CMbaMlTC3jTTwwSkcQ7BpgA+4b/kK3fzl+nnT48I P+zJSa6DuHM7X7vA1ilXx7wUKE03gHX9W3fQBjbqrqRM3P420ijRhnw9AHqvdv3cSG ryvwPVzVFWyE4hjoBpOA4N4ZymV3CIVBW6nsbgD4= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 7F9B046E; Wed, 07 Dec 2022 17:31:57 +0800 X-QQ-mid: xmsmtpt1670405522t5do606kq Message-ID: X-QQ-XMAILINFO: MC9b57iUs2xBjbKtSlR7oJxk17C0UnOuSLrGsDyMDUjZjFE5SHQLrYw74398xz 5ljShGljRENtLzior/V1u25zt/C7gzHybHle4E8hzyKgWnNjL5Rgb1j7xkjcMDxgpYuvpfYPhCu4 FNptfJkw45FlPgWEEhd0XT+a6Q2SoLTuGFWg+NVihHO9ZU3NPBqBKb0rLlA6nJ1zFQ7Ttko4zGXH I6HcMOYsLm0NMu7bfREIw8RKoW0/ED+/eeo7FV28h+uOkhfGK9YPhjxLar3tI5mcwNG4NyUxQQwZ YPUCakjPrqINJI7DZo/sUnwmd/WF/iaONd8Uoz1xB0LfLWLEqzJbcw4XL0tWA2yKy+um+j1o0emG ZNAEBkBiBVXz1qcxsrbwYeyNm4T4GksSZ+tgC8l+1dVNCcnEHBXQE5zNae1eIRrTO+KiCnXn31n5 CHV2Y0VcD4bLrUqoN15LPMT18SqM+wwXSa59u5lcNlNmGjqL76xPliELOoJc4a7uwvn6UN6uF+uB R47KG/t3W30iPclScGhU7DecE2X2/sztR6C8FVuDCOzeqtqnTEbjznPqZeenklcZx74QdD33vxXK 4W9rgMSV8zgtM7+i5ovaScA58PQZ1WY04qapEmzlxK8aO91yVr68XaSvZuwhFyynbqmeLn4Lychq nqq16dVuIPhl7KVKO8GsUGs0ZKGc5Tq6iuiLcu6WzlNjD4LF42G4eEpIMmSe6lMiJQ8UbFEpeoUV 5q/Y5b4fSIGbVEwfsEey0L90t/Tcnq3GQiR7qJ596y7qNXh0DtvPr2lMXE1Nn+G8fw5K2aBAwUC9 pmx/hXy+QhG4KRWCHeaSW1UZF8U89MwFdJp1CuLhXMoPj4przTzCEkUNGrg+EUC0mP1eEIIVpLEf 3kHJI2KiTX83UBltEW7w/U/hJ5f8jd8WZRdgoJc5qDhlolZJ4jM8y/cnPxE+R/yfWk2ACFFZBkDo JRtfyp881Zi0RVfh4Fy7pZcHl4trjBA5hKb5tOHth+BPkgTiX/SUMPTt6TwLBb From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Dec 2022 17:31:22 +0800 X-OQ-MSGID: <20221207093122.553668-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221207093122.553668-1-quinkblack@foxmail.com> References: <20221207093122.553668-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 7/7] avcodec/mediacodecenc: add pts_as_dts option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: vZU/rcDdyvtG From: Zhao Zhili It works since most of Android devices don't output B frames by default. The behavior is documented by Android now, although there is some exception in history, which should have been fixed now. --- libavcodec/mediacodecenc.c | 8 ++++++++ libavcodec/version.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/mediacodecenc.c b/libavcodec/mediacodecenc.c index e9cff8167a..41b7afe23d 100644 --- a/libavcodec/mediacodecenc.c +++ b/libavcodec/mediacodecenc.c @@ -71,6 +71,7 @@ typedef struct MediaCodecEncContext { int bitrate_mode; int level; + int pts_as_dts; } MediaCodecEncContext; enum { @@ -266,6 +267,8 @@ static av_cold int mediacodec_init(AVCodecContext *avctx) } if (avctx->max_b_frames > 0) ff_AMediaFormat_setInt32(format, "max-bframes", avctx->max_b_frames); + if (s->pts_as_dts == -1) + s->pts_as_dts = avctx->max_b_frames <= 0; ret = ff_AMediaCodec_getConfigureFlagEncode(s->codec); ret = ff_AMediaCodec_configure(s->codec, format, s->window, NULL, ret); @@ -358,6 +361,8 @@ static int mediacodec_receive(AVCodecContext *avctx, } memcpy(pkt->data + extradata_size, out_buf + out_info.offset, out_info.size); pkt->pts = av_rescale_q(out_info.presentationTimeUs, AV_TIME_BASE_Q, avctx->time_base); + if (s->pts_as_dts) + pkt->dts = pkt->pts; if (out_info.flags & ff_AMediaCodec_getBufferFlagKeyFrame(codec)) pkt->flags |= AV_PKT_FLAG_KEY; ret = 0; @@ -548,6 +553,9 @@ static const AVCodecHWConfigInternal *const mediacodec_hw_configs[] = { 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_CBR}, 0, 0, VE, "bitrate_mode" }, \ { "cbr_fd", "Constant bitrate mode with frame drops", \ 0, AV_OPT_TYPE_CONST, {.i64 = BITRATE_MODE_CBR_FD}, 0, 0, VE, "bitrate_mode" }, \ + { "pts_as_dts", "Use PTS as DTS. It is enabled automatically if avctx max_b_frames <= 0, " \ + "since most of Android devices don't output B frames by default.", \ + OFFSET(pts_as_dts), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE }, \ #define MEDIACODEC_ENCODER_CLASS(name) \ diff --git a/libavcodec/version.h b/libavcodec/version.h index 61bdf5806b..dd90cd1335 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 54 -#define LIBAVCODEC_VERSION_MICRO 103 +#define LIBAVCODEC_VERSION_MICRO 104 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \