From patchwork Tue Dec 5 08:12:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 6554 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5389739jah; Tue, 5 Dec 2017 00:37:08 -0800 (PST) X-Google-Smtp-Source: AGs4zMYjE8d3ki8VKZACNfGj060IOJdbNju+2SM5w+niGdADtKmFnMBS40/Wx09xZG6AZqEjYwBV X-Received: by 10.223.148.102 with SMTP id 93mr16318843wrq.32.1512463028481; Tue, 05 Dec 2017 00:37:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512463028; cv=none; d=google.com; s=arc-20160816; b=zgKJvHgrTnqH2u8eWNqMRsRrmUYwawZyPQ+X/pOW64y/+EMaZPoqJzO+SkWZScn5wP OoHSAF2UEb8yLRvc23hvS80xGEfVGWe/PoOF32abZUmzNVpyFuCWoSN1cb2UGN/OvpSr ojMxkdpVZXKoy0nV0UJ4IbfEXQRVwaURLrJQi718trg8nktnr14dEq8RpLcuni0gB9sn fuuPEq3vHOdwsxegZRpcjWNeiPgUPrcgoG6aDD7B7Qn/Bjlhygo4zZFnKAj5z4F73uT/ 7UGMyJqW3bINmwwJyodVcOTIc1HsQ20oKiFGC9olxv8qNhY6fHgo2zk8q/Wh4z1WDbiJ o8Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=i9UhglDNyKCEXZUArkeAXfP6eHgGM3XSr1AOTr9gDOQ=; b=OgMuuj5dFCG9ihiYy6WOqqRRVRRhfhas/ji7+N3nZho8UaPgtFbhXK145lIsIRbLT9 JEG3t++sDaNkvCMEL/7A9aToU/edYCVsVBhw4LckRfY3rY18IZ6poJGHAmsTumHmiuqE Yga9VWFhn2mIVEYKwBYr/6dwNCQh8aQ9HlKZk5ahP5hAK+yyqWTy6KJFUYqH49zoudiw EQZZ4+8ssthNaEuORn6JWMoNWo31R8qPTH26NcG7QcKRNKhgNSige6vyzx9kYYA6bo2z 88Bi0Wpaj/Uy1PtVVQn5fDYAJrXG/bVdr01uLIudQ56sfB0zmHn7ZvU3P10KptVYKtYj 65aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LfinNSWH; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t191si6233537wmt.190.2017.12.05.00.37.07; Tue, 05 Dec 2017 00:37:08 -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 header.s=20161025 header.b=LfinNSWH; 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 2EA2968A1DB; Tue, 5 Dec 2017 10:37:01 +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 DEF7F68035F for ; Tue, 5 Dec 2017 10:36:53 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id q20so10215697pgv.2 for ; Tue, 05 Dec 2017 00:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=m+icG2xGzE8XW69al5MiFCqUcu71CVyvqzPpK/6gjOE=; b=LfinNSWHjcrzOtPe1zs3ghdxpnX+JhYo2wL53oVSM8AaJ3M61lovB5lmEMukdQiG0P QJqu3IX9LxaFTg4/SSsGfdMx+wjy5SxXsGHIKnvDsuVqVa7hE+C9OCBknU0NlYk5zLek GpM0HuRyK2+wGaI5YZOgx67Mmrmkd/FBVwMaRgPyshkXb3Sn7+xb7CkkVtICEDjlcFJY r5YhXMwvnWcZz9re53LOi8F04kZRMIOcG4zgk33SG63vU0EOA5V5E2Jebc9YTtKsyU5c 0sBb2oZUCJQmCnssi4PNBNb7qdNGqfi0T5yYL6KCkY9OVm9aO8K4x1mmpfjR3rWAMMoX UwVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=m+icG2xGzE8XW69al5MiFCqUcu71CVyvqzPpK/6gjOE=; b=I1CaEdDWtjk1fnPxUUfQtmnjygTYDojUiSZq4UOauGqNcVHVrLPPJaOhYHgXnzB9dg MbW0z/1xC5jmOyUQz2msMm1kGqx47OJCxr5v679d08bLoLypKTn8G+XdQYyuEOiBp3Cl uUjkzDgoiRFfx5WGmthi9VtQMov9TVmkz5p6fByqu9tKjSvC2bPNq98PpZu2vDnlL7xy fmhITOsoCA44KTDC236TKf6aJK11E5LDD2/IIpHSZW1OZALjs4SuVpg/ErgpdeCv+E7a MilojqnnXtNXzGY96fulyk7Zp5IcvQw/nybToB6vGjL2ppbXOtAyhMB2EwPaKQULEbsk 1raw== X-Gm-Message-State: AJaThX4OhRAA7zM6tORMi/bIrqVp8h1N4pIyHKZ3V1PORADsip0X1+OT +XbvbmTOiwby6CBAt+AOOAiYrucw X-Received: by 10.101.98.2 with SMTP id d2mr16399954pgv.287.1512461530687; Tue, 05 Dec 2017 00:12:10 -0800 (PST) Received: from [192.168.1.105] ([103.206.133.250]) by smtp.gmail.com with ESMTPSA id y5sm27001546pfa.128.2017.12.05.00.12.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Dec 2017 00:12:09 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: Gyan Doshi Message-ID: <398ccb48-4ded-9bfb-7508-2a305654ad80@gmail.com> Date: Tue, 5 Dec 2017 13:42:03 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avcodec/libx265.c - Add named option to set profile 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Attached patch allows users to set x265 encoding profile. Addresses ticket #6894. Regards, Gyan From e45cd99804dab980d3441c0450b22c5b69b18474 Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Tue, 5 Dec 2017 13:17:53 +0530 Subject: [PATCH] avcodec/libx265.c - Add named option to set profile Adds call to x265_param_apply_profile after x265_param_parse. Added as private option since HEVC profiles other than Main, Main 10 and MSP in AVCodecContext are consolidated in a single constant. --- libavcodec/libx265.c | 10 ++++++++++ libavcodec/version.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4456e300f2..2e144e1618 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -45,6 +45,7 @@ typedef struct libx265Context { int forced_idr; char *preset; char *tune; + char *profile; char *x265_opts; } libx265Context; @@ -220,6 +221,14 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) } } + if (ctx->profile) { + if (ctx->api->param_apply_profile(ctx->params, ctx->profile) < 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid or incompatible profile set : %s.\n", ctx->profile); + av_log(avctx, AV_LOG_INFO, "Profile must match bit depth and chroma sampling of output stream.\n"); + return AVERROR(EINVAL); + } + } + ctx->encoder = ctx->api->encoder_open(ctx->params); if (!ctx->encoder) { av_log(avctx, AV_LOG_ERROR, "Cannot open libx265 encoder.\n"); @@ -392,6 +401,7 @@ static const AVOption options[] = { { "forced-idr", "if forcing keyframes, force them as IDR frames", OFFSET(forced_idr),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "preset", "set the x265 preset", OFFSET(preset), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "tune", "set the x265 tune parameter", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, + { "x265-profile","set the x265 profile", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { "x265-params", "set the x265 configuration using a :-separated list of key=value parameters", OFFSET(x265_opts), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE }, { NULL } }; diff --git a/libavcodec/version.h b/libavcodec/version.h index d67b689142..3b5c3000be 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 6 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MICRO 103 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \