From patchwork Thu May 18 00:49:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3690 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp436666vsk; Wed, 17 May 2017 17:50:46 -0700 (PDT) X-Received: by 10.28.49.195 with SMTP id x186mr938510wmx.71.1495068646525; Wed, 17 May 2017 17:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495068646; cv=none; d=google.com; s=arc-20160816; b=lVj+x1IaZ9bOfHnwd9HcfPFOg/rBbbSOx52CZlUxy6FKBKe3vJFCM5MFtmIm8L1fDV vqhK+d/17nmWg9MtNfSAtJNxlm/lRoBI62vHA9G4YE7Ud0GVoP1569wqdR+bPr230WgS ZVy+RKNNY30R3ZLFVdIIqK0KThMijW6t15SIj9+yCapypy5fDPml6apUnLs2udFI42K0 09yKYcZE0/xQTeMQa83vKiKCaAFtIxOi38IbpYB35U3JUWTw/H6zV88dB+puCUGZFhB2 h1xGPuJ98yX+dy18f4J7Q4+Op+zZLvXvgPbPLsZG6iFWSayrz8GjSN7+19z/pez7lhUP AN0g== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=UAFzvuOhPwrGhNNZuo5qkzQ2+27ACQuG2YliOx9ZveU=; b=BntVbqbp9txwJML5IBSGZT0nbvbQK5EQsOP9FFF1t/OEnbmWz5XF2DNhy+7OZZH3rw 8SWYA47yRTXodZPqWk9AaMirXuk+959Tfhpd+L8TdBPNY2U0bbZY0zs0tofay7+ou58G 6XXeZaPnnQYmqPBU29fK2XR1UCekQC7IVLazu0bFHOnq36PoXHikjwoTQGt00kO8fsMf vZVMAScTSdYrFsYm4muMNQUT3YP76NiFMlEYeZgnQaonnCnqM1/PQgh8950m6TlIdyMt h++xPjU97Erem78sUV5gJKzrpjNYzY0pMwCTIUg3N5EQJGSgIcEXPy06Tx1pMUAPScAH NPwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.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; dmarc=fail (p=NONE sp=NONE 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 94si3938548wrq.153.2017.05.17.17.50.46; Wed, 17 May 2017 17:50:46 -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; 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=NONE 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 D84336898A9; Thu, 18 May 2017 03:50:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f172.google.com (mail-qk0-f172.google.com [209.85.220.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 035E9680A64 for ; Thu, 18 May 2017 03:50:29 +0300 (EEST) Received: by mail-qk0-f172.google.com with SMTP id k74so24373132qke.1 for ; Wed, 17 May 2017 17:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=aUoQFuqKtN3qBu/v7FZS29aTPf8Elk1of23DTSrRyoM=; b=QYoErhPKu653wsd625NL1AdknRCyC0kHRCP1U01z4j4zQivFdb8rRfOjFyokgLB5Hz EqEE9JKMMhJeIo/+f1bnmWpJutXUYTk7BvuvSc/tsXEsmBWhje45VigRkuFzuBTh6tpZ GfDhdICZW6N5YzwA1al9LytTFNnq4HL8x86eItLjHTOdWMRRbiYr/AKwtkjkUArHGC25 0uwERai6gxS4GJ3qabgjTuWCX7oczTJaQk9QPE0iW5lEBAefSknq+vwHGnIuCM4e4ApF 1TjhGXXGEWUccAiwZtrd3qrb2CpQcmTM1kDj8/cjsZ1ak01iMQqGQawdM8Z5vXV+g2eQ 3iPQ== 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:in-reply-to :references; bh=aUoQFuqKtN3qBu/v7FZS29aTPf8Elk1of23DTSrRyoM=; b=HB3jXg+vMYlDY1O3+KjCY6neMWO/vvGvNRdejxjTOrLq59i8D4TQRFHibu79cLjRvj TOS9FFtnxMMwIBi0R2T9ppHhPd7N+Yr9D0pqocqsLZNwIowiTwwBDRunvoFPcLqP/iIk rT9QsbYiOyo9O/k5H2NnjVwtGlFH+P0dyj329BpykiGzRqUtW9GZjH8TfgpZal/YjD+L 6IyMKsxgJm0RqNgDVIQe8FIz7ZDrM+FrEJ1vZ2AKjCTZoF8mIPobbIcErEpBzH+UaX3p pCIFaqZI/Z16rjz/UlmKufoFek+622Eav63Q0zcIFunIils76SjMDNzUtGsChFsbkGr+ QR2g== X-Gm-Message-State: AODbwcAon+TegwOq/X6isrm064j3U+UQMv5NfKj5htC5NPuAHAwGxJNX fWf9vfSOqGfVWNj1 X-Received: by 10.55.67.71 with SMTP id q68mr1358026qka.304.1495068627764; Wed, 17 May 2017 17:50:27 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id d5sm2504461qkf.4.2017.05.17.17.50.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 May 2017 17:50:27 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2017 21:49:39 -0300 Message-Id: <20170518004941.5140-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170518004941.5140-1-jamrial@gmail.com> References: <20170518004941.5140-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/4] avformat/movenc: add support for writing Content Light Level Box 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" As defined in "VP Codec ISO Media File Format Binding v1.0" https://github.com/webmproject/vp9-dash/blob/master/VPCodecISOMediaFileFormatBinding.md Signed-off-by: James Almer --- libavformat/movenc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index cd436df7a4..eab7bbc8a7 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1154,6 +1154,27 @@ static int mov_write_smdm_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra return update_size(pb, pos); } +static int mov_write_coll_tag(AVIOContext *pb, MOVTrack *track) +{ + int size = 0; + int64_t pos; + const AVContentLightMetadata *coll = + (const AVContentLightMetadata *) av_stream_get_side_data(track->st, + AV_PKT_DATA_CONTENT_LIGHT_LEVEL, + &size); + if (!size) + return 0; + + pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "CoLL"); + avio_wb32(pb, 0); /* version & flags */ + avio_wb16(pb, coll->MaxCLL); + avio_wb16(pb, coll->MaxFALL); + return update_size(pb, pos); +} + static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) { int64_t pos = avio_tell(pb); @@ -2001,6 +2022,7 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr } else if (track->par->codec_id == AV_CODEC_ID_VP9) { mov_write_vpcc_tag(mov->fc, pb, track); mov_write_smdm_tag(mov->fc, pb, track); + mov_write_coll_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VC1 && track->vos_len > 0) mov_write_dvc1_tag(pb, track); else if (track->par->codec_id == AV_CODEC_ID_VP6F ||