From patchwork Wed Jul 4 22:05:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 9622 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1224511jad; Wed, 4 Jul 2018 15:06:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcG9jr4iceIM6H7WWGgGgxp/E0dvn0gYaCT7vdpBD3+FF7my43QkT1GbXHRH8fVUjT0jdON X-Received: by 2002:a1c:eb08:: with SMTP id j8-v6mr2827785wmh.160.1530741971674; Wed, 04 Jul 2018 15:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530741971; cv=none; d=google.com; s=arc-20160816; b=EXBbIc2H70sWx8AMZbznBQ9PlUmlSUyQAP8sgJmntyDH/Vh1p82rItSOcg7ld2nsk+ BA89Jdwd70VKGjifhrPTd8lylPTFg9lQ64PpXie7P+2Cv+GijlRQ8thWM8aLYWTTQEle cY8cABiJ51tRRm+Xk90+cJKQJVXhZSlu+PFAuVCcJQqoXSBsNN9eYCo1gdF8wRiDV27N vrLbJpxEYxKirlJuBlysf++O5mmJTibY+JD8DZ5BzhqwI9FhF76Rju6I015bAl+Sg28U IEiXa8rbOq6L3ioF6oYgfyMuXHNiVc4Y7O94QKyIBub9tDZ9VQuqJYK4e+HuexfzXwBD bFkg== 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:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=+FXzmSvBRcwVXIrG6O/Ent3sJIYOmCGJ0A765frLg1Y=; b=JNM7dFlIhH9oj7Mydu7PsfCZSWteXJSpg5WTcqqOGOpAf6R8RjSIrCaP4xJBo4reIP W9ybU1/m+AjvS5Iat+H/hhdNPOWBO7RqjdK5TO8NSW8agvcu+ssWEFvdTl2JZYVgW1AQ aCNGYmz+ue4FCO2jFD88/9xuBQEYtewh+FFf5Uu0GMusOIigE6dZuUXGL3Blrt9Kn5Ql SOEoF9y4plwzovRabw4dgO5uhy6RgnSefH/jlo0e7nn/sYlrm/lwL/nY8Qhmjj9yshiR 1TO3SiDmTyTukUC7J5cgexIE5pKSGnvGj1Y+vJ26lw2F6wZERxXkVLxoQjMloOYIyOxu +03Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Ckv6ZldP; 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 b3-v6si3916296wrs.197.2018.07.04.15.06.10; Wed, 04 Jul 2018 15:06:11 -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=@gmail.com header.s=20161025 header.b=Ckv6ZldP; 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 088C668ABA2; Thu, 5 Jul 2018 01:06:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f51.google.com (mail-pl0-f51.google.com [209.85.160.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D45FC68AA65 for ; Thu, 5 Jul 2018 01:05:57 +0300 (EEST) Received: by mail-pl0-f51.google.com with SMTP id bi1-v6so281596plb.12 for ; Wed, 04 Jul 2018 15:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=qq0/LXwt+lj+CNJoGDp6lrEPuRZ+RRaX1wG3XXX1eXM=; b=Ckv6ZldP3HiZxdZxx3bySqH7le4Qcu9+GHkQiukYHpQll5KPc+MHMl4L7tvuzQIAqh Mc5O5IzFHKptBM8ZQ7De+81lDvXzoQJsmmBaFTtVxDEO9xsFe7dPFTDpQOu3yMUzGBBS HeiMHqU9cXONZwRHv9al4ObgRk+XHRBU4fXHHnzelitqWtBXC4CZP8gThBwVVTC+P5+9 33wFdUr5PFarAS/fAN5elqmVIvBxsX84CLjqy7+ykBWdQ+jhMZBbZYdwquMvQw/LkHQ8 YjoYOSDhk7TAqAdZdEqHe6pSaqPTb0wdnm7+BiTetfcLmVO0/RQJJBw1DKolnXK3UtN8 MACw== 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; bh=qq0/LXwt+lj+CNJoGDp6lrEPuRZ+RRaX1wG3XXX1eXM=; b=HOAekfuXXVoLORexWCvHyRwANCeDAXpCgSzcbbj4H42AotCijIAv8ea+Ej5IUSgQtl 0vgRLS7zGNaI/9oTP1BsaGh3mtmAL2BvGpghaHvfmB//zeqh6KIlP4OdNExpunncEeJC 4n5d9N6WqdEH0SqPeovxlj3Kc4u+aN+QLsgI+jN9SItNSBY962UykqcLD13+769LkrV1 R1EPseKRh2m6DN82iZPqNp8d/W6hVpRrHpsJzQ6aLNSOOEw8TBdgKzmUR6zjwl1fLTHX ZZfyS5Wud2p0hbU2UR5CzP8VN7IC1hD25PkyQa6wyqeG+4I3rhDqtG2xHg3d8InYIPM2 W0eQ== X-Gm-Message-State: APt69E3jCQJf2iE3ojP+cMEX9jxQOucBZiqtLukEXZTBFlA40V4Kah2o BAhxrGfgzzJrdkfeef59S32Jyg== X-Received: by 2002:a17:902:6193:: with SMTP id u19-v6mr3598414plj.133.1530741960367; Wed, 04 Jul 2018 15:06:00 -0700 (PDT) Received: from localhost.localdomain (cpe-104-173-251-254.socal.res.rr.com. [104.173.251.254]) by smtp.gmail.com with ESMTPSA id g2-v6sm12135610pfd.165.2018.07.04.15.05.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 15:05:59 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jul 2018 15:05:58 -0700 Message-Id: <20180704220558.75537-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.17.0 (Apple Git-106) Subject: [FFmpeg-devel] [PATCH v2] lavf/mxfdec: demux s436m as eia608 subtitle track 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mxfdec.c | 103 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 575126d639..13226333cc 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -52,6 +52,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/parseutils.h" #include "libavutil/timecode.h" +#include "libavutil/opt.h" #include "avformat.h" #include "internal.h" #include "mxf.h" @@ -265,6 +266,7 @@ typedef struct MXFIndexTable { } MXFIndexTable; typedef struct MXFContext { + const AVClass *class; /**< Class for private options. */ MXFPartition *partitions; unsigned partitions_count; MXFOP op; @@ -287,6 +289,7 @@ typedef struct MXFContext { int last_forward_partition; int nb_index_tables; MXFIndexTable *index_tables; + int eia608_extract; } MXFContext; /* NOTE: klv_offset is not set (-1) for local keys */ @@ -449,6 +452,78 @@ static int find_body_sid_by_offset(MXFContext *mxf, int64_t offset) return mxf->partitions[a].body_sid; } +static int mxf_get_eia608_packet(AVFormatContext *s, AVStream *st, AVPacket *pkt, int64_t length) +{ + int count = avio_rb16(s->pb); + int i, ret; + + for (i = 0; i < count; i++) { + if (length < 6) { + av_log(s, AV_LOG_ERROR, "error reading s436m packet %"PRId64"\n", length); + return AVERROR_INVALIDDATA; + } + int line_num = avio_rb16(s->pb); + int wrapping_type = avio_r8(s->pb); + int sample_coding = avio_r8(s->pb); + int sample_count = avio_rb16(s->pb); + av_log(s, AV_LOG_DEBUG, "len %"PRId64" line %d wrap type %d coding %d count %d\n", + length, line_num, wrapping_type, sample_coding, sample_count); + length -= 6 + 8 + sample_count; + if (line_num != 9 && line_num != 11) + break; + if (sample_coding == 7 || sample_coding == 8 || sample_coding == 9) { + av_log(s, AV_LOG_ERROR, "unsupported s436m 10 bit sample coding\n"); + return 0; + } + if (length < 0) + return AVERROR_INVALIDDATA; + + int array_count = avio_rb32(s->pb); + int array_elem_size = avio_rb32(s->pb); + av_log(s, AV_LOG_DEBUG, "array count %d elem size %d\n", array_count, array_elem_size); + int did = avio_r8(s->pb); + int sdid = avio_r8(s->pb); + int data_count = avio_r8(s->pb); + av_log(s, AV_LOG_DEBUG, "did %x sdid %x count %d\n", did, sdid, data_count); + if (did != 0x61) + break; + int cdp_id = avio_rb16(s->pb); + int cdp_data_count = avio_r8(s->pb); + int cdp_framing_rate = avio_r8(s->pb) >> 4; + int cdp_flags = avio_r8(s->pb); + int cdp_counter = avio_rb16(s->pb); + int cdp_data_section = avio_r8(s->pb); + if (cdp_data_section != 0x72) { + av_log(s, AV_LOG_ERROR, "wrong cdp data section %x\n", cdp_data_section); + return AVERROR_INVALIDDATA; + } + int flags = avio_r8(s->pb); + int cc_count = flags & 0x1f; + av_log(s, AV_LOG_DEBUG, "cdp id %x dcount %d frame rate %d cdp flags %x flags %x " + "cc count %d counter %d section %x\n", cdp_id, cdp_data_count, cdp_framing_rate, + cdp_flags, flags, cc_count, cdp_counter, cdp_data_section); + ret = av_get_packet(s->pb, pkt, cc_count * 3); + if (ret < 0) + return ret; + if (cdp_data_count - 9 - 4 < cc_count * 3) { + av_log(s, AV_LOG_ERROR, "wrong cdp size %d cc count %d\n", data_count, cc_count); + return AVERROR_INVALIDDATA; + } + avio_skip(s->pb, data_count - 9 - 4 - cc_count * 3); + int cdp_footer_section = avio_r8(s->pb); + if (cdp_footer_section != 0x74) { + av_log(s, AV_LOG_ERROR, "wrong cdp footer section %x\n", cdp_footer_section); + return AVERROR_INVALIDDATA; + } + int cdp_counter2 = avio_rb16(s->pb); + int cdp_checksum = avio_r8(s->pb); + av_log(s, AV_LOG_DEBUG, "cdp counter %d checksum %x\n", cdp_counter2, cdp_checksum); + break; + } + + return 0; +} + /* XXX: use AVBitStreamFilter */ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, int64_t length) { @@ -2424,6 +2499,11 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) st->codecpar->codec_type = type; if (container_ul->desc) av_dict_set(&st->metadata, "data_type", container_ul->desc, 0); + if (mxf->eia608_extract && + !strcmp(container_ul->desc, "vbi_vanc_smpte_436M")) { + st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; + st->codecpar->codec_id = AV_CODEC_ID_EIA_608; + } } if (descriptor->extradata) { if (!ff_alloc_extradata(st->codecpar, descriptor->extradata_size)) { @@ -3396,6 +3476,13 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) mxf->current_klv_data = (KLVPacket){{0}}; return ret; } + } else if (mxf->eia608_extract && + s->streams[index]->codecpar->codec_id == AV_CODEC_ID_EIA_608) { + ret = mxf_get_eia608_packet(s, s->streams[index], pkt, klv.length); + if (ret < 0) { + mxf->current_klv_data = (KLVPacket){{0}}; + return ret; + } } else { ret = av_get_packet(s->pb, pkt, klv.length); if (ret < 0) { @@ -3594,6 +3681,21 @@ static int mxf_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti return 0; } +static const AVOption options[] = { + { "eia608_extract", "extract eia 608 captions from s436m track", + offsetof(MXFContext, eia608_extract), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, + AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, +}; + +static const AVClass demuxer_class = { + .class_name = "mxf", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_DEMUXER, +}; + AVInputFormat ff_mxf_demuxer = { .name = "mxf", .long_name = NULL_IF_CONFIG_SMALL("MXF (Material eXchange Format)"), @@ -3604,4 +3706,5 @@ AVInputFormat ff_mxf_demuxer = { .read_packet = mxf_read_packet, .read_close = mxf_read_close, .read_seek = mxf_read_seek, + .priv_class = &demuxer_class, };