From patchwork Tue Jun 2 23:50:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 20132 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 9AD7244BA72 for ; Wed, 3 Jun 2020 02:51:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6ADC968A370; Wed, 3 Jun 2020 02:51:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31C50680154 for ; Wed, 3 Jun 2020 02:51:22 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id e16so570651qtg.0 for ; Tue, 02 Jun 2020 16:51:22 -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=UrkVpQFTbUwmIN2gvFn0WEVpF99MIgGFAwAMFMDFyhk=; b=dg+WRRRWZBZyxB1N0wmwnI+2zPPiczOogROYKkgXhnw/lx/Q04MrOJi/sABXuR9GYg 7bU8PeJC9mHkXNV6RM9+4naHqn53ZHPgpTZQ+yf3cDX+cTdVlZVGAEqDeq/9E0m5w/vL ptlXHJZLvL0t97wPYw5f9JAMwApd9EmJtc/BI50B/SHdsXmYzxRaBqAwrW79m2FdZQKO ytJH/L/ZBEn9ebMoJiqtYbGB1+R8H2RJULyJv2kYsoN3VGAzIB6kHf/jGvd7ZuyRYAc8 V6d8MUm5949b3c8mIaqQql1S7TGy0MUig9882YzUuRna7WG4U8xrcU3GLzzgD3PiKb/G iirA== 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=UrkVpQFTbUwmIN2gvFn0WEVpF99MIgGFAwAMFMDFyhk=; b=f5kfBuMMjW3KgjSZA+S/3FO5c89iIr81V9pK6Tjz42WbpNNYb86THYzMcXQByykVg6 CadH3c7YOZrAPuW9GLN9PfjkuulGGWJa864KPT8E+3/PEUSd0XLu7Y9GwBZWXqb3Ww0Q aj9owYvQ9hlkBWs+8h3HyilCUhgio0PlI+DEf6MVGPfaOs3s9WScGmDwK0/Zxt5zIOxN 0sr6+9Y8JRCsFAVIIyiWkv/1OQnYeYjFuPdJy4TsTXP7bllYqCfZE8rCmDu8vkh0H3VJ PRdJG/P0ZV6OBqHXqcXcMI2lh4m37Rtn1NfMSz42RkwmVSZngm7dq8DHRoUaf/Ghi55m OVCg== X-Gm-Message-State: AOAM531xWlP+nZkdT3uxpMQ80DsJgPjOC23oSj5tHlZ7tZv0priQU92V yj7vqMYo48tK7o2snYu3yD5r3pm4 X-Google-Smtp-Source: ABdhPJz58YXHpUySeNKIK0vke0yQvmFlUf6FsDJF5s/6QrDgJHVd/LNA/gJ972AFj8joqHxYSMkNLg== X-Received: by 2002:ac8:e8f:: with SMTP id v15mr29284061qti.391.1591141880301; Tue, 02 Jun 2020 16:51:20 -0700 (PDT) Received: from localhost.localdomain ([181.23.72.208]) by smtp.gmail.com with ESMTPSA id j22sm172751qke.117.2020.06.02.16.51.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jun 2020 16:51:19 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jun 2020 20:50:43 -0300 Message-Id: <20200602235043.3789-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/libdav1d: add support for closed captions stored in ITU-T T35 metadata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Based on code from h264_sei.c Signed-off-by: James Almer --- configure | 2 +- libavcodec/libdav1d.c | 49 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 8569a60bf8..2961118682 100755 --- a/configure +++ b/configure @@ -6295,7 +6295,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config libcaca caca caca.h caca_create_canvas enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lcodec2 -enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.4.0" "dav1d/dav1d.h" dav1d_version +enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new enabled libdrm && require_pkg_config libdrm libdrm xf86drm.h drmGetVersion diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index bbb3ec1e6c..e8010655d0 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "decode.h" +#include "get_bits.h" #include "internal.h" typedef struct Libdav1dContext { @@ -364,6 +365,54 @@ FF_ENABLE_DEPRECATION_WARNINGS light->MaxCLL = p->content_light->max_content_light_level; light->MaxFALL = p->content_light->max_frame_average_light_level; } + if (p->itut_t35) { + GetBitContext gb; + unsigned int user_identifier; + + res = init_get_bits8(&gb, p->itut_t35->payload, p->itut_t35->payload_size); + if (res < 0) + return res; + + skip_bits(&gb, 8); // terminal provider code + skip_bits(&gb, 8); // terminal provider oriented code + user_identifier = get_bits_long(&gb, 32); + switch (user_identifier) { + case MKBETAG('G', 'A', '9', '4'): // closed captions + if (get_bits(&gb, 8) == 0x3) { // user_data_type_code + int flag; + + skip_bits(&gb, 1); // reserved + flag = get_bits(&gb, 1); // process_cc_data_flag + if (flag) { + int size, cc_count; + + skip_bits(&gb, 1); // zero bit + cc_count = get_bits(&gb, 5); + skip_bits(&gb, 8); // reserved + + size = cc_count * 3; + if (cc_count && (get_bits_left(&gb) >> 3) >= size + 1) { + AVFrameSideData *sd = av_frame_new_side_data(frame, AV_FRAME_DATA_A53_CC, size); + if (!sd) { + res = AVERROR(ENOMEM); + goto fail; + } + + for (int i = 0, j = 0; i < cc_count; i++) { + sd->data[j++] = get_bits(&gb, 8); + sd->data[j++] = get_bits(&gb, 8); + sd->data[j++] = get_bits(&gb, 8); + } + + skip_bits(&gb, 8); // marker_bits + } + } + } + break; + default: // ignore unsupported identifiers + break; + } + } res = 0; fail: