From patchwork Sat Apr 11 13:44:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18861 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 81BF944B610 for ; Sat, 11 Apr 2020 17:16:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E8BC68B6AE; Sat, 11 Apr 2020 17:16:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF1F868B0C5 for ; Sat, 11 Apr 2020 17:16:27 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id m13so2257200pgd.8 for ; Sat, 11 Apr 2020 07:16:27 -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=zyFt/M8g+sfosxFTnHLcAuvrjoe+9q5sTfWYy8rqXxM=; b=O5SsRC2aWDDg1p71UrJXi9PqqZEdTU90MDF1/nXnPGvmE9VeDG8KANOD0fq8iNp2af kgXklL1i07+Z3ytpof+64rtX6OF2dy53YDAg+O+EqqWo9XgFux5TraRHxBqnFuR7//ob mJlMrJY0XnMFSKEWVtw9qx30Kqoql2+I/w98hU1iRBceIdkwY0pKbWSRiKaho80T854d Qc9qPS43rxPibw0peICut2BcwvUXwvrML1pyZkkiYZlTA7MhrupvX1YCMk8s0dLuQtGc WabUJSGWc70Qtzt732EOQ1lb3v7dXjJO2TtHDvPuWgmJpC00nde9YwaLAUmd7dcqRcvu xIJA== 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=zyFt/M8g+sfosxFTnHLcAuvrjoe+9q5sTfWYy8rqXxM=; b=rgciki9dEVT9yLQ7J6kFI4j1pAoflo4bJw/s2zNyDwcYJZdsx1Ize0cA1eEgyjj5uE O4IGK8x6P/A5LBNdHh3bXe9zUfnRmoNf3gAVw4uskPy0iD1DXAbQLHdtm4n9Kg+BmlPJ W0LemKD3FB8LiZyU/JMU+Sn0sfIzeGzCGOIcaqho1A5XJuKNagAugplmkDM6bJ5uvrBQ YGG2L45KIh9st5ubD5jYFe+wEVPrVHm8CWsSyBR1AEPlSWvvgSg+Q84C33e+aewZq6Ui /Rza/iNVHwMD1rPUHxNykGR3m0t8v0nCncETDLlb2dCeeUU37jdN5l0aSv7fbyk+K0qo JTKg== X-Gm-Message-State: AGi0PuZg8oaQqR+LF91P7NaLkw9LZWrf95O/NbATJc7mrob2uONUl2yx Libsmg9j6lm9oDJcZQLCCU0iJ2PaNIo= X-Google-Smtp-Source: APiQypL4bYTl8VDk0HW612n1wRqpr5HD19bMBVXaHVS1zvA1KNP7jiXGjBIjuixX3dyXk/G56q4jMw== X-Received: by 2002:a17:902:d3cb:: with SMTP id w11mr9093418plb.257.1586612742256; Sat, 11 Apr 2020 06:45:42 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:41 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:09 +0800 Message-Id: <1586612703-6862-8-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586612703-6862-1-git-send-email-mypopydev@gmail.com> References: <1586612703-6862-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 7/7] lavf/movenc: enable dvcC/dvvC box support from sidedata 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao enable dvcC/dvvC box support from sidedata Signed-off-by: Jun Zhao --- libavformat/movenc.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6db09b7..bdd4467 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -51,6 +51,7 @@ #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavutil/dolby_vision_meta.h" #include "libavutil/color_utils.h" #include "hevc.h" #include "rtpenc.h" @@ -1817,6 +1818,27 @@ static int mov_write_sv3d_tag(AVFormatContext *s, AVIOContext *pb, AVSphericalMa return update_size(pb, sv3d_pos); } +static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDecoderConfigurationRecord *dovi) +{ + avio_wb32(pb, 32); /* size = 8 + 24 */ + if (dovi->dv_profile > 7) + ffio_wfourcc(pb, "dvvC"); + else + ffio_wfourcc(pb, "dvcC"); + avio_w8(pb, dovi->dv_version_major); + avio_w8(pb, dovi->dv_version_minor); + avio_wb16(pb, (dovi->dv_profile << 9) | (dovi->dv_level << 3) | + (dovi->rpu_present_flag << 2) | (dovi->el_present_flag << 1) | + dovi->bl_present_flag); + avio_wb32(pb, (dovi->dv_bl_signal_compatibility_id << 28) | 0); + + avio_wb32(pb, 0); /* reserved */ + avio_wb32(pb, 0); /* reserved */ + avio_wb32(pb, 0); /* reserved */ + avio_wb32(pb, 0); /* reserved */ + return 32; /* 8 + 24 */ +} + static int mov_write_clap_tag(AVIOContext *pb, MOVTrack *track) { avio_wb32(pb, 40); @@ -2170,11 +2192,15 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex if (track->mode == MODE_MP4 && mov->fc->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { AVStereo3D* stereo_3d = (AVStereo3D*) av_stream_get_side_data(track->st, AV_PKT_DATA_STEREO3D, NULL); AVSphericalMapping* spherical_mapping = (AVSphericalMapping*)av_stream_get_side_data(track->st, AV_PKT_DATA_SPHERICAL, NULL); + AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) + av_stream_get_side_data(track->st, AV_PKT_DATA_DOLBY_VISION_DECODER_CONF, NULL);; if (stereo_3d) mov_write_st3d_tag(s, pb, stereo_3d); if (spherical_mapping) mov_write_sv3d_tag(mov->fc, pb, spherical_mapping); + if (dovi) + mov_write_dvcc_dvvc_tag(s, pb, dovi); } if (track->par->sample_aspect_ratio.den && track->par->sample_aspect_ratio.num) {