From patchwork Tue Nov 16 13:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp7378356iob; Tue, 16 Nov 2021 05:21:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxAxWOS/+6tAucvmSsbxEVr1z/TFR+gmcueRCvyP/HcCZSVc3beqLYz86I9IknCDq8rtZ6k X-Received: by 2002:a17:906:9753:: with SMTP id o19mr10110298ejy.513.1637068908152; Tue, 16 Nov 2021 05:21:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637068908; cv=none; d=google.com; s=arc-20160816; b=n/vDdlZn0PdJV/p+FZXuumjX+IHgrNyRnu+j9+Y4eSwhV0PTFPa1b3xvynGLKzPQfJ DxQpv0DXqXd1mX2Fav8bHVfC5eb77Y/5BkrQWbXdSOjBgw0r8I2ywSrIrwmm9bdDg96t G2YQSYQwoYOQLVG4BqOJ7VPM7/b7fl/luLehPbslxwj3fykGTLwMNcSsPFuVN5pHkKQ7 W2J7G+OXc+kZ//5GgZGWO4kL6/xkGA1Iq9FDGUDomsoex19WDy9vDxjOeAdBUan1QdMm EtfouGDEck4O81BD/7eWKWtSjVmC0Hotr1lCBE/gPnSgmHOJQXidQ+hhfl2XoHZfzVDS pQXw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=s7VK7PatLN95kLYsvf6h5ah6nKI5CrYVSa97bUL0qnA=; b=siwhssb8Wr9gsEvuxabAIo8hEy0r8y8j/Vdh3KWDAEx2kzPH0VrNCRRk+Ha5q0MhK6 sG+Wg/SOLOpb59VT5rq8G4f2X12frxCD8gP8qiOcPk/GhCG5nhsqB2gnRD7IwpEN+i2y LNUaHZV/37AFYiOjhwSPuhOP0UvONPLNbbKWEAW98tzxW6Oz2yX142AfOlzAWTLfkRMz GhGKRCacyI/ixtMbJVNtbKKgirE4TwmnrUc/BYDCRLHO1YpZf/kFCT1Cnf/nrPCTsq7N LPIKd5BFgWJTrgzoGOfYjc3eUoH7WJyVLN/Mw3fowagj68hm1wpMbgF7aYXx8vF5V/gk 78xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=gYkddACd; 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 hv17si49342720ejc.133.2021.11.16.05.21.47; Tue, 16 Nov 2021 05:21:48 -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=20210112 header.b=gYkddACd; 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 672A868A588; Tue, 16 Nov 2021 15:21:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA524687F25 for ; Tue, 16 Nov 2021 15:21:36 +0200 (EET) Received: by mail-pg1-f178.google.com with SMTP id 200so17580383pga.1 for ; Tue, 16 Nov 2021 05:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DrLmgpIqJe9zMZHuYnCS3VgkPP1WVAHHery9PvGF7qc=; b=gYkddACdFhZ8poclYUx+7U/nT9XSpmxevJqHwLrQzPcZpfVRIM6BDSHnYHqOzZSrCq eFt9RRUn+PNXupjEgOhuO2+0g2MLB53PC/cKsK2w3plNKwNEBBAMSAq/AuNoh4RP711W BM0yUFnO7dXlcSnLybZHdTVyXWS4qvDyFhihq8X3OVJ9rG1FVhFlDymvDepTdiEMvM8w XKeLr/meO/aREMft0ImzkgOOWR3RrNbIydSSfUBySV6yF+BKxxmjWTS18XHDt35v8c04 gU2IjvWqyuANWxDfqMeSfTZtUm+ewMAHVpldUpZEFDYhgVsURPCCnpwOg54E/vb2Wxtd iypg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DrLmgpIqJe9zMZHuYnCS3VgkPP1WVAHHery9PvGF7qc=; b=1HYffgNmpbt3k6+NcXdzk3qwAoQ4ZDI+pFXzNihEMCmBFOOQbJoRSNPwvRb+cjytXx 9ryeWLQ/7ZJWXE6fWe8INrdfgd/LMSui8tM2aGf0hwazQOADXZH8ktYUr6g0gZPF79Po y6QlOv/SdqlfeloDVBn/BI7OIWLuNgv4l4CSBO0Tai0bjogN10L12VtQHBdhTboZF6Vr 7/29FRwb99gR+O2WyZxM1bQ/kbh1NmQy7cppiz6uoIrkVG8opZMjZb39/T2qgTt9Nh4q TyiyAhktMBkSkQBLMYRXlWpCU1ltkJ+ZnsQG5DGtAcjzqFzOlJiIro/vms3FppD+rMBS Siyw== X-Gm-Message-State: AOAM5302JR0topYYqyjSCeKtP1GDM22QsyKuR25/tcQ40IrHv1yiKOiw 9+vLpIeofJ8YiUA5y9HkB4oOF0WByao= X-Received: by 2002:a62:750e:0:b0:49f:a27d:62b3 with SMTP id q14-20020a62750e000000b0049fa27d62b3mr40373311pfc.37.1637068893886; Tue, 16 Nov 2021 05:21:33 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n1sm18624742pfj.193.2021.11.16.05.21.32 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Nov 2021 05:21:33 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Nov 2021 21:21:17 +0800 Message-Id: <1637068877-17235-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1636712536-13114-8-git-send-email-lance.lmwang@gmail.com> References: <1636712536-13114-8-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 08/12] avcodec: suppport for s210 encode 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Kw/n6sRwp2KH From: Limin Wang Signed-off-by: Limin Wang --- Changelog | 1 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/s210enc.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/version.h | 2 +- 5 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 libavcodec/s210enc.c diff --git a/Changelog b/Changelog index f139ee4..367abf6 100644 --- a/Changelog +++ b/Changelog @@ -31,6 +31,7 @@ version : - varblur video filter - huesaturation video filter - RTP packetizer for uncompressed video (RFC 4175) +- s210 decoder/encoder version 4.4: diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1d75cfe..69734ca 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -244,6 +244,7 @@ OBJS-$(CONFIG_BINKAUDIO_DCT_DECODER) += binkaudio.o OBJS-$(CONFIG_BINKAUDIO_RDFT_DECODER) += binkaudio.o OBJS-$(CONFIG_BINTEXT_DECODER) += bintext.o cga_data.o OBJS-$(CONFIG_S210_DECODER) += s210dec.o +OBJS-$(CONFIG_S210_ENCODER) += s210enc.o OBJS-$(CONFIG_BMP_DECODER) += bmp.o msrledec.o OBJS-$(CONFIG_BMP_ENCODER) += bmpenc.o OBJS-$(CONFIG_BMV_AUDIO_DECODER) += bmvaudio.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c461798..77f5ed4 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -65,6 +65,7 @@ extern const AVCodec ff_bethsoftvid_decoder; extern const AVCodec ff_bfi_decoder; extern const AVCodec ff_bink_decoder; extern const AVCodec ff_s210_decoder; +extern const AVCodec ff_s210_encoder; extern const AVCodec ff_bmp_encoder; extern const AVCodec ff_bmp_decoder; extern const AVCodec ff_bmv_video_decoder; diff --git a/libavcodec/s210enc.c b/libavcodec/s210enc.c new file mode 100644 index 0000000..c24f466 --- /dev/null +++ b/libavcodec/s210enc.c @@ -0,0 +1,90 @@ +/* + * S210 decoder + * + * Copyright (c) 2021 Limin Wang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" +#include "encode.h" +#include "internal.h" +#include "put_bits.h" + +static av_cold int encode_init(AVCodecContext *avctx) +{ + if (avctx->width & 1) { + av_log(avctx, AV_LOG_ERROR, "s210 needs even width\n"); + return AVERROR(EINVAL); + } + + avctx->bits_per_coded_sample = 20; + avctx->bit_rate = ff_guess_coded_bitrate(avctx); + + return 0; +} + +static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, + const AVFrame *frame, int *got_packet) +{ + const int buf_size = avctx->height * avctx->width * 20 / 8; + int ret; + uint8_t *dst; + const uint16_t *y; + const uint16_t *u; + const uint16_t *v; + PutBitContext pb; + + ret = ff_get_encode_buffer(avctx, pkt, buf_size, 0); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + return ret; + } + dst = pkt->data; + + init_put_bits(&pb, dst, buf_size); + + for (int i = 0; i < avctx->height; i++) { + y = (uint16_t*)(frame->data[0] + i * frame->linesize[0]); + u = (uint16_t*)(frame->data[1] + i * frame->linesize[1]); + v = (uint16_t*)(frame->data[2] + i * frame->linesize[2]); + + for (int j = 0; j < avctx->width; j += 2) { + /* u, y0, v, y1 */ + put_bits(&pb, 10, av_clip_uintp2(*u++, 10)); + put_bits(&pb, 10, av_clip_uintp2(*y++, 10)); + put_bits(&pb, 10, av_clip_uintp2(*v++, 10)); + put_bits(&pb, 10, av_clip_uintp2(*y++, 10)); + } + } + flush_put_bits(&pb); + + *got_packet = 1; + return 0; +} + +const AVCodec ff_s210_encoder = { + .name = "s210", + .long_name = NULL_IF_CONFIG_SMALL("10-bit 4:2:2 packed"), + .type = AVMEDIA_TYPE_VIDEO, + .id = AV_CODEC_ID_S210, + .capabilities = AV_CODEC_CAP_DR1, + .init = encode_init, + .encode2 = encode_frame, + .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV422P10, AV_PIX_FMT_NONE }, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index 7d4cfa3..4b2c29e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 12 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \