From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1336744C2B for ; Fri, 13 Jan 2023 17:27:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A09068BC12; Fri, 13 Jan 2023 19:26:59 +0200 (EET) Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CC5D689BEF for ; Fri, 13 Jan 2023 19:26:53 +0200 (EET) Received: by mail-io1-f51.google.com with SMTP id p66so10791487iof.1 for ; Fri, 13 Jan 2023 09:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rcombs.me; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=O6dw6VH72WPXkKkkldAQrAtKvRhco3qFef7KgFR+AJE=; b=QkA9kGdSezR50rFqgsKv6DYKtQ5Xb+kHYh3Ru29OTJLq0NRF6eL+hJ1vNA8kViFrgF aBtF4DrnbqyunLfxR/d+hMJk39kD+8EgXpMbtSsW5PNA+RZgFI6tjyrWDc/fdrMB6hXd GnFm3o1gVPml4nzD2wJmmZ0MRBUoq+iYkshLP8W0R265cdniOGF58+ofeEIo6Z/rsp/e MraP02J5H2tUsGXmMIwHRaXmD0Gtojnf24/29gav7E7WNnP75TVwemHMvBzgADL0cKer 1QKTz2qCoAadnppODHVWAtDQyALSV5spVQ/NADzmr0LTeuC7GLqgh7FC6XX+ZcR9HrVN +fCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O6dw6VH72WPXkKkkldAQrAtKvRhco3qFef7KgFR+AJE=; b=yglTf85D8WccgjD2Jg6swJDpnNHy8/C17E8Inc9venj4LhUQkY7HebzNBsvzE63v2b ZUjncEFsdI/6bnliAMDIy9Smwn4xHUvPmH293BJadADwMTjBJagkJa2C30cB3682/Enj cgcrnFul3m/YDqsw6io5bOnXFv1GSK+39ptrCH7VRGcsbU3GxCrJ+dKW+3jCEj6aV5AZ RRxwYa/SMWrnSbj+7vTe1OZ9pRE3LibhCTZFiu8TwAtn/eDht71m6WpVFNcZ9xVpcQDC x6BSTuQEJvwqRF1gPZQbgrUdUUcFXaJURer17xWY+N36mY8xbz6X9IVcp18B0u2nfocd EUbg== X-Gm-Message-State: AFqh2krME08GjXu+8foy1FgmQ9bo68elQbnh2Z/zTlZD3pvfFYtjXZD6 D1LaIANiXPjKI9PNvtPa289M+AJh+5mVvWqlSA== X-Google-Smtp-Source: AMrXdXvFJijLMyEJvb80n+Vk5h9Vrn2R9eHuVLcQ2AJPX7FDLUukpxf1icGRMYB0OJv3BEEnfmmS6A== X-Received: by 2002:a6b:4a0e:0:b0:6bc:d714:520f with SMTP id w14-20020a6b4a0e000000b006bcd714520fmr53516972iob.15.1673630811304; Fri, 13 Jan 2023 09:26:51 -0800 (PST) Received: from rcombs-mbp.localdomain ([2601:243:2000:5ac:c8b9:2697:4167:e310]) by smtp.gmail.com with ESMTPSA id p32-20020a056638192000b0039e89ea68f9sm4365211jal.135.2023.01.13.09.26.50 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 13 Jan 2023 09:26:50 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Jan 2023 11:26:40 -0600 Message-Id: <20230113172640.52901-1-rcombs@rcombs.me> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/matroska: add support for ARIB captions 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Not yet ready for merge, pending finalization of the standard proposal for this mapping: https://github.com/ietf-wg-cellar/matroska-specification/pull/724 --- libavformat/matroska.c | 1 + libavformat/matroskadec.c | 30 ++++++++++++++++++++++++++++++ libavformat/matroskaenc.c | 23 +++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 90d94b65bf..79b2d09984 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -76,6 +76,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"S_DVBSUB" , AV_CODEC_ID_DVB_SUBTITLE}, {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, + {"S_ARIBSUB" , AV_CODEC_ID_ARIB_CAPTION}, {"V_AV1" , AV_CODEC_ID_AV1}, {"V_AVS2" , AV_CODEC_ID_AVS2}, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..3a888e3ada 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -50,6 +50,7 @@ #include "libavutil/time_internal.h" #include "libavutil/spherical.h" +#include "libavcodec/avcodec.h" #include "libavcodec/bytestream.h" #include "libavcodec/flac.h" #include "libavcodec/mpeg4audio.h" @@ -2813,6 +2814,35 @@ static int matroska_parse_tracks(AVFormatContext *s) /* we don't need any value stored in CodecPrivate. make sure that it's not exported as extradata. */ track->codec_priv.size = 0; + } else if (codec_id == AV_CODEC_ID_ARIB_CAPTION && track->codec_priv.size == 3) { + int component_tag = track->codec_priv.data[0]; + int data_component_id = AV_RB16(track->codec_priv.data + 1); + + switch (data_component_id) { + case 0x0008: + // [0x30..0x37] are component tags utilized for + // non-mobile captioning service ("profile A"). + if (component_tag >= 0x30 && component_tag <= 0x37) { + st->codecpar->profile = FF_PROFILE_ARIB_PROFILE_A; + } + break; + case 0x0012: + // component tag 0x87 signifies a mobile/partial reception + // (1seg) captioning service ("profile C"). + if (component_tag == 0x87) { + st->codecpar->profile = FF_PROFILE_ARIB_PROFILE_C; + } + break; + default: + break; + } + + if (st->codecpar->profile == FF_PROFILE_UNKNOWN) + av_log(matroska->ctx, AV_LOG_WARNING, + "Unknown ARIB caption profile utilized: %02x / %04x\n", + component_tag, data_component_id); + + track->codec_priv.size = 0; } track->codec_priv.size -= extradata_offset; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 2deb4284e8..67cfec761a 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -58,6 +58,7 @@ #include "libavutil/stereo3d.h" #include "libavcodec/av1.h" +#include "libavcodec/avcodec.h" #include "libavcodec/codec_desc.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" @@ -1142,6 +1143,27 @@ static int mkv_assemble_native_codecprivate(AVFormatContext *s, AVIOContext *dyn else *size_to_reserve = MAX_PCE_SIZE; break; + case AV_CODEC_ID_ARIB_CAPTION: { + unsigned stream_identifier, data_component_id; + switch (par->profile) { + case FF_PROFILE_ARIB_PROFILE_A: + stream_identifier = 0x30; + data_component_id = 0x0008; + break; + case FF_PROFILE_ARIB_PROFILE_C: + stream_identifier = 0x87; + data_component_id = 0x0012; + break; + default: + av_log(s, AV_LOG_ERROR, + "Unset/unknown ARIB caption profile %d utilized!\n", + par->profile); + return AVERROR_INVALIDDATA; + } + avio_w8(dyn_cp, stream_identifier); + avio_wb16(dyn_cp, data_component_id); + break; + } #endif default: if (CONFIG_MATROSKA_MUXER && par->codec_id == AV_CODEC_ID_PRORES && @@ -3274,6 +3296,7 @@ static const AVCodecTag additional_subtitle_tags[] = { { AV_CODEC_ID_DVB_SUBTITLE, 0xFFFFFFFF }, { AV_CODEC_ID_DVD_SUBTITLE, 0xFFFFFFFF }, { AV_CODEC_ID_HDMV_PGS_SUBTITLE, 0xFFFFFFFF }, + { AV_CODEC_ID_ARIB_CAPTION, 0xFFFFFFFF }, { AV_CODEC_ID_NONE, 0xFFFFFFFF } }; -- 2.38.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".