From patchwork Mon Jun 26 14:09:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4123 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp933450vsb; Mon, 26 Jun 2017 07:10:17 -0700 (PDT) X-Received: by 10.223.177.213 with SMTP id r21mr14972682wra.119.1498486217641; Mon, 26 Jun 2017 07:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498486217; cv=none; d=google.com; s=arc-20160816; b=UVp+K79OrM3bXsBg0M5Dj7unESURhC2eQDnQTCxA6BeI/HW2p2C3CMOJ0XWPqJ4dq5 CwEwMOlZ3tcqmyCzZdm12Xqzjxwv3K6SF7wN78k087Pj2IulVLI68E5/OjSij3mU9aJo 85pzURIuCf0BOpSPTcKCd15IPIwAYQHBMraAf4cq6PkKXdLOXqNSkHJ9g1LMdLbLtvua Yv6lyhnvpm14RN4XiS3YHJCw2uM9XXFxZLb4VuhTQD9V/stTT9zpNX5vxRiBsFmVCDlp pspHu4fR7tJ2Dmmsva8QZF6rIrOk/6Dy1Sbx8Wria+78qdypdqNvKqNt6gPZ3A+KLZ5I ys5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=S365TkEeIxJ4+sg6PHgn3Fkz7M+eZH+zW8T80yJDNUs=; b=qIWhWKQkBTpoV/aqfBOHxYM7HS01pHS9IJx36Any9CuyzEhwf6wvq6saqvIQ863pwm jWL01xEvhzb/eCxRmfYaQBQ2+H9W1AR1nTBtnxZr1moFsnbKo1yJuDLW2AY3hh82OKOy 9LpUY5hM6L4tvyFtEdTUB2diXbfFfA8nsR0102/z91GrPpJx1EKtQ5e1UY/ohUzH6Wfs c5a3jodrh3HWN9IGngLRIUgpAFEr8fSdFePJO1ImPWZJlV13Kq5ai+Rxk/dfG+EVggXW nMzlb+ehcVINCdAAru+kmoQ2oYqfAlfEpiTeUktjN36ZXRHTX+ZFBvSFwU9Ubv3U34m2 NaOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=dxENW2nR; 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 200si162522wmw.0.2017.06.26.07.10.17; Mon, 26 Jun 2017 07:10:17 -0700 (PDT) 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.b=dxENW2nR; 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 C65C568A2D6; Mon, 26 Jun 2017 17:10:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45BD8689AFD for ; Mon, 26 Jun 2017 17:10:07 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id x23so29477205wrb.0 for ; Mon, 26 Jun 2017 07:10:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=yMOYsO1OmCY82M5cUkAz2BDp6+he9gpNtEqyJ1ElaYY=; b=dxENW2nRZObgZ+tkJZMnPtRg3C5tby9zobj7lTuJxyQ5iDaP67Gr1LKJ/Ps1EFrFFN d6fGJHaoAkhK4nkaU+G2v8vBX2O02yLcauwJH0Nd0ro+vO7orUIId2bXug38CSvXaWXq E2vLJDNnt3+lNhQ+EqEc3dKhMIC0MTMNGd8u+l6iibZP4af2j/iOAhFYqTrkcuWRiyLx ZF1TivGXV2kOFF84iTZb5ERvUiLnKaMAlWzjmcCtBX+lHsmvVx8RHihv8mjJ16A4IaqT HhCLaEAwU+XIWKmV+xhSPsAFhaDBJwdQBDU9QbiPC3MYk4gHL1tVmIRpffxNdaIQEM5t oS1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=yMOYsO1OmCY82M5cUkAz2BDp6+he9gpNtEqyJ1ElaYY=; b=oYOdJoRfP3JNQ1DV6j2X6/cj2pBxW6ZmgE2/Hy0cuhI3bW55g9X2h9yuH+5Q8rLhpP lY1sC7C+EJ659z9IobJHtCR8fS2dVb0/9k22Jh4qGnfuR0DOciuRGYCHQFXhg7YYjUhD AIooV7fzNp9a5294acsIFnKHVbkXmkJQvX1ZhcHhdap2h6pni5GXd5eUJBAwGYHuSggU Xs5R51A0sZVAUOYURitVdfgTRfXGV/TZah/JT1ZojPj6F+Gq6wlkK4VPxO5OaOjjBs+x bwY6Nfl4D+eUYOAHWwAowsGbZnkkCTdZMHQ6YJ1gLL4Jd+w649Npu6VVG4Mldb1QTrXv a+xw== X-Gm-Message-State: AKS2vOyc+NDeDNT2ASvJ9S9fYBHApp44mSu7TCjfcYoKRncQzppc1XbC 9PogWO0Q+Pb4R+Q4 X-Received: by 10.223.169.117 with SMTP id u108mr14601773wrc.17.1498486208134; Mon, 26 Jun 2017 07:10:08 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 199sm187324wmj.30.2017.06.26.07.10.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jun 2017 07:10:07 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Jun 2017 16:09:57 +0200 Message-Id: <20170626140958.2881-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/proresenc: switch default prores encoder to prores_ks 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Rationale: prores_ks have more features and is faster for qscale > 0 and gives better quality output. Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 2 +- libavcodec/proresenc_anatoliy.c | 14 -------------- libavcodec/proresenc_kostya.c | 17 +++++++++++++++++ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f0cba88..16dce40 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -477,7 +477,7 @@ OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o OBJS-$(CONFIG_PRORES_DECODER) += proresdec2.o proresdsp.o proresdata.o OBJS-$(CONFIG_PRORES_LGPL_DECODER) += proresdec_lgpl.o proresdsp.o proresdata.o -OBJS-$(CONFIG_PRORES_ENCODER) += proresenc_anatoliy.o +OBJS-$(CONFIG_PRORES_ENCODER) += proresenc_kostya.o proresdata.o OBJS-$(CONFIG_PRORES_AW_ENCODER) += proresenc_anatoliy.o OBJS-$(CONFIG_PRORES_KS_ENCODER) += proresenc_kostya.o proresdata.o OBJS-$(CONFIG_PSD_DECODER) += psd.o diff --git a/libavcodec/proresenc_anatoliy.c b/libavcodec/proresenc_anatoliy.c index 0516066..7ff6ff7 100644 --- a/libavcodec/proresenc_anatoliy.c +++ b/libavcodec/proresenc_anatoliy.c @@ -614,17 +614,3 @@ AVCodec ff_prores_aw_encoder = { .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, .profiles = profiles }; - -AVCodec ff_prores_encoder = { - .name = "prores", - .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_PRORES, - .priv_data_size = sizeof(ProresContext), - .init = prores_encode_init, - .close = prores_encode_close, - .encode2 = prores_encode_frame, - .pix_fmts = (const enum AVPixelFormat[]){AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE}, - .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, - .profiles = profiles -}; diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 09bb611..21c2673 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -1357,3 +1357,20 @@ AVCodec ff_prores_ks_encoder = { }, .priv_class = &proresenc_class, }; + +AVCodec ff_prores_encoder = { + .name = "prores", + .long_name = NULL_IF_CONFIG_SMALL("Apple ProRes (iCodec Pro)"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_PRORES, + .priv_data_size = sizeof(ProresContext), + .init = encode_init, + .close = encode_close, + .encode2 = encode_frame, + .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_INTRA_ONLY, + .pix_fmts = (const enum AVPixelFormat[]) { + AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_NONE + }, + .priv_class = &proresenc_class, +};