From patchwork Mon Aug 23 21:47:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29745 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2457595iov; Mon, 23 Aug 2021 14:47:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwwDL7ClKUCdlukcJHwNUe01CxvdYr+1I2aMq78T7XRNy6Hy2Fx8MI9Am6K1HEUy/+etqe X-Received: by 2002:a17:906:580c:: with SMTP id m12mr37678569ejq.32.1629755268396; Mon, 23 Aug 2021 14:47:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629755268; cv=none; d=google.com; s=arc-20160816; b=wGhv6A1JO6GqR/XViCHzFuvNmTDec9qbibItaRbbDwjUt81mR82XLt4H/HcIhyUa0B yt53Z/uh/fQbSoM85sraN/PfTIxHQmGzt5Q7MKzEWwmiBD4v9jpXuXYjSGE9MjCv6tEU z+zMjaTaGk46s2dAs2fNq5uytkwfpBHt/s99RsX1n9J3iY0WtEWNqjxxpGx0UQmnXo1I fhtY6biOA5EJMbp1346lg4TMUE/aV9cvlpS/piqzTBM+5OdsTzqIwWpjOoqELatN/FZ/ GQCbwRooX5p27ujgdM9CvRy2pdBGg5HzJgFdFCVqFO48SGsAQFpukqzAr9EIJoVEDy06 5Otg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=g+/mIdh9gKtzLwvOlAZ8Gj6HANjvkrj2QdPzgOXPl50=; b=oXUBaqCj3r2Fo56ljt3Ln0Dfwa/FUwhHgph+GU2b4nDITHvB/RPXaRjdpSOhx6W0Bt RfLG7GlH56myhxH1FwC6t1U7+r/kLb6CZ99lllrE2PP+tEJcrzGt/evDGAHpUQUlceSQ V68zBUVDgoREIMxIJUpdLuY/jCMioQGfeZROPnUhda4IBLtZd3u0LYDgsKFxAG7uxjfj G+XZdfvJJmvcG3SvpJAglHrfBKrBPNPHu+Q7mtm8J7h5Ek8Q+N2j+AHZhlo2WB5lMszC uB+BVlUYj/cKM/BHmnTODAvyeGn3s4WPNn502OdJZRBtP47wVOH3zeX30BZt4xt18FvB htnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SxvJjbH8; 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=QUARANTINE 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 l4si3630669ejo.650.2021.08.23.14.47.47; Mon, 23 Aug 2021 14:47:48 -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.s=20161025 header.b=SxvJjbH8; 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=QUARANTINE 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 1EEB4689F2C; Tue, 24 Aug 2021 00:47:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CAD168092F for ; Tue, 24 Aug 2021 00:47:37 +0300 (EEST) Received: by mail-lj1-f175.google.com with SMTP id f2so34031700ljn.1 for ; Mon, 23 Aug 2021 14:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=9gQzmquMmaJCsAetq6QXhxzSCb1/GQ8ubkPYrns1AlQ=; b=SxvJjbH8KoRpoBu+AxjbHVLbOkUtAdeGmO7YmVPqj8vSkRK0nBun2rmHoOWtsSYEw+ 5x+mci00DtOB3fPhB1IFXXcHDv1QNxf8MlJiwfAE2VG37MsaVng9Mv8rz8aWSoIcvho1 HYeuqXKc2pyKJnFQpHGDuKgbp5JacTtltZxEDdYT4X+PxgS9ixEGg287qY7g4aKjqS8/ Qw+uUGSFgL/VAkdGWD0d8F0mWTTh6MajkjUCexByWKq3AP0GkRj8FRhhUsLlPcOpN8io HDu3oZOY8U8YrRGE6QaHtn8DYXuCY4zgm8evMCbCAWh821+jJukIwHt21oN6TdsBHWO+ 621w== 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:mime-version :content-transfer-encoding; bh=9gQzmquMmaJCsAetq6QXhxzSCb1/GQ8ubkPYrns1AlQ=; b=lY1jKNnLA8Wkj2esXKAixmC0X8h5YX8veKiUHcC+N/dH5rR04au22VMyEeIsBfKhhP YynYxWj3U3SlOVYejY+wCQp5EU0YpJm374sd/d8oTMraanRKfsy564kNVKJvzm8LwibU axUUyJIRh5AIXQO1xpkIEOZpXUOi6CijU50DBHAZtr+6oMOH2EMRwuTIybVj4MH8v09C UGPaxGnu5YhT3mtxCrdp/7hUrX1GHmy0p90hOiaVkAGmy8oML03z7ivR0Gdon5ylkMJh WC0AvZ5SxTx33p3Xx4GeQrWsQs6Lb6JLp7vu3HHCyj62gbTAEx431OJ0yIyXe0YAhPaY 4XlA== X-Gm-Message-State: AOAM530WVRiQmConiRy6FFPfu+KpCbcOMnwMi2yNSEqmsUA7H53DziFM HfwTrmOESgCbr4vVb97AfPRJnceEKAE= X-Received: by 2002:a2e:9304:: with SMTP id e4mr29294371ljh.244.1629755256133; Mon, 23 Aug 2021 14:47:36 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g38sm1704002lfv.210.2021.08.23.14.47.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 14:47:35 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Aug 2021 00:47:29 +0300 Message-Id: <20210823214730.25046-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libx264: add support for setting chroma sample location X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: QcIUMdSVxX3n --- libavcodec/libx264.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index d48e142e41..379c167e6f 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -870,6 +870,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.vui.i_colorprim = avctx->color_primaries; if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) x4->params.vui.i_transfer = avctx->color_trc; + if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) + x4->params.vui.i_chroma_loc = avctx->chroma_sample_location - 1; if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; From patchwork Mon Aug 23 21:47:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 29746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp2457676iov; Mon, 23 Aug 2021 14:47:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxp0kJZbtMCAhla0Zjjpdi1+xqfOQR99BuXWOp5hwZWlLiK7xM35++EEEJuuXJY8VpsQWkb X-Received: by 2002:a17:906:d154:: with SMTP id br20mr37410738ejb.296.1629755278108; Mon, 23 Aug 2021 14:47:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629755278; cv=none; d=google.com; s=arc-20160816; b=r4mEu2rnCQsO8MvescCfhk2A+DXFkCatUfRXSzCRlZWpZjjzkfx/YqXnWKBD37JrMG gMJwVnY91FdRGn2MxN6W6t6zQap2IIBfH7nmxBzd6FOgIRDaFPwUd6Kh/zLZGzy+lsvz 8DYexQ1qu84AcmKl5Upx3xGYLb0wTknqjPGq2PNYu4mGKk5S6mAQrCu+RbXrMWzxP7/V l0Li8xGBFkIEX0NzTp7vTdaVxEhstGksmUeHJ+fN0VQrvMEXWDUDotSQCiBqiEx7MkEQ /68rzKMqiRgkAa8NAptPqUSj9O9L1Q8O/1cyUcuFmauI4pv7ir3yz2ehvbq4cvQd0ksb nnAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=MAa0hZWBXR/nMs5T9lRHU8/+/9og2envxuALoqx4k7w=; b=ycHBXyIpTnoUvEc2EymiBsVbdYLS9GaoJHhgq1k5LnJNNHAKWqsfW44YqkGKRklLAH k5R00aHm/BTX33jC0dPbd3LT81Zhpxg2DnFjqMql4JSXMBOnRC68cUQHwKjfIUU4/8hW yz+Vyv1ZyM7xorLeUonrgg9UwHni9A1q8i6pM/1cci7Dv2NQuBRxp6zLIZqww4nUzL0T dHx/Il4sqncj7rdfJV7yaLgRua9/TNPrx/nJqyWGOkfw7QhBCb49fonvQJViLpTaoJ3Y RKoPFNoqHNIDGWLsQBng/cQXWiecQuTLVF1Rhqxy9akW8S7yWKn9LeLMDGKH6Mvv/gEB P5Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iDUfVjQR; 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=QUARANTINE 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 l20si15424579edw.100.2021.08.23.14.47.57; Mon, 23 Aug 2021 14:47:58 -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.s=20161025 header.b=iDUfVjQR; 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=QUARANTINE 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 401E0689FD1; Tue, 24 Aug 2021 00:47:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5289368092F for ; Tue, 24 Aug 2021 00:47:37 +0300 (EEST) Received: by mail-lj1-f179.google.com with SMTP id i28so33986006ljm.7 for ; Mon, 23 Aug 2021 14:47:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=eUQ/aVwj8e9KtVI1VzIvGrOsqxAyLLrVk46SI7c+5Po=; b=iDUfVjQRQN/1oYXXnBjArzEDXjJEiPxZcXNSYwHS0E7/qi/lQrzMGcX43QoX3rjL2E JH0TZf1dIakCYOtGZ0/0Y/8i2s6KNzS3C13Am0O/OTMIgn9W8QyCRhDrmd36h3Yzy1KX 3eEpyS5g9paRP5CzCyTTqQg7O47F6Aiceca17O2ceYwHJQT4ghQiZUbpUJrHmbgmMkQv DWwbZjgmFwxwBm43z3Ls4ocdmNSM1RGUF2CgZhc0OdTzbBCeYzIU/LoBrIdml/j9xXqo emWC+dsV/emxJ57ALEvp7HX5Jyu+62V5PiXyFeeDnjp8aIszRkrZ8ZHVc3ctYzKgiaZl TdJw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=eUQ/aVwj8e9KtVI1VzIvGrOsqxAyLLrVk46SI7c+5Po=; b=lMJm7M86tk1vpZxCRil5sUiXNlh30hAFATCmhvwSMUvdwFq5tMVNVrcW61y8oSwKdH XgtY2Hj2pXreMi7xZ+yTRvY5hfJWO4K454KufXNvrvQXcl0NyudUSdZWfZhU6wqywJps Ug1b8IClAyT46RYY9AuLGvL3e6DLS1AvTC4Y/0FZdoJdvw6CFJV89fW4RWvcwrZ0P8lS 67bpWq3X6/X0MUXAKmpeUVgkAo9RqX6dq6YNYbUGhOFxvUBogOZfPgQz2UYRTKtCke7E XJXz7DCG9BdCeynZ+M4w/6O1Hjb/qMPhd1yEmQ3yZiW8CdIwuG+U8cj8x5k5QPEhHpfo mXLQ== X-Gm-Message-State: AOAM533+PFT+mmwQnodr8VFfJg2ZApbkWdlVwOIqZnUS5Sdy5ANwEjSD J7JaNiAXP835gZKcE63PB/t0Pqb6BQM= X-Received: by 2002:a2e:a230:: with SMTP id i16mr30136218ljm.333.1629755256704; Mon, 23 Aug 2021 14:47:36 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g38sm1704002lfv.210.2021.08.23.14.47.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 14:47:36 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Aug 2021 00:47:30 +0300 Message-Id: <20210823214730.25046-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210823214730.25046-1-jeebjp@gmail.com> References: <20210823214730.25046-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/libx265: add support for setting chroma sample location X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: bcLLbUblBKL6 --- libavcodec/libx265.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index b5c94b64a3..c58882170b 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -210,6 +210,14 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) ctx->params->vui.matrixCoeffs = avctx->colorspace; } + if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) { + ctx->params->vui.bEnableChromaLocInfoPresentFlag = 1; + + ctx->params->vui.chromaSampleLocTypeTopField = + ctx->params->vui.chromaSampleLocTypeBottomField = + avctx->chroma_sample_location - 1; + } + if (avctx->sample_aspect_ratio.num > 0 && avctx->sample_aspect_ratio.den > 0) { char sar[12]; int sar_num, sar_den;