From patchwork Wed Feb 8 19:21:59 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: 2469 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp126760vsb; Thu, 9 Feb 2017 10:46:11 -0800 (PST) X-Received: by 10.28.143.5 with SMTP id r5mr24186250wmd.141.1486665971377; Thu, 09 Feb 2017 10:46:11 -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 130si34958wmf.4.2017.02.09.10.46.10; Thu, 09 Feb 2017 10:46:11 -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 5B502689721; Thu, 9 Feb 2017 20:46:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DFDA1689AC7 for ; Wed, 8 Feb 2017 21:45:52 +0200 (EET) Received: by mail-it0-f66.google.com with SMTP id f200so16615796itf.3 for ; Wed, 08 Feb 2017 11:45:56 -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=fLMDqmEBIx0v8EtrF+oPa2oxMvdYiB2NVk5CsjPcHeE=; b=J89bl3xOldIZDRX3sLOALz4shBSLKGcH3Me9LZJII+9k6jVZA4TgLwcFwIRvED5oH4 Nu/JqzY/ypnZSZTz7Q+GyA5qcTY5BuXKZ1mNyPJp3z+rGYS5XeFpQh3Jz2a/7esPArgb XS9RQNzYC73PSnEj7cc/YmRDUNi8wJlF7Ha0pBh9iNgA+DQl79OD/ZAQQ2oS8ac0AKjM ZUpuXkLLhXKZt2hk39JhnqlRNuWnLMDNkbQrro0Ib3aNjeKrsSLn25OW+YJMYj2xkWgB 1MUBcgk9zR8dIwgkZAojw8QbdLsUw10TYgGfqxwFZuMrNkWB85QI+VzMR0gkLxXPGluT Z1wg== 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=fLMDqmEBIx0v8EtrF+oPa2oxMvdYiB2NVk5CsjPcHeE=; b=g0BqFKt/HYkhxoCOqjOrQ0ecIZJKLnWVz8yJZ7y6cTvYCKx1OObYUeT5kL5brLEKGl 6M7F7WePjHftGADxduivnQaUQ8IRXerqQA4wrOPPMeeTvZNuSv/ZRTL2d70Z4d1YTBR9 1ck+URQYXoVD5vvNXEYhvSnE6aliuex9teYuFhCtVj2DQjh6EL+pp+pvLDsYGnCqzU6d 9byHBcuYzkOnlR1d/ELEXpy11/MVxq6AdTX12hUd/2/HADO5/1HqRNJrtVy+pIGhfhLf q+aqUdLKeYK6OzXYkI/V6AOZrssXl2kt222hFfKUEw02f5HNOKkp1jYLfr1YrvD34rkV FO0g== X-Gm-Message-State: AIkVDXLFZWsflFfz1FzYMLLHeDDTtDb2yv4ys85my5kP5YI/dzL2r/vJjF80CskRlH7Dlw== X-Received: by 10.99.113.85 with SMTP id b21mr28785864pgn.180.1486581729330; Wed, 08 Feb 2017 11:22:09 -0800 (PST) Received: from localhost.localdomain (h175-177-005-154.catv02.itscom.jp. [175.177.5.154]) by smtp.gmail.com with ESMTPSA id p66sm22264303pfb.88.2017.02.08.11.22.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Feb 2017 11:22:08 -0800 (PST) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Feb 2017 04:21:59 +0900 Message-Id: <1486581719-1464-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Thu, 09 Feb 2017 20:46:03 +0200 Subject: [FFmpeg-devel] [PATCH] omx: Add support for specifying H.264 profile [v3] 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 IOW. Now default/unknown profile means FF_PROFILE_H264_HIGH strictly, for both better coding style and preserving the original behavior. --- libavcodec/omx.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 16df50e..6ce71e9 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,21 @@ 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: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileBaseline; + break; + case FF_PROFILE_H264_MAIN: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileMain; + break; + case FF_PROFILE_H264_HIGH: + default: + avctx->profile = s->profile; + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + break; + } err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); CHECK(err); } @@ -884,6 +900,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 = 0 }, 0, 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 } };