From patchwork Wed Jul 4 18:35:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 9607 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1078393jad; Wed, 4 Jul 2018 11:35:24 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdnvA+9PYu4M3aFkQ2PXLs1ufDSdnkczW1lETl+6Ka/AkkNOtgnt9G2XHevd3Ut1mkCi/x8 X-Received: by 2002:a1c:415:: with SMTP id 21-v6mr2387764wme.128.1530729324172; Wed, 04 Jul 2018 11:35:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530729324; cv=none; d=google.com; s=arc-20160816; b=Jzg6D3B+YjPpqYH3J4TkZWQiBTvKJzRjoNLUw0BrQIkdjd8aeV5VDKvMWWTupN3Oja smINWoseec2UNy0AeZ34aAOWg7TGix6czmi2uUZGNhReK2OTx10i+HCux8aM+APK4fgS KbCN/d1/2evlURDSBYeF0DUfGM/YtMtUAvDJa1sZhdDi9UIxhLxLXLJff0Bd0v78KdON 4td8CKO+vrf0YudzD8iMw+HQbyfDxFtPyb1yT8S6D1VvMg++ULdKVtaXsCXog4mqF+un aiNva/rtWSbzkqCXR+UR0CnjWPmvfL6eqAUvH61+MLI4mRW+u5UQ5g1RMmXN4Tj46bMN LXsw== 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=wc5J1NCxqUvXBdKXoXKcnozXh9ar8BVaHWuzmx25UNQ=; b=oBNv7X+KXBXadR4uJSM7LsRiCNXeY2yoEMDf9b8ikFOuYT7baJog/6HqBazYtJLOko ZMZHyj/cChuK9wEdvSpb9SoC9+6J/UTiD/v8KM7Z9u3sagILieTeHi8WsX6PXGvisxUO 4TqVsFLHYH2B/iMKHD+b0oMup8fi5RHWKueTcaELqE+7Y+P3I9WEPeN3MwR5Ru7zYTzA uxKdKiuRgck2IVK3Zk8kCihtQA6n227dtbE8ihrhJS39usPqED7PD0bXsfZo6+/dhphR S0LYrP/A9OFji4IUOuLqFKjTxPTJ+6QFBEYR5VDvzBoydLbzxoCFK7Q0H7CjYvzxX3Ne XlaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PGItbFCA; 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 k4-v6si3153578wmk.78.2018.07.04.11.35.23; Wed, 04 Jul 2018 11:35:24 -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=PGItbFCA; 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 E339B68AAF3; Wed, 4 Jul 2018 21:35:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f171.google.com (mail-pf0-f171.google.com [209.85.192.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 688DE689CC6 for ; Wed, 4 Jul 2018 21:35:14 +0300 (EEST) Received: by mail-pf0-f171.google.com with SMTP id b17-v6so3264368pfi.0 for ; Wed, 04 Jul 2018 11:35:18 -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=nHXTw7+Mn/AaJKKCiomuU0JugUT63iHROY/+6R08g10=; b=PGItbFCAif09Fw4qIq8ilP+BztVCPXkjbjNXcoYWaS9fMzqiO3SErF0oSjpHpSeIOM 53ss/l7ZCoPHz/9D0rVyI0UkqT1h1hzEpJb+F/SVkKGJclOcdtvmD6qcGii+soe7tbU2 XyKp1IBed5DzZQIG+iMh9ss7Na6r0sMQFfZwgzHo99U1OIVE0F7b6dBiQdtkKP6bVvlf O3tcaOZQ1L5Q7K0Sl8/FdCUscJovRzI239bgYYmypQ7CmrGfRyCssMxZdSgjJKfTuP4r 8/W6g8CEKm9EAfyGPymWU5UdEGOyizoVSfQGgiiJTlXdxC6bKuceyJl6UCCWgC6bz5RQ ozxA== 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=nHXTw7+Mn/AaJKKCiomuU0JugUT63iHROY/+6R08g10=; b=uSSnaklz/8vCzRBGcO7nyrBrIEGJ9h27d/mQbUO18YCZGB8wEhaCDf7RP6vnxyhuOO 3Bz8BQ2iYIU3SvTDjPVK/eWcEP29xGk0A/zPERKpBOw/Q8rdHaTdbWYmhdpTTo71v+z5 svMFHaJ0qhWFczpXocIvQx+lXn/+ARocoBH+Ne/Q3qJ4Rh8jBcc6CwshcARrwvDN9+B2 DU7FnXkQgKqkBtQNMHFSVHSViInS1Y7XJIwICNi1Thlx6+snU4ZznYn5pJ5NNpmGCC3J tbnIuZWIr229vDhADdkYzVyKyJw5BMNXxt9D/uA4wkAKEEhjyzRYsvqV8JoT00NG+wH7 Qxfw== X-Gm-Message-State: APt69E1lDFKdwEmfS/zkfMiteJHAJcLs93BXb+6KtDAfKydcO0Ph9tY/ yTz8657PdrZnGgM0jJET8SZLwA== X-Received: by 2002:a63:501c:: with SMTP id e28-v6mr2875598pgb.114.1530729316462; Wed, 04 Jul 2018 11:35:16 -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 v126-v6sm8591239pgv.39.2018.07.04.11.35.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Jul 2018 11:35:15 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jul 2018 11:35:03 -0700 Message-Id: <20180704183514.71654-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.17.0 (Apple Git-106) Subject: [FFmpeg-devel] [PATCH 01/12] avformat/mxfenc: automatically update descriptors klv size 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/mxfenc.c | 80 +++++++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 77f60f5874..b98d234f03 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1104,14 +1104,16 @@ static void mxf_write_multi_descriptor(AVFormatContext *s) mxf_write_uuid(pb, SubDescriptor, i); } -static void mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static int64_t mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID key) { MXFContext *mxf = s->priv_data; MXFStreamContext *sc = st->priv_data; AVIOContext *pb = s->pb; + int64_t pos; avio_write(pb, key, 16); - klv_encode_ber4_length(pb, size+20+8+12+20); + klv_encode_ber4_length(pb, 0); + pos = avio_tell(pb); mxf_write_local_tag(pb, 16, 0x3C0A); mxf_write_uuid(pb, SubDescriptor, st->index); @@ -1136,6 +1138,8 @@ static void mxf_write_generic_desc(AVFormatContext *s, AVStream *st, const UID k mxf_write_local_tag(pb, 16, 0x3004); avio_write(pb, mxf_essence_container_uls[sc->index].container_ul, 16); + + return pos; } static const UID mxf_mpegvideo_descriptor_key = { 0x06,0x0E,0x2B,0x34,0x02,0x53,0x01,0x01,0x0d,0x01,0x01,0x01,0x01,0x01,0x51,0x00 }; @@ -1172,7 +1176,7 @@ static int get_trc(UID ul, enum AVColorTransferCharacteristic trc) } } -static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID key) { MXFStreamContext *sc = st->priv_data; AVIOContext *pb = s->pb; @@ -1180,25 +1184,10 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke int stored_height = (st->codecpar->height+15)/16*16; int display_height; int f1, f2; - unsigned desc_size = size+8+8+8+8+8+8+8+5+16+4+12+20+5 + 5*8 + 6; UID transfer_ul = {0}; + int64_t pos = mxf_write_generic_desc(s, st, key); - if (sc->interlaced && sc->field_dominance) - desc_size += 5; - if (sc->signal_standard) - desc_size += 5; - if (sc->interlaced) - desc_size += 8; - if (sc->v_chroma_sub_sample) - desc_size += 8; - if (st->codecpar->color_range != AVCOL_RANGE_UNSPECIFIED) - desc_size += 8 * 3; - if (s->oformat == &ff_mxf_d10_muxer) - desc_size += 8 + 8 + 8; - if (get_trc(transfer_ul, st->codecpar->color_trc) >= 0) - desc_size += 20; - - mxf_write_generic_desc(s, st, key, desc_size); + get_trc(transfer_ul, st->codecpar->color_trc); mxf_write_local_tag(pb, 4, 0x3203); avio_wb32(pb, stored_width); @@ -1352,11 +1341,22 @@ static void mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID ke avio_w8(pb, sc->field_dominance); } + return pos; +} + +static void mxf_update_klv_size(AVIOContext *pb, int64_t pos) +{ + int64_t cur_pos = avio_tell(pb); + int size = cur_pos - pos; + avio_seek(pb, pos - 4, SEEK_SET); + klv_encode_ber4_length(pb, size); + avio_seek(pb, cur_pos, SEEK_SET); } static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st) { - mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key, 0); + int64_t pos = mxf_write_cdci_common(s, st, mxf_cdci_descriptor_key); + mxf_update_klv_size(s->pb, pos); } static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) @@ -1364,10 +1364,9 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) AVIOContext *pb = s->pb; MXFStreamContext *sc = st->priv_data; int profile_and_level = (st->codecpar->profile<<4) | st->codecpar->level; + int64_t pos = mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key); if (st->codecpar->codec_id != AV_CODEC_ID_H264) { - mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 8+5); - // bit rate mxf_write_local_tag(pb, 4, 0x8000); avio_wb32(pb, sc->video_bit_rate); @@ -1377,26 +1376,19 @@ static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st) if (!st->codecpar->profile) profile_and_level |= 0x80; // escape bit avio_w8(pb, profile_and_level); - } else { - mxf_write_cdci_common(s, st, mxf_mpegvideo_descriptor_key, 0); } + + mxf_update_klv_size(pb, pos); } -static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static int64_t mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, const UID key) { AVIOContext *pb = s->pb; MXFContext *mxf = s->priv_data; int show_warnings = !mxf->footer_partition_offset; - int duration_size = 0; + int64_t pos = mxf_write_generic_desc(s, st, key); - if (s->oformat == &ff_mxf_opatom_muxer) - duration_size = 12; - if (s->oformat == &ff_mxf_d10_muxer) - size += 5; - - mxf_write_generic_desc(s, st, key, size+duration_size+5+12+8+8); - - if (duration_size > 0) { + if (s->oformat == &ff_mxf_opatom_muxer) { mxf_write_local_tag(pb, 8, 0x3002); avio_wb64(pb, mxf->body_offset / mxf->edit_unit_byte_count); } @@ -1432,13 +1424,14 @@ static void mxf_write_generic_sound_common(AVFormatContext *s, AVStream *st, con mxf_write_local_tag(pb, 4, 0x3D01); avio_wb32(pb, av_get_bits_per_sample(st->codecpar->codec_id)); + + return pos; } -static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key, unsigned size) +static int64_t mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key) { AVIOContext *pb = s->pb; - - mxf_write_generic_sound_common(s, st, key, size+6+8); + int64_t pos = mxf_write_generic_sound_common(s, st, key); mxf_write_local_tag(pb, 2, 0x3D0A); avio_wb16(pb, st->codecpar->block_align); @@ -1446,21 +1439,26 @@ static void mxf_write_wav_common(AVFormatContext *s, AVStream *st, const UID key // avg bytes per sec mxf_write_local_tag(pb, 4, 0x3D09); avio_wb32(pb, st->codecpar->block_align*st->codecpar->sample_rate); + + return pos; } static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st) { - mxf_write_wav_common(s, st, mxf_wav_descriptor_key, 0); + int64_t pos = mxf_write_wav_common(s, st, mxf_wav_descriptor_key); + mxf_update_klv_size(s->pb, pos); } static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st) { - mxf_write_wav_common(s, st, mxf_aes3_descriptor_key, 0); + int64_t pos = mxf_write_wav_common(s, st, mxf_aes3_descriptor_key); + mxf_update_klv_size(s->pb, pos); } static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st) { - mxf_write_generic_sound_common(s, st, mxf_generic_sound_descriptor_key, 0); + int64_t pos = mxf_write_generic_sound_common(s, st, mxf_generic_sound_descriptor_key); + mxf_update_klv_size(s->pb, pos); } static const uint8_t mxf_indirect_value_utf16le[] = { 0x4c,0x00,0x02,0x10,0x01,0x00,0x00,0x00,0x00,0x06,0x0e,0x2b,0x34,0x01,0x04,0x01,0x01 };