From patchwork Tue Apr 20 04:01:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brad Hards X-Patchwork-Id: 27185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1100798iob; Mon, 19 Apr 2021 21:01:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLXqKP3dkyAUsV5jw5dtduFld3q5jgwtjKxD3f7aTM4mPlGmqvwgcq/tm6D16UKxl2NV2/ X-Received: by 2002:a05:6402:518c:: with SMTP id q12mr30007351edd.11.1618891301500; Mon, 19 Apr 2021 21:01:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618891301; cv=none; d=google.com; s=arc-20160816; b=CU5P8Jt7+Mkr8a1M2qSIW3LmeF3/gjJF9Obo7ZZ0POdIw7IoJZBy0usW1rjUKXGZq1 nIpYJ4n3khOumFZUBfljWW28WOB+24h1My7b5/N5i2CQDGOZkgZqPVo0nULu5X358HQe nyybHFSuIKCFit5Jvu4NLTKAnIsSnEMrsdK3x22wlq0mL6kGmPlk2VS5FnTKUbupRG8x o/w95aVZmTA8j5QRv8ZKYcivBBFceLsrkZcEdGeeZ+rXzq7gKnA5sj4v446XF/Y3oosg SddAhLomcpaRR/O5o5n9NBg/MVTEO8w0U6tMWEAl5ds/rsTDXKUqv+ujSpMfKP7gAqrO Ns2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=nOhbNLCwInchf3kDyYRu+Gv3sAxO+G3q4L1REF6pEEw=; b=FR/yVxfHHfZaY/MRfzMRs2X4GcoyuevYgrnf5KeWvh80T27+yzYfdF+OnZBt/EC9DL l1ME7tMwRAMHd0iBPGT24yQvCMLi4UEhEM3lo9WPsdJVrVWBkHjDKusmDJoKWJImr6tY rTT/SXRtRhcqUU+qG0NEIxq9/6SERAINn3FFIKsxDKvM+o/LZ7zY1gD6W9+Ypr03ldO2 r6E3SatAzNsa6tLcnlpciujYv6mzS7CokVXyEkXVEb2Y86CZFpSenxwNXrPPd/uIS6TO G22hDIlwZSvciBqh4GUebfsu3Y3I9kZfZhBv5MXpRTSfOkQL/EtLp1TMK4hMXXZksjPc lpOg== ARC-Authentication-Results: i=1; mx.google.com; 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 c95si9496847edf.253.2021.04.19.21.01.40; Mon, 19 Apr 2021 21:01:41 -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; 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 55BB368A066; Tue, 20 Apr 2021 07:01:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from cp1.nerdvana.net.au (cp1-new.nerdvana.net.au [113.212.99.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11896689B83 for ; Tue, 20 Apr 2021 07:01:29 +0300 (EEST) Received: from ppp115-205.static.internode.on.net ([150.101.115.205]:38974 helo=audax.fritz.box) by cp1.nerdvana.net.au with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lYhZl-0006UC-OT for ffmpeg-devel@ffmpeg.org; Tue, 20 Apr 2021 14:01:25 +1000 From: Brad Hards To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Apr 2021 14:01:25 +1000 Message-Id: <20210420040125.15029-1-bradh@frogmouth.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - cp1.nerdvana.net.au X-AntiAbuse: Original Domain - ffmpeg.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - frogmouth.net X-Get-Message-Sender-Via: cp1.nerdvana.net.au: authenticated_id: bradh@frogmouth.net X-Authenticated-Sender: cp1.nerdvana.net.au: bradh@frogmouth.net X-Source: X-Source-Args: X-Source-Dir: Subject: [FFmpeg-devel] [PATCH] avformat/mov: initial support for emsg box 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: GTSpQ7ickPLr This adds support for the EventMessage box, which is apparently described in ISO/IEC 23009-1:2019, and is used for KLV metadata per MISB ST 1910. See https://www.gwg.nga.mil/misb/docs/standards/ST1910.1.pdf Sect 6.2.1 --- libavformat/isom.h | 15 ++++++++++++ libavformat/mov.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index 5a6d504090..8ea62e91f0 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -79,6 +79,18 @@ typedef struct MOVDref { int16_t nlvl_to, nlvl_from; } MOVDref; +typedef struct MOVEmsg { + uint8_t version; + uint32_t timescale; + uint32_t presentation_time_delta; ///< only valid for version 0 + uint64_t presentation_time; ///< only valid for version 1 + uint32_t event_duration; + uint32_t id; + char *scheme_id_uri; + char *value; + uint8_t *message_data; +} MOVEmsg; + typedef struct MOVAtom { uint32_t type; int64_t size; /* total size (excluding the size and type fields) */ @@ -297,6 +309,9 @@ typedef struct MOVContext { int32_t movie_display_matrix[3][3]; ///< display matrix from mvhd int have_read_mfra_size; uint32_t mfra_size; + // Event Messages from DASH specification, used in MISB ST 1910 + unsigned emsg_count; ///< Number of event messages + MOVEmsg *emsg_data; ///< Array of Event Messages } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index 7805330bf9..22bf0b36ea 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5318,6 +5318,66 @@ static int mov_read_elst(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_emsg(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + int err; + uint32_t bytes_read_from_atom = 0; + size_t num_bytes_in_last_read; + MOVEmsg *emsg; + + if ((uint64_t)c->emsg_count+1 >= UINT_MAX / sizeof(*c->emsg_data)) + return AVERROR_INVALIDDATA; + if ((err = av_reallocp_array(&c->emsg_data, c->emsg_count + 1, + sizeof(*c->emsg_data))) < 0) { + c->emsg_count = 0; + return err; + } + emsg = &c->emsg_data[c->emsg_count++]; + + emsg->version = avio_r8(pb); + bytes_read_from_atom += 1; + avio_rb24(pb); /* flags */ + bytes_read_from_atom += 3; + if (emsg->version == 0) { + emsg->scheme_id_uri = av_malloc(atom.size + 1); + num_bytes_in_last_read = avio_get_str(pb, atom.size, emsg->scheme_id_uri, pb->buffer_size + 1); + bytes_read_from_atom += num_bytes_in_last_read; + av_realloc(emsg->scheme_id_uri, num_bytes_in_last_read); + emsg->value = av_malloc(atom.size + 1); + num_bytes_in_last_read = avio_get_str(pb, atom.size, emsg->value, pb->buffer_size + 1); + bytes_read_from_atom += num_bytes_in_last_read; + av_realloc(emsg->value, num_bytes_in_last_read); + emsg->timescale = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->presentation_time_delta = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->event_duration = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->id = avio_rb32(pb); + bytes_read_from_atom += 4; + } else if (emsg->version == 1) { + emsg->timescale = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->presentation_time = avio_rb64(pb); + bytes_read_from_atom += 8; + emsg->event_duration = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->id = avio_rb32(pb); + bytes_read_from_atom += 4; + emsg->scheme_id_uri = av_malloc(atom.size + 1); + num_bytes_in_last_read = avio_get_str(pb, atom.size, emsg->scheme_id_uri, pb->buffer_size + 1); + bytes_read_from_atom += num_bytes_in_last_read; + av_realloc(emsg->scheme_id_uri, num_bytes_in_last_read); + emsg->value = av_malloc(atom.size + 1); + num_bytes_in_last_read = avio_get_str(pb, atom.size, emsg->value, pb->buffer_size + 1); + bytes_read_from_atom += num_bytes_in_last_read; + av_realloc(emsg->value, num_bytes_in_last_read); + } + emsg->message_data = av_malloc(atom.size - bytes_read_from_atom); + num_bytes_in_last_read = avio_read(pb, emsg->message_data, atom.size - bytes_read_from_atom); + return 0; +} + static int mov_read_tmcd(MOVContext *c, AVIOContext *pb, MOVAtom atom) { MOVStreamContext *sc; @@ -6895,6 +6955,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('d','r','e','f'), mov_read_dref }, { MKTAG('e','d','t','s'), mov_read_default }, { MKTAG('e','l','s','t'), mov_read_elst }, +{ MKTAG('e','m','s','g'), mov_read_emsg }, { MKTAG('e','n','d','a'), mov_read_enda }, { MKTAG('f','i','e','l'), mov_read_fiel }, { MKTAG('a','d','r','m'), mov_read_adrm },