From patchwork Thu May 18 00:49:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3691 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp436704vsk; Wed, 17 May 2017 17:50:54 -0700 (PDT) X-Received: by 10.223.173.74 with SMTP id p68mr708766wrc.163.1495068654835; Wed, 17 May 2017 17:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495068654; cv=none; d=google.com; s=arc-20160816; b=R+9N+RpAD9R6RIJg5JbOiLxR6WKo+ic2QLNmewU9v2WA5jDbI4+wIoWeXhfDmAJKr0 S81HIXSwJMvm4YDdDIAkvbmwXa20DsCrpUs29oXvYSIW6UNhBoWPEVe4QI6wOXBoBU6w drKO2ajSybFTKe8Bm2SsCCj+la4KUx3gLBJJmFHvtWYTxU2peASdScAn4Q23svpycsAH xaB5k/9MzsVzeoyKQzwoOIWb9vVZq0pE2R0U8FAjNSdxyJCqG9UPk39jtUoWLy4yW7Kj gUYf/Or2aHgnj4oIRs+wKei4xiRSd44Lvn5SYrR0/wjWCPDF9Tz5nOT7DyS74iU+5NHe tXng== 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=xqfrtuJWdvVuzC/xP5lq8disSQc9Da9lHZde21Vo1zc=; b=XvISH4tovSi3XLVkQVWloOhmPiCq8RA/v70NTZSqZb8pTz934DAZXM/cfUnY/pOMG0 42GUqdloQ6k26LZXQQJmOrwZPPSl3QaYlkguHVI51m0ZpCzgo5bXLKjxtGtFgIPoxUAh hBgwG1d3Vy7MtmeMhdxisopJwQd1Gikx9nAR+DY3DcC/IIiGh3uoWVEdkJlN+a10p0us napu9j8Y832vQUc3Yco0//Vj6dPkCXAuFQUypAldJyX1K8kT8JbRng5zV2Dynn6WIiFi PeLECraOJmRSup0/Al74vTUX8QU76xJ32lgms8L84/W61n5zbUzc7Op9ZJEyRwr6opo7 a8zg== 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 u64si4364820wmg.60.2017.05.17.17.50.54; Wed, 17 May 2017 17:50:54 -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 419D96898C5; Thu, 18 May 2017 03:50:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f182.google.com (mail-qk0-f182.google.com [209.85.220.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 495B1680A0A for ; Thu, 18 May 2017 03:50:30 +0300 (EEST) Received: by mail-qk0-f182.google.com with SMTP id u75so24269399qka.3 for ; Wed, 17 May 2017 17:50:30 -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=3H3ZUFZKzOQiDw6JSH9bm0oQMmBdCWM7h53ZrLC+xvA=; b=i00xFAWR2aTx4Nr1uvkwr+JXvM+LXQxTMMEpNO/9I2EIWes8P74/D17jGDOB+iypuG SdkvzV9MV375u1fFGji0F+sY/JRz3wfPuvZSD/HPYgTwdDA3nGJjw3VX+XQ16y2llMnO HFhXfais5eoS2uzs87HSkPRnsqY8UfZjxlB4kk+qUA4A23tqC2nVFRZ609Unzqd3JqeI mCygqnrghpBkCOruGJnWfelUBqW7dRenenxATBch9XT6w+Qjeg3c3FyX8jqtZAtkJJBL DMORnAyoFJYtO5tg2JiZ5x28hKHyZ4vEo6t9gc3pPwnGjqK7mlq/7rxlzGodiQb/Cfup 9n2Q== 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=3H3ZUFZKzOQiDw6JSH9bm0oQMmBdCWM7h53ZrLC+xvA=; b=QQhWVeSfC2a5Na7iS6e1nx30fMFNuZFqQhrFccwDJ4i6/37qB65HoPTprVGywfPunj v4KGE2l0sI3uron1CzIWNi69GhbVG2VgKQv041YMsQhjKAFlMy71SvPU4vNVqR5LE7mH aWpFErO87sP2hEfJE/K2CmRHJEsQMCwFr/gLP44qx74VQGT928naoO4L1yOf6XqmTKpr EcXQA9JzfQV8Q9S2so6MPyIDf0LdbCrOPlNdPFMi7Wa0rzfctCJdTwib1joBsQ3SUs4E AAFokfHyCPOdVig+cQwt+BUS4esRwz44Wqv7r6ci4BiJgdzm4Sg7tg8SFaQQNifKhORJ J/Vg== X-Gm-Message-State: AODbwcAnSLwKUqIvOPV8U7yZAN5O3/aD4RMsIPpUF9w6OXHA4pXpZz4j 7WoQ+AyWk6AX9lGn X-Received: by 10.55.7.138 with SMTP id 132mr1331778qkh.274.1495068629031; Wed, 17 May 2017 17:50:29 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id d5sm2504461qkf.4.2017.05.17.17.50.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 May 2017 17:50:28 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2017 21:49:40 -0300 Message-Id: <20170518004941.5140-3-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 3/4] avformat/mov: add support for reading Mastering Display Metadata 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 Partially based on Matroska decoder code. Signed-off-by: James Almer --- libavformat/isom.h | 2 ++ libavformat/mov.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/libavformat/isom.h b/libavformat/isom.h index d9956cf63a..426f732247 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -27,6 +27,7 @@ #include #include +#include "libavutil/mastering_display_metadata.h" #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" @@ -194,6 +195,7 @@ typedef struct MOVStreamContext { AVStereo3D *stereo3d; AVSphericalMapping *spherical; size_t spherical_size; + AVMasteringDisplayMetadata *mastering; uint32_t format; diff --git a/libavformat/mov.c b/libavformat/mov.c index afef53b79a..0b5fd849f3 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4612,6 +4612,60 @@ static int mov_read_tmcd(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + MOVStreamContext *sc; + const int chroma_den = 50000; + const int luma_den = 10000; + int version; + + if (c->fc->nb_streams < 1) + return AVERROR_INVALIDDATA; + + sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data; + + if (atom.size < 5) { + av_log(c->fc, AV_LOG_ERROR, "Empty Mastering Display Metadata box\n"); + return AVERROR_INVALIDDATA; + } + + version = avio_r8(pb); + if (version) { + av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version); + return 0; + } + avio_skip(pb, 3); /* flags */ + + sc->mastering = av_mastering_display_metadata_alloc(); + if (!sc->mastering) + return AVERROR(ENOMEM); + + sc->mastering->display_primaries[0][0] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->display_primaries[0][1] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->display_primaries[1][0] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->display_primaries[1][1] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->display_primaries[2][0] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->display_primaries[2][1] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->white_point[0] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->white_point[1] = + av_make_q(lrint(((double)avio_rb16(pb) / (1 << 16)) * chroma_den), chroma_den); + sc->mastering->max_luminance = + av_make_q(lrint(((double)avio_rb32(pb) / (1 << 8)) * luma_den), luma_den); + sc->mastering->min_luminance = + av_make_q(lrint(((double)avio_rb32(pb) / (1 << 14)) * luma_den), luma_den); + sc->mastering->has_primaries = 1; + sc->mastering->has_luminance = 1; + + return 0; +} + static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) { AVStream *st; @@ -5398,6 +5452,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('s','t','3','d'), mov_read_st3d }, /* stereoscopic 3D video box */ { MKTAG('s','v','3','d'), mov_read_sv3d }, /* spherical video box */ { MKTAG('d','O','p','s'), mov_read_dops }, +{ MKTAG('S','m','D','m'), mov_read_smdm }, { 0, NULL } }; @@ -5822,6 +5877,7 @@ static int mov_read_close(AVFormatContext *s) av_freep(&sc->stereo3d); av_freep(&sc->spherical); + av_freep(&sc->mastering); } if (mov->dv_demux) { @@ -6172,6 +6228,15 @@ static int mov_read_header(AVFormatContext *s) sc->spherical = NULL; } + if (sc->mastering) { + err = av_stream_add_side_data(st, AV_PKT_DATA_MASTERING_DISPLAY_METADATA, + (uint8_t *)sc->mastering, + sizeof(*sc->mastering)); + if (err < 0) + return err; + + sc->mastering = NULL; + } break; } }