From patchwork Fri Mar 3 06:17:37 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: 2743 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.31.14 with SMTP id f14csp129934vsf; Thu, 2 Mar 2017 23:32:35 -0800 (PST) X-Received: by 10.28.234.20 with SMTP id i20mr1643470wmh.91.1488526355716; Thu, 02 Mar 2017 23:32:35 -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 r3si605271wra.194.2017.03.02.23.32.35; Thu, 02 Mar 2017 23:32:35 -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 4B2E2688296; Fri, 3 Mar 2017 09:32:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D733E68071F for ; Fri, 3 Mar 2017 08:24:05 +0200 (EET) Received: by mail-pf0-f193.google.com with SMTP id x66so8948398pfb.1 for ; Thu, 02 Mar 2017 22:24:17 -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=7nl/IRQib/3VVyv1nnZFA5rBxL4vMNiVsQLfwfg/pU8=; b=q6n8eFjjrEv0qapFK9shAA6xR3o8qi97gXYMGe50pA9ZtIRfU6FikthvyG1jySg0of 7zjVEd1wtI3EegY162hBNSBRgAJ1EakhEU/qVyfMgW50EApi5GZLvSXdvHZf0eMGMgVo kI4dxnNuMWDtak9YWV5cXxr0CbZuEhgWrLgSjJ9QfwB0WaMTO7nb2nn3N6nsXVzxGgLl 53WFywD0I3gwo1QQAJxtwEl7uZXIP6I8RjnhRjEgWL65cg5V3A0/9hKCkWzOo/2aq67u JZHBx5KeF8irWU4hbdclVrdQak613j6fxxoKQuNpJkMb1G9+Mz6YWWgC9r20QS/rR/sr 2MgA== 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=7nl/IRQib/3VVyv1nnZFA5rBxL4vMNiVsQLfwfg/pU8=; b=RmhOlCqwuWB8HrHctuAqcUvIJRCmJ3ky3OUStikBINkkh0/nkOJOVZC3ZFQRElxPWu RljPB3jiWJKc8v6KIX4aslm3eDPmdjdoDtPFPD9OuSUzbAdJ8hqKgKSixmJV5ywTPIj/ lKpXMtiNE4t2op2ehGPskhFHMKnFzBXH3+12zFUfnI6sxTjA5xLrZbPCRyyQRhC/d+TV ViEJwB5n+zKsIZ4NZY3Bc5BnbWDNAwpmejMTSMGJfTkQDnnRNa6cBjgKDo3lSjWOt93W nyO6lstT1A1xl9lf1o2GiMdzJMNTsme97HpQ7zx4H5YuA8Zbmrr3aXes+cva6CdJpC9y HmqQ== X-Gm-Message-State: AMke39k6xve7I+8dgYNNbeYGezd8ud8sHe3yLFYyl7WMp2H+2/jIhfdOuDYu1pTyoiyBrg== X-Received: by 10.98.138.67 with SMTP id y64mr1429320pfd.122.1488521866495; Thu, 02 Mar 2017 22:17:46 -0800 (PST) Received: from localhost.localdomain (h175-177-005-137.catv02.itscom.jp. [175.177.5.137]) by smtp.gmail.com with ESMTPSA id j62sm20748704pgc.54.2017.03.02.22.17.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Mar 2017 22:17:45 -0800 (PST) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Mar 2017 15:17:37 +0900 Message-Id: <1488521857-12617-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Fri, 03 Mar 2017 09:32:18 +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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 16df50e..19b4f33 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,19 @@ 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 == FF_PROFILE_UNKNOWN ? avctx->profile : 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; + } err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); CHECK(err); } @@ -884,6 +898,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 } };