From patchwork Sat Feb 11 22:56:39 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: 2533 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp776752vsb; Sun, 12 Feb 2017 23:09:29 -0800 (PST) X-Received: by 10.223.152.175 with SMTP id w44mr20560021wrb.151.1486969769862; Sun, 12 Feb 2017 23:09:29 -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 k29si4369829wmh.124.2017.02.12.23.09.29; Sun, 12 Feb 2017 23:09:29 -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 63201689DC8; Mon, 13 Feb 2017 09:09:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E14F689C1D for ; Sun, 12 Feb 2017 00:56:48 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id v184so5923889pgv.1 for ; Sat, 11 Feb 2017 14:56:52 -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=M6whI24g0siCnX2np4KdKpjfys+bpekKK+7OWj78k0s=; b=AyLkwUdqIgQ8KNeAbdNguN3E+SaDEeVHMOJHZZGMFLSLzS8kZOaJQ9fIOqKYNwArw+ UfhU9nMtAXvpSSdGdfYowXwR+bj78iuXFCwGC83i5XLDFwIuJJ/ktM/zgxv4ZzXbH0Ba joz752XM7vK92MnRDRxH6Mw225GmFBra+nii2w/ByjJxWtytjUyN8QzgQcvzmWYm7XUJ Is4VUprnAhPUJ+/EbkIF/J9pg0c5Df4TgVjVST5iqUn8IkeAdDgS/qhMMQEYm+wfClJe Q+QvrFmHmzkYp20blK7FN27QGlmw6XMH1JBpLeFL8bPpMTBgB6rrollescAKquyDgZ+P t71A== 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=M6whI24g0siCnX2np4KdKpjfys+bpekKK+7OWj78k0s=; b=iidaHOi6mco9i2LhjPcClHEQRIOCvOw+1R0V+g1/8532ns0ZgDn1q6joaogWhUWFNd vwTmlGDPn8nUkGtLHBpqwgNKWrr8fOHUweRwVqTdhXeiaiXw2ogonGNkVBKm13lfn9Iq fXJgSUOdCa1fo6/S9dEzmnz/xlVYzJNEJgmhthnKj1iGPeHlhlEg4zSwXqWJrsz3v1oM P7JDSR9GHtMxLlM/rcLdhTm7aMEPg3rC/NFWYhR7JhoWr37lNbxCik9T6+YiD9unHlh3 dYC3iyt2TJsumGQg5mMUJxdOD1tu6LRIyrF859y5U+mAT3+2j7ooF46rUcitwxarOfVw eGXw== X-Gm-Message-State: AMke39ld22wAoXdVKqU7cxqbvF/Dw+zkIrKt3dP5sktaM5+7EYXpwtVm5AbZVi724RWhBw== X-Received: by 10.84.131.129 with SMTP id d1mr3494304pld.41.1486853810696; Sat, 11 Feb 2017 14:56:50 -0800 (PST) Received: from localhost.localdomain (h175-177-005-154.catv02.itscom.jp. [175.177.5.154]) by smtp.gmail.com with ESMTPSA id s8sm12735277pfj.30.2017.02.11.14.56.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 11 Feb 2017 14:56:49 -0800 (PST) From: Takayuki 'January June' Suwa To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Feb 2017 07:56:39 +0900 Message-Id: <1486853799-3009-1-git-send-email-jjsuwa.sys3175@gmail.com> X-Mailer: git-send-email 2.1.4 X-Mailman-Approved-At: Mon, 13 Feb 2017 09:09:20 +0200 Subject: [FFmpeg-devel] [PATCH] omx: Add support for specifying H.264 profile [v4] 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 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 16df50e..cfe2613 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,32 @@ 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: + default: + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + 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: + default: + avc.eProfile = OMX_VIDEO_AVCProfileHigh; + break; + } + break; + } err = OMX_SetParameter(s->handle, OMX_IndexParamVideoAvc, &avc); CHECK(err); } @@ -884,6 +911,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 } };