From patchwork Sun Dec 4 17:12:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2708760pzb; Sun, 4 Dec 2022 09:14:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf5CbJFxhKKLuDhidUYQdkiVT1ZyaclefI/5MErxM7K4EJ1SsBysuoSWjeTuV+KEcl4MMnfw X-Received: by 2002:a17:906:2312:b0:7c0:bb4c:e792 with SMTP id l18-20020a170906231200b007c0bb4ce792mr10932877eja.618.1670174054177; Sun, 04 Dec 2022 09:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670174054; cv=none; d=google.com; s=arc-20160816; b=iiFVTUFM9WlY8tK26/kUAYcPxalknXtr4gIZoX+p3mVls9nNus3L4PWsUhuSp4WzE0 /Nd1FxVIzDy4GQeQMewjGw/CtzJSmH1UtdzW98T7ZKz33hp4jTRJjslBJ+4wjeswhRDj RHbcCDIeCIf3sjMiJSo9TGlHfNQmU+H58O4ru3m2oXxozCK+B6+uZFhzNOvV42+UoEdh StfMW3J2E2EQTD+/ct5g4OBIN1eRh2s2kOGZQ9R5YR8hdTEPYYsgsy3tgZnsNgqkffWi BCJLbwDMBjzfBIewJgdLRXlz2Qz6QSdij+W62uwEmHvMaYFyh0GW0bnw2qUJCK9SAlgk USaQ== 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=tRUwpVrReHZ84OAJWyZhLuFt3Gy1KhQL8YyAHB7E9Qk=; b=blMRB0xl/W9vEspKqUnz4tYpo1H9MMJ1KjpXfB/GNiXdF9mFK2pbNCoPqJfyQRCqt+ mMWJkEpk5Tdn9ibFwWruv6bcqQ0yHUvcYuiutnWwsmldpAd70moqLZkH9wljBPsU5Hh3 JmKYlUROz+27l5JKna5dTigYYnm9d7hxrT5WwMa4ZUq5IXYWHJCw/5YcDrAPmnr5B6pC 8A8Y+23AgKDTwVVzV+D6qVmUhVrZUpa8mmRplBazDtM+HchW8OGkxAvNa3QljtODiGJ4 jrQZ1GyI9r2xQVZHXAm4inKHtHpXD3/hMrmtlTRlr0Os72RpqUaZx6BKE7O+mK2pfBTS 33Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=DvVE0FPT; 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 sd39-20020a1709076e2700b0078db6f488cesi10815904ejc.112.2022.12.04.09.14.13; Sun, 04 Dec 2022 09:14:14 -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=DvVE0FPT; 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 57FF868BBE7; Sun, 4 Dec 2022 19:14:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 404B868BB07 for ; Sun, 4 Dec 2022 19:14:08 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1670174046; bh=LZ5kMA+86Jk6M3TCKGDTwD/Kmicz2IKywjcoe5bRFDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DvVE0FPTGWJKC3trchmEoZQr/tUpPSYTxbW7OE46byRPS7npqyRbHaVUMkey8hxuD cqt2Ne356SWt/fZlVdALBosCO4RNetZZPngT/VMGX2n+hyYCB2fq62qwUMb4BMdVfc UMWJhmgTN0RxCWgqhu0dzcHA5kcbeN1Saf8kll8k= Received: from localhost.localdomain ([14.153.79.182]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 334B3853; Mon, 05 Dec 2022 01:12:52 +0800 X-QQ-mid: xmsmtpt1670173976tsr74yko4 Message-ID: X-QQ-XMAILINFO: M310wetdPxmXkqF5YA1pwS/lTgObsfDQy0CUFpQ644M4CUbJ1zX2qowKXWTHdv 88UsJdbq4kmZqsVBnoIQmGeTLxLSzNMI6bDCk5ayz8HBx3I3W8M1kWgHgXHHDEwp8ujeE4r+H2M4 y7gbLGbCqmTioSYSKOo8EESN4L/Hdljm998MZYFFQ8WkwkqAarMV88jypCdIaszvJ1KWztlZjATe AXxzTKohX8viKJEodyZvBhJ6yYvEygYP/DSYKEHPQx3J9Iyji7133Tji4QsuZsztbeJVAGnoP2Ll 947ysAjjx3exeNHVu3k7ma1dZEpa1jXtYEyRYee84Wyr+zIBVU9qxZq9bihJdbS2Dzc0EchomFIM H4O/6vTxFQu5u7/ZZ3XvHpv1xgpacKiuuAs0NBmuwoMbSPdT7jgMO1j9lUKJzFrha8xSXYGeWFS4 SojPm3pXCcKLbilpFUZ6W+n6Puas3vGthGKBMSwlA0JEB3+FSFgR8gO6mA3/76ucw6X0T821bo4s FvoqiID/abxTQT1wt8ucYaWyW/LEyAxDYo7QNtIn8+jg5SG1b6OfpZxQhWTfDhf20LDFjfzTVZMX WTSVeXzv45829uDzPtbRUA+FbqSfAxscF5WUmPBWdy9I38lLXeO6Zp4mqALyTYUckgi6VtRFrTlt 7nq4zx3VT4cSrOeVE31bk/xmmwmyvramnFKXH7q3CPnY7iYX/qM3jMwG9hPzNqPt197hgRb0sRU+ 3tH3g8lC5NinTJMI3xjUopjMQmgkXUix0DH6gyFi1vkZZd3rpyykfxDysVzmelcazEP25D/N2pij VEwXZXONVHE4avFSo/3+OkHaS/RovkaZ3JKHmUxTpYB66gt2kWB2+9RTFhEktj9iFP6g8tHA9kUD WbgQiOuNcLPQoQ+jmNaZDoQbtk6fJk3wGy5iAgVUhzL5uqnsjf7F+jMqtVvjW3MljZJckW6dHAMG pOVvrgUdJkad2hjD+12KSDxw4U2BCetbaqeFzT1vuYlfCZy2NCmA8bn0qXbiDj From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 01:12:28 +0800 X-OQ-MSGID: <20221204171228.50160-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221204171228.50160-1-quinkblack@foxmail.com> References: <20221204171228.50160-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: LonI5oOrpHQU 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 9378563fac..3893ca8dee 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) \ static const AVClass name ## _mediacodec_class = { \ 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, \