From patchwork Fri Sep 20 15:55:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15185 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 27295448E11 for ; Fri, 20 Sep 2019 18:55:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01DB268A454; Fri, 20 Sep 2019 18:55:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97D3468A3EE for ; Fri, 20 Sep 2019 18:55:24 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id q5so4763281pfg.13 for ; Fri, 20 Sep 2019 08:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ThosWvALPkLlwfRBBSJkhsA/7VfeI1f6vdolcRF1tw4=; b=PrUeNYe4bIgRevTxIMDD5w62gIUQfhiXoVmINaSrAarDU2r+g5OspCb+YJteZ+3Z5l VcjEhbsTFLoifTSUmXsDzH4CY9gRUzQdvQ21+KBUXJa26akbwxtenUNnxX5rqeLC4GOt LP2vBTH8xfR8YMNH51stK6XrOPOeZaTAiwKK8x5bJR3AIY+XE50EMMQBfbnIjalLjadH Dxp2qJCTamo2O0M7ZQJO8CuGhy6/8ntGtoAWVztqbvjq5Nq7K1ueSi0Hv5yctOd6JyPN GTTBeg2lk/1BwwLHibZdJPI1JCIC23Kc60PBMC2vMQKjKzB1f5KdqqZ3IiIPOEnPZwko zwPA== 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=ThosWvALPkLlwfRBBSJkhsA/7VfeI1f6vdolcRF1tw4=; b=ZN2JW3/Wm34fh3wsiTHzVctnl4qsDZAerWpjG+jRTCykoS7sLpah0mc6r7GCCjs9mg 93B079JzyudwBsNySsv6T/8mEH9yZaatil3Qbsi3R1YuN2ww0jrGDG6QbRSSDv9vJQDK IkbbhkUnJbApzbIcGy24k0e9aKBGDKh2Tv9Yl0Wa0CvDqpCt8/AgMuThmna6v/1+Mg27 IWtLvuk9EmpAg2TiTFiIA+8q/v8Qmc6SV6gQXeIz/UfgPuESjlK+j4P2RSjFrCTiQmTJ 7EL8TuMC8fbU/zI58t7/Tn3SDbORMPYzuxKHg56wxQUUV2S5GCy9GWbi0yxQUpVhAnSL eZBA== X-Gm-Message-State: APjAAAUFwZCavTafU49CwqgUtk7SyaH8Ab86STNl1u4CB4VenytXp1oX v76XPprqi6TMoXx9UYZvb7hY8KVC X-Google-Smtp-Source: APXvYqxFnx+J/TSpG7wO2WV34lI4yHYYam0kwmdtSDnHhA6mWMUzpedGW3InUtCwTCvYjxElU1qU7w== X-Received: by 2002:a63:b70a:: with SMTP id t10mr16556634pgf.25.1568994922471; Fri, 20 Sep 2019 08:55:22 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 193sm2907065pfc.59.2019.09.20.08.55.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Sep 2019 08:55:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Sep 2019 23:55:17 +0800 Message-Id: <20190920155517.5854-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1] avcodec/v210enc: add yuv420p/yuv420p10 input pixel format support 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/v210_template.c | 20 ++++++++++++++++++++ libavcodec/v210enc.c | 8 +++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/libavcodec/v210_template.c b/libavcodec/v210_template.c index 9e1d9f9..083a9f1 100644 --- a/libavcodec/v210_template.c +++ b/libavcodec/v210_template.c @@ -43,11 +43,31 @@ static void RENAME(v210_enc)(AVCodecContext *avctx, const TYPE *y = (const TYPE *)pic->data[0]; const TYPE *u = (const TYPE *)pic->data[1]; const TYPE *v = (const TYPE *)pic->data[2]; + const TYPE *u_even = u; + const TYPE *v_even = v; const int sample_size = 6 * s->RENAME(sample_factor); const int sample_w = avctx->width / sample_size; for (h = 0; h < avctx->height; h++) { uint32_t val; + + if (pic->format == AV_PIX_FMT_YUV420P10 || + pic->format == AV_PIX_FMT_YUV420P) { + int mod = pic->interlaced_frame == 1 ? 4 : 2; + if (h % mod == 0) { + u_even = u; + v_even = v; + } else { + /* progressive chroma */ + if (mod == 2) { + u = u_even; + v = v_even; + } else if (h % 4 == 2) { + u = u_even; + v = v_even; + } + } + } w = sample_w * sample_size; s->RENAME(pack_line)(y, u, v, dst, w); diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 16e8810..2180737 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -131,9 +131,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, } dst = pkt->data; - if (pic->format == AV_PIX_FMT_YUV422P10) + if (pic->format == AV_PIX_FMT_YUV422P10 || pic->format == AV_PIX_FMT_YUV420P10) v210_enc_10(avctx, dst, pic); - else if(pic->format == AV_PIX_FMT_YUV422P) + else if(pic->format == AV_PIX_FMT_YUV422P || pic->format == AV_PIX_FMT_YUV420P) v210_enc_8(avctx, dst, pic); side_data = av_frame_get_side_data(pic, AV_FRAME_DATA_A53_CC); @@ -165,5 +165,7 @@ AVCodec ff_v210_encoder = { .priv_data_size = sizeof(V210EncContext), .init = encode_init, .encode2 = encode_frame, - .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV422P, + AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_NONE }, };