From patchwork Sun Jun 13 02:34:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zheng qian X-Patchwork-Id: 28257 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:c91a:0:0:0:0:0 with SMTP id z26csp1744857iol; Sat, 12 Jun 2021 19:35:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5ZsTCucggkg7szO+gBSAbG3oSyV8wWkcXzFB1aFAcWuHxP3OjByWw8/D8uxxYLh5ZFDID X-Received: by 2002:a17:906:acd:: with SMTP id z13mr7774447ejf.437.1623551722151; Sat, 12 Jun 2021 19:35:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623551722; cv=none; d=google.com; s=arc-20160816; b=IoFMkQMR0gN195uDYQHze5TgIe4tKKwEdYSzdLlA0uUGLQavy8KDi9sZmb2sTo58XR JEgjUkoBb2WBQDkT7+UqIIEcwaVSWHMssvvAHJTVHYcRWuRAd67CFHd3+usNlZW4srvX VoNSSsV9Xl8+CJgEPCscJrRZsRpkUj1YTCkCAVNJ2PbxvwibQfQsOsvn20SqtRwIiA4Z 0or/TCxxck7ln7r0IejlqMHuTK26DB0KnekxYAR0iVzYzeMbttld0gBzLVtNePXmOufF dPjyuP7/gFGS+Ek8HBw/lVAegrDefXjgkUBZOuQ83+qDtazbDFO9dU9//8gkS3YTr3Py w73Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=gBElN8qfepgd/LDmFB8d+gEIk32o8CTjGZL9GW18fcE=; b=CwMIa9YqQLlbOaki7UodVAKvrXszqAcPHsqu7HPKkASx6XvcjMQU6U5dYwI99IFLGj mdNiEOrwj06YKi+Oug7RuBjoATP5rowj7M747B9jPGf1HiEvc8u1hca+s2BaJLnyveyL mBvn8eV7yv8SIe4PS6fjKHG0Ei/CyzVkRfl0coW+BUq/i9vJJDu4dz667Tu0k10bBE/M HZBAitbRjgg7RxVSrh2Y7mAYQGpojzJUjZJCUshTsvK9h949CPFqd1+jWUXsY+7tkizd SLFRnDnliWf7sLLp1xAELPtSmkaYn+hWQLqUf26BXRV0LEoNQbKbhjW0eaG8BPuZALnP KTrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=U3qg5ybV; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d2si8161859ejr.606.2021.06.12.19.35.21; Sat, 12 Jun 2021 19:35:22 -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=@xqq-im.20150623.gappssmtp.com header.s=20150623 header.b=U3qg5ybV; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69B4E68803C; Sun, 13 Jun 2021 05:34:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90AEE687F20 for ; Sun, 13 Jun 2021 05:34:37 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id s14so7758038pfd.9 for ; Sat, 12 Jun 2021 19:34:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xqq-im.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u4ov+O0Jo47UfjOvQnxGSOjzayVh+c4keJC2UwJYagA=; b=U3qg5ybVomWg41kE5c+jJEvt6OvR0NdXpqt5EBvIkHa475r7gRgmxjEURZRasF9Jrh oXF7BzNtmWxcFoXNDTYUWpLdOgoqFHsmM0vlToNt/xpENTVFlfAmY4P+QVh56oiYfe5o 7ZVGT8lVfMLeswU6kliwQvVB4pPnb4ZpQuuDFDrDVDYl70VwJXVMG4GOttb+oCQRVnC0 qVcsP61TpXvs2avllrvPB2lRXPFWMJB+ehNMMaCch39xBCKGo0BKgV+h+as2m1KGHTvm d+b7PDq7cKbHSlQl4e5LcW4F1L94nlQnI3lhQ2t9vulyUSGskVcsKnZF4NkvaBWetkXM +HVg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=u4ov+O0Jo47UfjOvQnxGSOjzayVh+c4keJC2UwJYagA=; b=gQN5Ad7k6JsnMZmvpRiGmtU76G3ZeIkswW5PgpG7iZGnwl1btM7p1e054Ht1BsFS9l YmrQKOo4PN81xnRLTeuJ2bhQzi79py0nyujieEaAk/32LyxPcgKdrG3m2rMnXZ+uq3d+ odmOMSNoVeHpKdbS4mJOMk7TmzNAz7T9QAcunBW3tANbGUI20ZScLbbi9yZsK6ImzPF8 DoP1d5hIbBGRpEWVKSun/2eSe6LMHioR/0BLuX+NP8l5xDKLSSiajEtd1JfHkVPySNEV C2fNU5ES881WyFLxRblVE+EyW1QpIPvpUhTJelekqYWmGeMKtuiRF3kzuutjJB4huPps qo7A== X-Gm-Message-State: AOAM532LcSSnCQuER24ywtJy6XjUQMvAPgpK24Y13PtRyQ5uQfwR5GRu ZnhDYCR23Zf00XfDQQUsqD2WwXFwQ3DePw== X-Received: by 2002:a65:6884:: with SMTP id e4mr10775759pgt.71.1623551675691; Sat, 12 Jun 2021 19:34:35 -0700 (PDT) Received: from zhengqian-xps.lan (ngn-nat1.v4.open.ad.jp. [202.222.12.138]) by smtp.gmail.com with ESMTPSA id x33sm8966924pfh.108.2021.06.12.19.34.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jun 2021 19:34:35 -0700 (PDT) From: zheng qian To: ffmpeg-devel@ffmpeg.org Date: Sun, 13 Jun 2021 11:34:21 +0900 Message-Id: <20210613023421.23039-5-xqq@xqq.im> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210613023421.23039-1-xqq@xqq.im> References: <20210613023421.23039-1-xqq@xqq.im> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 5/5] avcodec/libaribb24: Enable decoding support for arib_superimpose 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: zheng qian Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oNhkGbuFLkkF ARIB superimpose packet could also be decoded by libaribb24 Signed-off-by: zheng qian --- configure | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libaribb24.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+) diff --git a/configure b/configure index 6bfd98b384..00a38b4cdc 100755 --- a/configure +++ b/configure @@ -3254,6 +3254,7 @@ libaom_av1_decoder_deps="libaom" libaom_av1_encoder_deps="libaom" libaom_av1_encoder_select="extract_extradata_bsf" libaribb24_decoder_deps="libaribb24" +libaribb24_superimpose_decoder_deps="libaribb24" libcelt_decoder_deps="libcelt" libcodec2_decoder_deps="libcodec2" libcodec2_encoder_deps="libcodec2" diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 623db2a9fa..5d5b536e97 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -722,6 +722,7 @@ extern const AVCodec ff_qdmc_at_decoder; extern const AVCodec ff_qdm2_at_decoder; extern AVCodec ff_libaom_av1_encoder; extern const AVCodec ff_libaribb24_decoder; +extern const AVCodec ff_libaribb24_superimpose_decoder; extern const AVCodec ff_libcelt_decoder; extern const AVCodec ff_libcodec2_encoder; extern const AVCodec ff_libcodec2_decoder; diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 0766c0079d..afa43f8f50 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -393,3 +393,17 @@ const AVCodec ff_libaribb24_decoder = { .priv_class= &aribb24_class, .wrapper_name = "libaribb24", }; + +const AVCodec ff_libaribb24_superimpose_decoder = { + .name = "libaribb24_superimpose", + .long_name = NULL_IF_CONFIG_SMALL("libaribb24 ARIB STD-B24 superimpose decoder"), + .type = AVMEDIA_TYPE_SUBTITLE, + .id = AV_CODEC_ID_ARIB_SUPERIMPOSE, + .priv_data_size = sizeof(Libaribb24Context), + .init = libaribb24_init, + .close = libaribb24_close, + .decode = libaribb24_decode, + .flush = libaribb24_flush, + .priv_class= &aribb24_class, + .wrapper_name = "libaribb24_superimpose", +};