From patchwork Tue Feb 28 20:42:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takayuki 'January June' Suwa X-Patchwork-Id: 2718 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.149 with SMTP id x21csp2071685vsf; Wed, 1 Mar 2017 11:00:17 -0800 (PST) X-Received: by 10.28.214.144 with SMTP id n138mr4552615wmg.136.1488394817664; Wed, 01 Mar 2017 11:00:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o39si7682622wrc.14.2017.03.01.11.00.16; Wed, 01 Mar 2017 11:00:17 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 479CC68832F; Wed, 1 Mar 2017 21:00:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0AA868825F for ; Tue, 28 Feb 2017 22:47:56 +0200 (EET) Received: by mail-pg0-f68.google.com with SMTP id s67so2907299pgb.1 for ; Tue, 28 Feb 2017 12:48:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=DOkjJWsVx6oXQ/QgUk9nfGM4NyQrGtwC184nUG1JR4k=; b=M5N4/VgPqmLEAqXchJgL1H7iFq1lmaatl84z1MsqWbX1ZCxg37HL4VOF6D4Ue4NRBq Wf+uB5lEoWo6c/YGxbBogpETgBbR/MaYVuZ0G1ecjg3U8t62lUBNU4I6UBJvhK/d33we YOZ8tahzzdy8Oce+g/CzntMSvcdJtu3aq/2lcHsUnefW5YBS9uX7uQqCivfuZXHYshin tgZfkTzqKNouuffHtpMQmDBeVSIFUTwaq6kXvQcZJGai4JcOrTP6rBBKCmGZD3PuF93h IQRgAz1Hfun76pIFK7278MRdRiWfpQ03b1zYVk90E49cdHY2ktA8aydZppiqrh9xXEFa /gsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DOkjJWsVx6oXQ/QgUk9nfGM4NyQrGtwC184nUG1JR4k=; b=K2CDS3Ma0zIhN4CfNj/HcWdhTNDrvHarpULix2pCtmiA7zmFFaZ16FPjlUBwy3uXMf VokmGFkGeGCfkz4YdEJ3xSS9tPA4bXseIXqt/goqpv8YQunwCBjVrYYWX1ITQG1w64fB +QbhnJwGYAOBWDxyLl2R399yX3LIBfnvNAkmjpF1BWAK7jP0laWytgNGaGAmmc+zv45f fdpibbPWTysH4+BSkyhUZaTI9bIpWEfhPbkCFQQFLGnNd7Dj0NhVZEInnmKZLChfjHlz eZIWcG/d2Cu+F+lSDGE0Sw7lbaAqKbTftZCD2eRUK7qoQwSDebYJ43VotROJqw+6peP3 fkjA== X-Gm-Message-State: AMke39myogFtpp9aC8PBWc8XYvjNDSAwkDnc113gMZ/FH35CQPMADhWmyhLMub8TO164FA== X-Received: by 10.99.237.17 with SMTP id d17mr4599035pgi.82.1488314556898; Tue, 28 Feb 2017 12:42:36 -0800 (PST) Received: from localhost.localdomain (h175-177-005-137.catv02.itscom.jp. [175.177.5.137]) by smtp.gmail.com with ESMTPSA id o26sm5939072pgd.25.2017.02.28.12.42.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 12:42:36 -0800 (PST) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Mar 2017 05:42:29 +0900 Message-Id: <1488314549-11799-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Wed, 01 Mar 2017 21:00:01 +0200 Subject: [FFmpeg-devel] [PATCH] omx: Add support for specifying H.264 profile [v5] 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: Takayuki 'January June' Suwa MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Takayuki 'January June' Suwa This adds "-profile[:v] profile_name"-style option. --- libavcodec/omx.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 16df50e..c0d64e2 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -226,6 +226,7 @@ typedef struct OMXCodecContext { int output_buf_size; int input_zerocopy; + int profile; } OMXCodecContext; static void append_buffer(pthread_mutex_t *mutex, pthread_cond_t *cond, @@ -523,6 +524,34 @@ static av_cold int omx_component_init(AVCodecContext *avctx, const char *role) CHECK(err); avc.nBFrames = 0; avc.nPFrames = avctx->gop_size - 1; + switch (s->profile) { + case FF_PROFILE_H264_BASELINE: + avc.eProfile = OMX_VIDEO_AVCProfileBaseline; + break; + case FF_PROFILE_H264_MAIN: + avc.eProfile = OMX_VIDEO_AVCProfileMain; + break; + case FF_PROFILE_H264_HIGH: + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + break; + default: + break; + case FF_PROFILE_UNKNOWN: + switch (avctx->profile) { + case FF_PROFILE_H264_BASELINE: + avc.eProfile = OMX_VIDEO_AVCProfileBaseline; + break; + case FF_PROFILE_H264_MAIN: + avc.eProfile = OMX_VIDEO_AVCProfileMain; + break; + case FF_PROFILE_H264_HIGH: + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + break; + default: + break; + } + break; + } err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); CHECK(err); } @@ -884,6 +913,10 @@ 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 }, + { "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" }, + { "high", "", 0, AV_OPT_TYPE_CONST, { .i64 = FF_PROFILE_H264_HIGH }, 0, 0, VE, "profile" }, { NULL } };