From patchwork Thu Aug 22 21:50:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14668 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 507D6448B8D for ; Fri, 23 Aug 2019 00:50:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3558468ACC7; Fri, 23 Aug 2019 00:50:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f68.google.com (mail-ot1-f68.google.com [209.85.210.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8BBD68AC7C for ; Fri, 23 Aug 2019 00:50:15 +0300 (EEST) Received: by mail-ot1-f68.google.com with SMTP id o101so6893120ota.8 for ; Thu, 22 Aug 2019 14:50:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/6Go/PhpqhdCry/CB9iPooh/UYuuwcE8XF++vawnG6I=; b=hBFxHBwDF4I6eu0mjfTuCy2wK7WllXQgo5LL95ipzewsotObz0/IOAyK5ov52wOuLG BpkSNC67Qb3CKJbUAZ8rfzBMKFLjT2zcvZ6LFXKQyz2qzGb09P+Cdl9j88bk6gLf1RF/ TVAV5iEnNYzxCaO9O6pg6ZQ7sxDDbwPGg2lZy90mmvCntGYFYkI2vN1UVWRD3df+y8i/ HULuvBHNTVVLZs6HGXKP72NW+UaM1P2cWuynap4WiwiyKvMT5zZ6SUuD3/Zco34jTzZb TvpNENMnluUyfnVDhZY5oKZ0+fgnIwqVadIc6C1oIPBcoQ3L6htmcDY4cI5Th7LDdqNo w3eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/6Go/PhpqhdCry/CB9iPooh/UYuuwcE8XF++vawnG6I=; b=EwEOX+Gifiq8oTAFSdOHe9uiyC1AlZQQVlQweGzHb678v0M62mdY/JNmCGdUskhkJ0 gnAoclnJhzx8zroprQ0EYlqFowtaK3ZRwX7sh8Yi1St8kAzFQV3zZHP6jdeVhYXjRyxz +tbUaZG28pS8GNLtkczexq9jR4Qx3qWWQ80qzj3zg424J36TMEDEelDWyVMmq2dIVXoV JkNHV3UB1eheGAZM7Od5y7Iy4EKf+WYn+AicliBCribfayXt3Fq6QJ5+CJrUL+44/gj2 gq8gFDFnfuooa9FyNONuE2xh3UF9b6lzZt+l/ANVUgQORK+9FbhuSc3fgWwClLBrP9Xs vRvg== X-Gm-Message-State: APjAAAXe2GVsJiL93MhSwWYbGwapJPYSWMBnyFAydm/EzJMPVQWcFf2X BS6gUSkdAv31pbtu+YuQ0H3xu9aoYsU= X-Google-Smtp-Source: APXvYqx0weLRmJhTox6ae4GFfYDW+FhDxptbG/jiI7s0ak6/yStFK1vckPGPWSrmDX4M5HILMX/8vA== X-Received: by 2002:a9d:12d1:: with SMTP id g75mr1479705otg.189.1566510614339; Thu, 22 Aug 2019 14:50:14 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id j189sm244910oih.30.2019.08.22.14.50.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 14:50:13 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Aug 2019 14:50:02 -0700 Message-Id: <20190822215004.12627-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190822215004.12627-1-ffmpeg@tmm1.net> References: <20190822215004.12627-1-ffmpeg@tmm1.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/omx: add support for -force_key_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 Cc: martin@martin.st, Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavcodec/omx.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index a1e5a46a54..8c722b573c 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -802,6 +802,26 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, // Convert the timestamps to microseconds; some encoders can ignore // the framerate and do VFR bit allocation based on timestamps. buffer->nTimeStamp = to_omx_ticks(av_rescale_q(frame->pts, avctx->time_base, AV_TIME_BASE_Q)); + if (frame->pict_type == AV_PICTURE_TYPE_I) { +#if CONFIG_OMX_RPI + OMX_CONFIG_BOOLEANTYPE config = {0, }; + INIT_STRUCT(config); + config.bEnabled = OMX_TRUE; + err = OMX_SetConfig(s->handle, OMX_IndexConfigBrcmVideoRequestIFrame, &config); + if (err != OMX_ErrorNone) { + av_log(avctx, AV_LOG_ERROR, "OMX_SetConfig(RequestIFrame) failed: %x\n", err); + } +#else + OMX_CONFIG_INTRAREFRESHVOPTYPE config = {0, }; + INIT_STRUCT(config); + config.nPortIndex = s->out_port; + config.IntraRefreshVOP = OMX_TRUE; + err = OMX_SetConfig(s->handle, OMX_IndexConfigVideoIntraVOPRefresh, &config); + if (err != OMX_ErrorNone) { + av_log(avctx, AV_LOG_ERROR, "OMX_SetConfig(IntraVOPRefresh) failed: %x\n", err); + } +#endif + } err = OMX_EmptyThisBuffer(s->handle, buffer); if (err != OMX_ErrorNone) { append_buffer(&s->input_mutex, &s->input_cond, &s->num_free_in_buffers, s->free_in_buffers, buffer);