From patchwork Thu Aug 22 21:50:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 14669 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 3C4E8448B8D for ; Fri, 23 Aug 2019 00:50:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2627A68ACF7; Fri, 23 Aug 2019 00:50:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f67.google.com (mail-ot1-f67.google.com [209.85.210.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7566668AC82 for ; Fri, 23 Aug 2019 00:50:17 +0300 (EEST) Received: by mail-ot1-f67.google.com with SMTP id m24so6882209otp.12 for ; Thu, 22 Aug 2019 14:50:17 -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=MMyG/aOIInIAmGPZsHtEmq6D4ophCjUGHBePRH9TDzg=; b=E8GMuRGmpLYzXMPG3kyNAa9JG1CwJjy9UXY4py4qgPe7qe8m+tDUAuvE52j2dXsfZ2 QmtQpSb1/En6aY1Cyeks5eH0Jesd9XE0vklW3puHHq9vgGZ9ep1JAJO8D/IFcukBWbHt Pi25Z/LRnWf3DDX0oCYkooOKRSJ9w1+NmZEguq9xbHu6C1M2GjbmT8gqvSm9h51wnv2E dbP9yYF28U/uCXH9tvba4HoASwovt8uLVjKIxcZUrv91Smh4xk09yeYKX3RSLIeqTSwX DaMZE0K8Fcs6QQvo3qos6FvTzoKKYejJBPgUW8LMQ3IgDiJx4g01M//8kg1Q2EMcxBdQ P3jw== 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=MMyG/aOIInIAmGPZsHtEmq6D4ophCjUGHBePRH9TDzg=; b=e0DdIJ5i2l8DiC/vvsxInIAupOoE2RqAqd0LH9x0vgnXcOPWEkrUqigK1gYlJo1d3V lbLgHu4Yt0dq0k+95fVkrQT8L3oKtDsLlha/ssOLn9pmqMvs+fb+C2m688/L755wngd7 A4fEQr6g8r/f6tbkSnhkccuOSugk/AQ6yndZkhrvuDycp3FUmQfYMj9ZWh5aW/+AibdC mcIeGQnntHAY3LupTPvuRzlRa+oYqrmgNCrOwbcohWYANrr3jGduocvm9lKBuoYLgfi7 29EPLV7l9nezv0jcQyVisM1igb7Z3BchUvCA257h1xur3Jeki9/pQKvMMSvtf9iXsG4E lTpQ== X-Gm-Message-State: APjAAAWTJn6yq3v4AakjzvKEEEH7S4dhdcEeRMwXwWRvvEwT40Dv97BJ 2Vzyjo+51pszaEoql1sfapdtTeYtm5o= X-Google-Smtp-Source: APXvYqzCW0pn2H1uMQ9IoNrMKHMBA0HOc1+UZMkkvrtEB/8FBxaPTVWSjDyhfpNIrKIOm1pcVbaIKQ== X-Received: by 2002:a9d:2665:: with SMTP id a92mr1444081otb.51.1566510615804; Thu, 22 Aug 2019 14:50:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Aug 2019 14:50:15 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Thu, 22 Aug 2019 14:50:03 -0700 Message-Id: <20190822215004.12627-3-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 3/4] avcodec/omx: ensure zerocopy mode can be disabled on rpi builds 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 fixes https://trac.ffmpeg.org/ticket/6586 Signed-off-by: Aman Gupta --- libavcodec/omx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 8c722b573c..1a9a0715f8 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -644,10 +644,6 @@ static av_cold int omx_encode_init(AVCodecContext *avctx) OMX_BUFFERHEADERTYPE *buffer; OMX_ERRORTYPE err; -#if CONFIG_OMX_RPI - s->input_zerocopy = 1; -#endif - s->omx_context = omx_init(avctx, s->libname, s->libprefix); if (!s->omx_context) return AVERROR_ENCODER_NOT_FOUND; @@ -933,7 +929,7 @@ static av_cold int omx_encode_end(AVCodecContext *avctx) static const AVOption options[] = { { "omx_libname", "OpenMAX library name", OFFSET(libname), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, { "omx_libprefix", "OpenMAX library prefix", OFFSET(libprefix), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VDE }, - { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "zerocopy", "Try to avoid copying input frames if possible", OFFSET(input_zerocopy), AV_OPT_TYPE_INT, { .i64 = CONFIG_OMX_RPI }, 0, 1, VE }, { "profile", "Set the encoding profile", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, FF_PROFILE_H264_HIGH, VE, "profile" }, { "baseline", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_BASELINE }, 0, 0, VE, "profile" }, { "main", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_MAIN }, 0, 0, VE, "profile" },