From patchwork Mon Mar 30 08:22:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18506 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id E61E944BB4F for ; Mon, 30 Mar 2020 12:20:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C48D068B718; Mon, 30 Mar 2020 12:20:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBD6B68B61A for ; Mon, 30 Mar 2020 12:19:58 +0300 (EEST) Received: by mail-vs1-f65.google.com with SMTP id x82so10477243vsc.12 for ; Mon, 30 Mar 2020 02:19:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YfGNwiPDKRMgyrZZ9DHJ+alYX60oTvcLV4YoSfHWGjc=; b=uHuDD1UShHhMxKaUv4jq+oKGtAkO6oULRatKYCnhHKZU6A3vDxARW6zSXx8e0J8s3W 4bxKUqUaV7UPwubk9+BhhYul4OTifD2CeRKWTdbmYL95hG2VpEuDSoEUyXVnSacp8NxK 9zth+FQwU7/rNAHmh2ps2bFS4GkJBCTfc6wr4jTBVHQ3Unf69IUpabNIKupUsUGA2aRg F7ng2u3SnKgU3I6GkJ97XsHuH/SLnXOhbWbrEdKZlzeJ0qp8RT2/Lb0YZxS+aP0Eji7b Itp2fMpbqYs7KzPIjlb8xxKTYJnxTKi1QJBy0QIlgrzoGSz60h/+TtkiMglDuxyzPa6N Rz5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YfGNwiPDKRMgyrZZ9DHJ+alYX60oTvcLV4YoSfHWGjc=; b=o5Nol/9NMJW0jbJyL7ep+3rsh14jCsXrQjmZeMu1zL4PI5lLtOxoJKDmbEGqTi4Fcu lnZ87QHyANFM+lXn+RosKaNHym0a/1mMDZakGEw/ooLxpod5RLKkgOQ15HMxYpDwZYWI j8vTA2KNnAh6pqhTHApvFEgxGrQ+oS32kdgWc60HDN0RS5s/645a9Kn3b+Q8SGlqnozJ kzj/CHB4LfpE32jOH7HJSge4KUW6EbIR3EOQUUhRlSu6LOtNjnOzkHwUs1zECTTAC6GU Tde8W39Tx7MOF+Nvu+tJTMWanslVR18olnz9yxBdb0i35/Z6v0VlMG3P/8lsLezth14Q wzsw== X-Gm-Message-State: AGi0Pua5nooSIzNvXYVbvaDv6NvLJOdI6AAXwCNn17RhHGW8v1kyrCMQ P/ov0TVHbiljmPD2RsX1s4FMaRRpe5tRiqwBQ3Q= X-Google-Smtp-Source: ADFU+vusC5zFDjiAzEFhcXtqM0otUFdoh5ChaHfIOhWEuzHFz0iZthu/62s31M23HiUIb4IjWgO6Tg== X-Received: by 2002:aa7:949d:: with SMTP id z29mr12090379pfk.111.1585556612677; Mon, 30 Mar 2020 01:23:32 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id w2sm3510261pff.195.2020.03.30.01.23.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2020 01:23:32 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 16:22:54 +0800 Message-Id: <1585556574-31762-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585556574-31762-1-git-send-email-mypopydev@gmail.com> References: <1585556574-31762-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 4/4] lavf/mov: support dvcC/dvvC box for Dolby Vision 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 Cc: vacingfang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: vacingfang support dvcC/dvcC box from spec Dolby Vision Streams Within the ISO Base MediaFile Format Version 2.1.2 (https://www.dolby.com/in/en/technologies/dolby-vision/dolby-vision\ -bitstreams-within-the-iso-base-media-file-format-v2.1.2.pdf) And export the Dolby Vision profile/level with metadata. Signed-off-by: vacingfang --- libavformat/mov.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index f280f36..76d90a7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6766,6 +6766,37 @@ static int mov_read_dmlp(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + uint8_t version_major, version_minor, profile, level; + char str_buf[32]; + uint16_t tmp; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + if ((uint64_t)atom.size > (1<<30) || atom.size < 4) + return AVERROR_INVALIDDATA; + + version_major = avio_r8(pb); + version_minor = avio_r8(pb); + + tmp = avio_rb16(pb); + profile = (tmp >> 9) & 0x7f; // 7bits + level = (tmp >> 3) & 0x3f; // 6 bits + av_log(c, AV_LOG_DEBUG, "dolby vision stream, version: %d.%d, profile: %d, level: %d\n", + version_major, version_minor, profile, level); + + snprintf(str_buf, sizeof(str_buf), "%d", profile); + av_dict_set(&st->metadata, "dovi_profile", str_buf, 0); + snprintf(str_buf, sizeof(str_buf), "%d", level); + av_dict_set(&st->metadata, "dovi_level", str_buf, 0); + + return 0; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -6861,6 +6892,8 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('v','p','c','C'), mov_read_vpcc }, { MKTAG('m','d','c','v'), mov_read_mdcv }, { MKTAG('c','l','l','i'), mov_read_clli }, +{ MKTAG('d','v','c','C'), mov_read_dvcc_dvvc }, +{ MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, { 0, NULL } };