From patchwork Sat Apr 11 13:44:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18857 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 20F2544B610 for ; Sat, 11 Apr 2020 16:53:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0226C68B5D0; Sat, 11 Apr 2020 16:53:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 55E5D68AF26 for ; Sat, 11 Apr 2020 16:53:16 +0300 (EEST) Received: by mail-il1-f196.google.com with SMTP id i75so4280307ild.13 for ; Sat, 11 Apr 2020 06:53:16 -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=fFGx0x8JgPvtnYmlvPN6QY/pBzlb0hWqG0JO7my17KI=; b=lrOE9ZVOHQ3z2E0LKEehA7fCkczfioBfuuL6rEAFNXcrYBe8ogrJN3uSYKemGlQnkX MvX3TSn0/RDFs59Pp8yq3PnsrelgwToigQ/t6vRDFzcWiutSjnGFVnWoITqgCK4YvMDC XeEXUacNwM9vvAPayZcinSq450s/69Tp3tP4iuuURprqET5TdXyY8bDh7YKyDGCmGG2w 0wSlP2Kf2sfuBGN/3Oe4+iY0sA4O+dfCnKPNnMhgF8yReSGI0jZYbuapLf/DTvXzpfAz QAUuWFrxnt+IETmC3ihGNjWHUFVN3o8ljevtEOobM5qGqGjwFUkxaVQ/yJvrua8BfJPp k9YA== 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=fFGx0x8JgPvtnYmlvPN6QY/pBzlb0hWqG0JO7my17KI=; b=BuL7eBmPZJwLtv6C/j7vRIdlmzNj3ZCaauyzIbcU8S1i+sJGrfiRClBLl3MTN6vHc4 1nCmbvwnyLOCSRKFnjPGdvDt1ymSO8lLAmKOgS9Ez5H0gt0L69HkIkDxe+4ymJ5iXqIW JJPl1QZIcFLHHJaSoEh6umu5fIoU2mfUOZDtOdDGFlt/Ap+tnBm/p/hKzVHVtSBT60Tn rimjJtC0YZvQd9rTWyWGIbxJDp5cRDRPxJG+LvzzwixwlIVWCuw8F+8EMmHcYgwlZ9HQ ehAktvuZIenqjSjK/ded3+FOUT0CISBf2WEUHYEI+EmWGBjHvHugEU4d1UJTDOnJ0Hwq ltgg== X-Gm-Message-State: AGi0PuabTjSnEL2Bx/6ip/ptQqv4w0rGQYTUDj9j3wOzLB0Pu9vjzQ+b 0YcA4dJEVJfORiHquxdvUjQ/y4++Mf0= X-Google-Smtp-Source: APiQypJMQIQ8GDFphOm5X9LQ4tkf+2exjFN66g140gGBz/f69x8kxAgxK+byjlVYhwh65Wkcl/10cg== X-Received: by 2002:a63:e610:: with SMTP id g16mr9047242pgh.354.1586612719933; Sat, 11 Apr 2020 06:45:19 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:19 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:03 +0800 Message-Id: <1586612703-6862-2-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 1/7] lavc: add a new sidedata type 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao add a new sidedata type for Dolby Vision. Signed-off-by: Jun Zhao --- libavcodec/avpacket.c | 1 + libavcodec/packet.h | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index ad020ee..276beeb 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -396,6 +396,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_ENCRYPTION_INFO: return "Encryption info"; case AV_PKT_DATA_AFD: return "Active Format Description data"; case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; + case AV_PKT_DATA_DOLBY_VISION_DECODER_CONF: return "Dolby Vision"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index e53abe6..2f7b193 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -274,6 +274,15 @@ enum AVPacketSideDataType { AV_PKT_DATA_ICC_PROFILE, /** + * Dobly vision decoder configuration + * ref: + * dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2, section 2.2 + * dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2, section 3.3 + * Tags are stored in struct AVDOVIDecoderConfigurationRecord. + */ + AV_PKT_DATA_DOLBY_VISION_DECODER_CONF, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. From patchwork Sat Apr 11 13:44:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18860 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 A9E0C448D37 for ; Sat, 11 Apr 2020 17:08:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83E0168B683; Sat, 11 Apr 2020 17:08:39 +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 17B0A68B333 for ; Sat, 11 Apr 2020 17:08:33 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id d17so2269084pgo.0 for ; Sat, 11 Apr 2020 07:08:33 -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=Wukzt6zm4nFLYExCN9avv+ajgQywJ62OrmoBLaOr+OI=; b=vEH+xjcfw1FVxpkN7d8LUBqpe10nqEBGA+M1UjKT7mfgRiVi/4YXIUYBIFf1vZfqBs of4lha95y7sz9UaEwkEVd/Lej80C6I/4S/hFlNRgR59iC4hnwv62xK3lqmawRhTkRAx/ RoA+jr8bU9uOJ8/UbRZk8s2CChilKKY42CPDSNzl41RgStcm1RU2EM14ms7roz8MtgmY cNeBrjrZSGIXBh4EdIVujt/cjEfnmQHluJff7I7zYbYrPtRrI5pze9iQiScJDWO+nMYg 8ule638pHcsD7BnwVoi3hAwG/wFBxTrYnoweNfIJvb+62U5+XdZoSiXnnCKHbxUCvEXn jcuQ== 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=Wukzt6zm4nFLYExCN9avv+ajgQywJ62OrmoBLaOr+OI=; b=nqQi3RtG7GhpL4AqW8ySuowWdDh6NJlmmh32jAuZy9oZtu8KklKMtpJWMI4g0Yw4qZ US1X5GPKdD5bipKtb/bGS+xpN8yfzZUaO3FMzGz8vG1Q0EKRAAMs5AWhpyHDcsyO/Vel dSKmZbpLAqRQ9y5vIsOidkjn06tASc2zC/CljkcZFrwqHFHB8fQoFXr5IVxLXGiFc8lk UpfTXUFT4GHijV8PKRED9OvA1i6NqPNuq4iXiQRNEV+HwSz/1gSGilxNw2Q2/tQYom4Q VeSWpGvje0JSK2bpF+quL4oHHb543kH3QFaDgWkZfUkufmyarUBHUuHtNyDWp4/inqxy Aanw== X-Gm-Message-State: AGi0PuZRalpsYblUhpRLWnnZLMbmFYvfJDUBFVHUvnQYIC7fu03GAZb8 XPdxwT7PcxI2dYJ5IF+Ju5hls4LKaUQ= X-Google-Smtp-Source: APiQypJFXk9gJRCaS1sCnJg8pvQAN+ISrjzIT/4lSPY+jzWUey4lRIH6oYXukyISaA0f9tCc6ZOyQw== X-Received: by 2002:a63:5fd0:: with SMTP id t199mr9124874pgb.207.1586612726925; Sat, 11 Apr 2020 06:45:26 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:26 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:04 +0800 Message-Id: <1586612703-6862-3-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 2/7] lavutil: add dolby vision related header 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: vacinfang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: vacinfang add dolby vision related header Signed-off-by: vacinfang --- libavutil/Makefile | 1 + libavutil/dolby_vision_meta.h | 58 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 libavutil/dolby_vision_meta.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 8feb029..9204925 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -23,6 +23,7 @@ HEADERS = adler32.h \ des.h \ dict.h \ display.h \ + dolby_vision_meta.h \ downmix_info.h \ encryption_info.h \ error.h \ diff --git a/libavutil/dolby_vision_meta.h b/libavutil/dolby_vision_meta.h new file mode 100644 index 0000000..3fc2cad --- /dev/null +++ b/libavutil/dolby_vision_meta.h @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2020 Vacing Fang + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * dolby vison configuration + */ + + +#ifndef AVUTIL_DOLBY_VISION_META_H +#define AVUTIL_DOLBY_VISION_META_H + +#include + +/* + * dolby vison configuration + * ref: dolby-vision-bitstreams-within-the-iso-base-media-file-format-v2.1.2 + dolby-vision-bitstreams-in-mpeg-2-transport-stream-multiplex-v1.2 + * @code + * uint8_t dv_version_major, the major version number that the stream complies with + * uint8_t dv_version_minor, the minor version number that the stream complies with + * uint8_t dv_profile, the Dolby Vision profile + * uint8_t dv_level, the Dolby Vision level + * uint8_t rpu_present_flag + * uint8_t el_present_flag + * uint8_t bl_present_flag + * uint8_t dv_bl_signal_compatibility_id + * @endcode + */ +typedef struct { + uint8_t dv_version_major; + uint8_t dv_version_minor; + uint8_t dv_profile; + uint8_t dv_level; + uint8_t rpu_present_flag; + uint8_t el_present_flag; + uint8_t bl_present_flag; + uint8_t dv_bl_signal_compatibility_id; +} AVDOVIDecoderConfigurationRecord; + +#endif /* AVUTIL_DOLBY_VISION_META_H */ From patchwork Sat Apr 11 13:44:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18858 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 1AC2144B610 for ; Sat, 11 Apr 2020 16:53:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0242868B599; Sat, 11 Apr 2020 16:53:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0864568B683 for ; Sat, 11 Apr 2020 16:53:22 +0300 (EEST) Received: by mail-io1-f67.google.com with SMTP id w20so4493028iob.2 for ; Sat, 11 Apr 2020 06:53:21 -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=rAN9brdbOlbgsZacA3IqBUoM9vPS/1tI+bVDxSjIkZU=; b=BR6q/sEs/aXa9btPqXeUc53d0obywkV7+XL7bn7GSFB9clXz8bX/bvN4PuUnC4GUVp Zh+Err99sdGq3J7m9c//lLZeszoL0uzJlKJRWDrP64PZRtYnhL+bNpMqhY/WQduXBQg0 ZddxLI9KCXdEkqmShw0ExVA2/aRt3jADtnXA+nCUyjE0WjxPoxg+p+yyboEDNOnEY5B3 JeuJ8UjHGCekzF7Y711H3WF87wbY3zMHNCZaqT2exRqRKCJ8l1LnnAfjErzUvqY5FlhI kkT7qSDf3WKFzN2xHKWzP9rh3w25G3w0tELfvePOX2EW4x2ChqKCItVHNyuOQXiKeQ3j BOdQ== 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=rAN9brdbOlbgsZacA3IqBUoM9vPS/1tI+bVDxSjIkZU=; b=qQmv+/N8QGgI044fBKedRubBetk77Pfhy4aCWz/2tHd0HfzYD3UFmlLBgRJr62aTPj ds7GTWWgNLNZQoc4Q+sQaRdzsIupt5b88LxH3/n6/FM5Dgyjho1OI6UcWp+YdlIIn7Ev ULStG9eymGTQfuNuYnA4ed9480Toj+2LPJnYEex/DL5diYt+5r1CWQbntTnXDrfHkDBm FhDAramf1C9+qmuzVPtIdiAmOemIjjcQYNNI9cCv3ABBUOhal6hgrL1ySlAQgep3g6M2 EhpUtrbg5aaMRmX3OcCbD6ecKrPNP8F2F1Cg0yukrR+TX7Y9cQRSIFcDZFTzkBsve8NK qcoA== X-Gm-Message-State: AGi0PuZh+S5nbWoZ1gq/Unl6X8iBizW/zcf03z23IcX1+C+CRREKBSNp PUUVczM7ShARCINntlJjLnvJ3OsqqA0= X-Google-Smtp-Source: APiQypK/uEnRSCbT0w2ffaclWmcH2yX+Azb5NO1geOYbYv7BWsUHmzNCbGgtDE6LC2Cetbk1ABGCsw== X-Received: by 2002:a63:db51:: with SMTP id x17mr8741193pgi.162.1586612730042; Sat, 11 Apr 2020 06:45:30 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.27 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:29 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:05 +0800 Message-Id: <1586612703-6862-4-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 3/7] lavf/mpegts: support DOVIVideo Stream Descriptor 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 DOVIVideo Stream Descriptor from Dolby Vision Streams Within the MPEG-2 Transport Stream Format V1.2 From the spec: https://www.dolby.com/us/en/technologies/\ dolby-vision/dolby-vision-bitstreams-in-mpeg-2-transport-\ stream-multiplex-v1.2.pdf. export the Dolby Vision information with sidedata. Signed-off-by: vacingfang --- libavformat/mpegts.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a4ecb2e..a3e584d 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -28,6 +28,7 @@ #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/avassert.h" +#include "libavutil/dolby_vision_meta.h" #include "libavcodec/bytestream.h" #include "libavcodec/get_bits.h" #include "libavcodec/opus.h" @@ -2146,6 +2147,45 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type st->request_probe = 0; } break; + case 0xb0: /* dolby vision video stream descriptor */ + { + uint32_t buf; + AVDOVIDecoderConfigurationRecord *dovi; + if (desc_end - *pp < 4) // (8 + 8 + 7 + 6 + 1 + 1 + 1) / 8 + return AVERROR_INVALIDDATA; + + dovi = (AVDOVIDecoderConfigurationRecord *)av_stream_new_side_data( + st, AV_PKT_DATA_DOLBY_VISION_DECODER_CONF, sizeof(*dovi)); + if (!dovi) + return AVERROR(ENOMEM); + + dovi->dv_version_major = get8(pp, desc_end); + dovi->dv_version_minor = get8(pp, desc_end); + buf = get16(pp, desc_end); + dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits + dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits + dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit + dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit + dovi->bl_present_flag = buf & 0x01; // 1 bit + if (desc_end - *pp >= 20) { // 4 + 4 * 4 + buf = get8(pp, desc_end); + dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits + } else { + // 0 stands for None + // Dolby Vision V1.2.93 profiles and levels + dovi->dv_bl_signal_compatibility_id = 0; + } + + av_log(fc, AV_LOG_TRACE, "dolby vision, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + dovi->dv_version_major, dovi->dv_version_minor, + dovi->dv_profile, dovi->dv_level, + dovi->rpu_present_flag, + dovi->el_present_flag, + dovi->bl_present_flag, + dovi->dv_bl_signal_compatibility_id); + } + break; default: break; } From patchwork Sat Apr 11 13:44:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18853 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 2951744B7E4 for ; Sat, 11 Apr 2020 16:45:42 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1375F68B4CB; Sat, 11 Apr 2020 16:45:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CDD068B1B1 for ; Sat, 11 Apr 2020 16:45:35 +0300 (EEST) Received: by mail-pg1-f182.google.com with SMTP id x26so1048039pgc.10 for ; Sat, 11 Apr 2020 06:45:35 -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=BgoHBrNUWKH65fgJHEiVTrosFG2FGq44+n2lIy4YLMc=; b=LGRQq/IP8iHqeJpUS/tXSBo/2g++CuPG2/RPhtmHeB80s3+aRdHsRTToiWp/voDg9R Tvzg8I80xLdibmbZ9755t4XO/VcY1MS/btD3sw/5YB9wNsPVqquciuZZn6BhX7H9neSp xVhAayJQDXgKafpgRLfWK5z4Tsl+KL17w8F00fEinFBHtfwwKWW4qQdlnqjR8id1/caM q+xiHqLRvtSnvJBkWE/S9l6e5CCpvXlQ9z29H61Wsuibft5LrzvaQRYifmPm9NS/gWHD SdRUSrXY0loTqXJrcpWtGNmyDsFLGx9gn4NWVtcoYGeIt8QFHbzwFkiQl8DA+PIOcn0+ N1gQ== 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=BgoHBrNUWKH65fgJHEiVTrosFG2FGq44+n2lIy4YLMc=; b=mljj+YEYDgDWqOJ5NkhgEdxH9abKsf3hwBIbrVnTrj0Q2y2kIbCGSZguJ1a7OPuqfi OR9KL/R+mYSk9lUPVhk6UPeCUzhwpPKGaJumSKXuNPiL2LwwWBJgqiQvvtRS5i9ujfn1 /0BFYFUHJpuifbhETLfGcBKERJI/7M8ph/FBRIPyGePOzGoBIv/qiwtUOZ04aroHE9Dw aPq9jWa1FdugTk3YyL0ihWlIHKtuzj0Be4zNBWwpcSy1zRMwr9ixNYFbmItRwTP8+ffz uFSywNGRnNtzgS9HbW6e/QE1rR57YalYDPyox3Z97ytgWm5Ln5f0tu/4VF0Meu0VnTdY qj6w== X-Gm-Message-State: AGi0PuZYmEyScagfuEeRH3kLYXGRt5POh9aEaa+QZOG41/vlFD48irXR ok+It+yeOR5aAyacPfx6WT74PFjixdE= X-Google-Smtp-Source: APiQypIVOArUjqZL0Cmv+z0WYo81B6lty5Ke4WRu0k+5/qmmOjTDAB20E7wbsy517s4TAUmpaUDZ2A== X-Received: by 2002:a63:c007:: with SMTP id h7mr8842233pgg.428.1586612733161; Sat, 11 Apr 2020 06:45:33 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:32 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:06 +0800 Message-Id: <1586612703-6862-5-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 4/7] 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) export the Dolby Vision information to sidedata. Signed-off-by: vacingfang --- libavformat/mov.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 0c4e468..ab5cac4 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -46,6 +46,7 @@ #include "libavutil/spherical.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" +#include "libavutil/dolby_vision_meta.h" #include "libavcodec/ac3tab.h" #include "libavcodec/flac.h" #include "libavcodec/mpegaudiodecheader.h" @@ -6771,6 +6772,55 @@ 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; + uint32_t buf; + AVDOVIDecoderConfigurationRecord *dovi; + + 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; + + dovi = (AVDOVIDecoderConfigurationRecord *)av_stream_new_side_data( + st, AV_PKT_DATA_DOLBY_VISION_DECODER_CONF, sizeof(*dovi)); + if (!dovi) + return AVERROR(ENOMEM); + + dovi->dv_version_major = avio_r8(pb); + dovi->dv_version_minor = avio_r8(pb); + + buf = avio_rb16(pb); + dovi->dv_profile = (buf >> 9) & 0x7f; // 7 bits + dovi->dv_level = (buf >> 3) & 0x3f; // 6 bits + dovi->rpu_present_flag = (buf >> 2) & 0x01; // 1 bit + dovi->el_present_flag = (buf >> 1) & 0x01; // 1 bit + dovi->bl_present_flag = buf & 0x01; // 1 bit + if (atom.size >= 24) { // 4 + 4 + 4 * 4 + buf = avio_r8(pb); + dovi->dv_bl_signal_compatibility_id = (buf >> 4) & 0x0f; // 4 bits + } else { + // 0 stands for None + // Dolby Vision V1.2.93 profiles and levels + dovi->dv_bl_signal_compatibility_id = 0; + } + + av_log(c, AV_LOG_TRACE, "dolby vision, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + dovi->dv_version_major, dovi->dv_version_minor, + dovi->dv_profile, dovi->dv_level, + dovi->rpu_present_flag, + dovi->el_present_flag, + dovi->bl_present_flag, + dovi->dv_bl_signal_compatibility_id + ); + + 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 }, @@ -6866,6 +6916,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 } }; From patchwork Sat Apr 11 13:44:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18854 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 19D0A44B7E4 for ; Sat, 11 Apr 2020 16:45:45 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0489768B375; Sat, 11 Apr 2020 16:45:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 309F468B1E3 for ; Sat, 11 Apr 2020 16:45:38 +0300 (EEST) Received: by mail-pj1-f49.google.com with SMTP id mn19so1811325pjb.0 for ; Sat, 11 Apr 2020 06:45:38 -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=y+ziyBiGe5ql7KTIbWnmpw4pe6nJhLx7HToDpH1z7d0=; b=LiRdb/j0pSkUDwGPTCiQnMINF8pJD00iX3ScEsxvNwI698MLN10QFpsM7T2kvlTwJR Tk7HiNzEwpePKYwdrXpIthh43ByhV8cxEGk3P5iCMdEenrK6vnamCYqgOFd7gDRy8CqZ fWtq771LR4DODwofk3L35+CeeK9JF1hEg8J0Sg8rbviVwLKKJ+mjJWkSabWYtFtk1qz4 ADZOMZL5eQ0c9R8qNof1O7rd1AeZwPHTWq+mF8kcG6z9ovFYDq81uz1+kGIDmxvGqHE6 F4hDZ650bxJsx//47Jc/Dzf5DYbeja/0xunWlh8ehhpy4Hl3b/B+QTor+iaGNl7QR3Pw owCA== 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=y+ziyBiGe5ql7KTIbWnmpw4pe6nJhLx7HToDpH1z7d0=; b=StulvWgn/xeJxkmOFBMVjxgGGHYfxUnknfKtywOsr5CQeYeLGANQZtCTPu1AMh0fip EU5HiV/QcwJr+OswCg/5SbCuOuK79nXqKDPsvByby2lVQ1MK4EJtHyzJGpNz1iNjSR4a T4vUmTVWFyk5RY8cnFoMEk7N9gAKbhZSAsWgH7vZ6vrppG0F0oglhWBeTnYtqDRlRW7t wFzvoA2jcP8Uht+HZe2SZIhJObxlFckzBHlsYVknBWrKnx8KaMhuOCf2fJrxafc32V6x U+xEEm/wBY8dUe4sZJ+mhMTNs9KMLI+T5ZdSGz/kgoewjlcPssnGuy0SobskDQ0LC1zK KEmg== X-Gm-Message-State: AGi0PuagN16kiUru8NET0Q3mfws6NSfWBQOv9j7muevAHbwJQzT46uRZ CeeFW55fwjGK6mnJi5cgHNjymPoa+HA= X-Google-Smtp-Source: APiQypL4YsU+6Mtp65Pun0q7LtC9Sb/fEjc51bG9zM+WT/pzdvBomAIaKLbtAxqCSvfZJDBcL1XSEw== X-Received: by 2002:a17:902:a603:: with SMTP id u3mr9341344plq.105.1586612736193; Sat, 11 Apr 2020 06:45:36 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:35 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:07 +0800 Message-Id: <1586612703-6862-6-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 5/7] lavf/dump: dump dolby vison side data 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 dump dolby vison side data. Signed-off-by: Jun Zhao --- libavformat/dump.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/dump.c b/libavformat/dump.c index 220f404..be0028b 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -27,6 +27,7 @@ #include "libavutil/intreadwrite.h" #include "libavutil/log.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/dolby_vision_meta.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "libavutil/avstring.h" @@ -387,6 +388,19 @@ static void dump_spherical(void *ctx, AVCodecParameters *par, AVPacketSideData * } } +static void dump_dolby_vision_metadata(void *ctx, AVPacketSideData* sd) +{ + AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *)sd->data; + av_log(ctx, AV_LOG_INFO, "Dolby Vision, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d", + dovi->dv_version_major, dovi->dv_version_minor, + dovi->dv_profile, dovi->dv_level, + dovi->rpu_present_flag, + dovi->el_present_flag, + dovi->bl_present_flag, + dovi->dv_bl_signal_compatibility_id); +} + static void dump_sidedata(void *ctx, AVStream *st, const char *indent) { int i; @@ -449,6 +463,9 @@ static void dump_sidedata(void *ctx, AVStream *st, const char *indent) case AV_PKT_DATA_ICC_PROFILE: av_log(ctx, AV_LOG_INFO, "ICC Profile"); break; + case AV_PKT_DATA_DOLBY_VISION_DECODER_CONF: + dump_dolby_vision_metadata(ctx, &sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size); From patchwork Sat Apr 11 13:44:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18855 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 D645344B7E4 for ; Sat, 11 Apr 2020 16:45:47 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B73DD68B603; Sat, 11 Apr 2020 16:45:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C94268B659 for ; Sat, 11 Apr 2020 16:45:41 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id x26so1048126pgc.10 for ; Sat, 11 Apr 2020 06:45:40 -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=dLrWY7YT9ap3CafW/qlbWFi4vCL73Bb8U7V1HXF7jPU=; b=Vx9Yf86HH9X+PrApTKYxaF6pvJRBjhabbLl0e8QtlySXxfJPUrPvk4v8pRcq4Uyd4b JZgnEc71WJ3haUGdr2pl+um7C7rdzLgJYp8dKE9yhAy/uH77lgXdYCleRA/L4qUCQfUV 8Ej/sC/FI6G2Q6PMGzLl0XOC1UiHazpJvDIXl9cd0lwT3AxTdDDTtx9n2IJMQYOU9/8F srLkiKkK560ggPNXvIbwlpmLwV8cl4atxAh4GcPmJI+mvJe/a917Bge/SfUbADXEV0QJ lz3f9pFjK9IX+PbOphbLpJOR2tvAX5JB9tD5NLybH+Ad/zjAG2TXii7Y9oCXCrZhQ64G vrBg== 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=dLrWY7YT9ap3CafW/qlbWFi4vCL73Bb8U7V1HXF7jPU=; b=ak9Gg99dAunG1tEVAGtYR/FB4y1prYjFmnXtZ9c76MHSS8T56L6PNb6y+uHXpjGtSr fIb7O6qaSB4TBK+IXxxUMmYbEe80gB/8eTrrYsFJi9ywRTHVHLQbCwgX5XMnqX0iNZKA G5gjaJemkZaiRigriABL1sl4RKViFr7lTsYJmL4HvR3i2EESvE90mi+0n3Hwh7KWbRCV GBNAx4JCdqY7uaR9nNSTZ83+nHgfRlUFMwikxH0OIu0RJFwe7yWJ923EHM4DvtTU6fe+ xnljyTEjMxshASW3OWWOOnFaqy7slH5no7gCqNEGGLftoP8toE0/7wsxJorSwk5tUD5n NfKQ== X-Gm-Message-State: AGi0PubjWkQPjnY0qTYEwV2YyGABtVxwglpPTRnoXP2z3BIBAOaXtRha zSUtUwPzzPILgceB7R7dDFMBOgQ2jBk= X-Google-Smtp-Source: APiQypLCmjnMl40FAXbYWAjfJKV3C0VPQCvfsakiau0PulMNAiDdTEbgBrldR9fqrmSYKocb1cBZ9A== X-Received: by 2002:a63:87c2:: with SMTP id i185mr8801057pge.312.1586612739246; Sat, 11 Apr 2020 06:45:39 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id c4sm3899687pgg.17.2020.04.11.06.45.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Apr 2020 06:45:38 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Apr 2020 21:44:08 +0800 Message-Id: <1586612703-6862-7-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 6/7] fftools/ffprobe: support dolby vision 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 support dolby vision sidedata. Signed-off-by: Jun Zhao --- fftools/ffprobe.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index e3f221f..108e837 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -36,6 +36,7 @@ #include "libavutil/display.h" #include "libavutil/hash.h" #include "libavutil/mastering_display_metadata.h" +#include "libavutil/dolby_vision_meta.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" #include "libavutil/spherical.h" @@ -1928,6 +1929,16 @@ static void print_pkt_side_data(WriterContext *w, AVContentLightMetadata *metadata = (AVContentLightMetadata *)sd->data; print_int("max_content", metadata->MaxCLL); print_int("max_average", metadata->MaxFALL); + } else if (sd->type == AV_PKT_DATA_DOLBY_VISION_DECODER_CONF) { + AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *)sd->data; + print_int("dv_version_major", dovi->dv_version_major); + print_int("dv_version_minor", dovi->dv_version_minor); + print_int("dv_profile", dovi->dv_profile); + print_int("dv_level", dovi->dv_level); + print_int("rpu_present_flag", dovi->rpu_present_flag); + print_int("el_present_flag", dovi->el_present_flag); + print_int("bl_present_flag", dovi->bl_present_flag); + print_int("dv_bl_signal_compatibility_id", dovi->dv_bl_signal_compatibility_id); } writer_print_section_footer(w); } 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) {