From patchwork Sun Apr 19 01:07:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19083 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 84F804493DB for ; Sun, 19 Apr 2020 04:16:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E78B68B790; Sun, 19 Apr 2020 04:16:49 +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 B1CC768B6D7 for ; Sun, 19 Apr 2020 04:16:47 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id o185so2690732pgo.3 for ; Sat, 18 Apr 2020 18:16:47 -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=fbMDl3WUL6WATGgniP20iWO8Hr/MRNAiVowPbOk/Fnw=; b=Dupl31m3+1FugYdZHFKibo409IlEcNn+ZSU+t+EKuFiskl+Bo8lUv9SoqAWE+mKQx6 gOKKm36dEvqrxrVYhy3dsaPZeJiDRJLt7X7Rmc0adPhw7LcUio6Lt3Cx4Av2iUTf9DPa 9Uj5AHcnXyqd1zkJsjGf+P0ZBzkVeYnmQ54JNwh5Nop4eNBjO2GRnwPDurg0IiEgt9pE fNzLAHzb4mVLjnYKlm6Ob9Pw6glidNtpiUq8yDtAcHrzuyMW1nsxSfwI7hcOgFMu43fR GYD0qudndQk5GOgl/AlprSmJUpp/COUbgjaBjGZkerOmvRdVTaNsh2nduZoZRCCoDWDr 4bWg== 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=fbMDl3WUL6WATGgniP20iWO8Hr/MRNAiVowPbOk/Fnw=; b=pYOCSPw1ZGc7lsXkiQ8/Mb6o9UOWUSO91vPxNWhHDYD0uSRv715m1o8P90gWdufdoN 2a6bfpXCKFCJf7r/QUj/gobdFwyOww+80QFSnIVxQtWmnQc/ETJp4/MnY2h+JmSYrj2b TZ3+JCyZONZwO2JCxxyIb7GXKU8w/WNRu2HHoB9VHK1FhHcuH+Din3iUbr/mCFKvCg3p 5X86S4LqfeWDuRxHyC453B60ZeYFOoeMqHZh085hgEMpsXYiDBIV5XvX4cb1ZSpHmzuT acRMqiGzbxGPCMqpFKWtDlz4fqlyUEurIaenONYN58qPDCHtv1BJVNwDQtvrIgWGPglQ 4mDg== X-Gm-Message-State: AGi0PuaPG072XGuQWFYourVVOhoyIRWu9A12uQVCoIunanDQMFhFpWIk itLA/2Ix5xn59SxkTRLWxGX/KY7ilHI= X-Google-Smtp-Source: APiQypKK8Evys2YpCIN/3gBs6webkH7UwBeey4JzSS1M6pn46kMFk+gdszXxC8dtEnRnFNETRjQPzA== X-Received: by 2002:a65:4548:: with SMTP id x8mr9978685pgr.223.1587258507791; Sat, 18 Apr 2020 18:08:27 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:27 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:44 +0800 Message-Id: <1587258489-17189-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 1/7] lavc: add a new sidedata type for DOVI 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 DOVI. 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..1b53451 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_DOVI_CONF: return "DOVI configuration record"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index e53abe6..41485f4 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -274,6 +274,15 @@ enum AVPacketSideDataType { AV_PKT_DATA_ICC_PROFILE, /** + * DOVI 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_DOVI_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 Sun Apr 19 01:07:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19084 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 C7D7544AFD2 for ; Sun, 19 Apr 2020 04:35:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1C8868B785; Sun, 19 Apr 2020 04:35:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC619680951 for ; Sun, 19 Apr 2020 04:35:11 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id r20so3141444pfh.9 for ; Sat, 18 Apr 2020 18:35:11 -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=1dzywOX9z/brjwtycatwCM4ZWC+C4ZgzG/C4V9fXnTM=; b=Nz7SFq/R/bMB//EftJ7CQMyB8SFHmcM95tlt+/HlNdQ+0yA6CAtV0W94h1GXrKnYuM BAQK6ZZIuIaCK2BJkbfG0OC9/tPbdjC48t8OdMFEHYpMKTiqRZqDVL5bUuvDfOpkKm9v pe3QecUM7xAEjBVb2TaaLVlup8clhJ5v5qqL3E7oqkT3VPm7I/AkQ8bRDvth8iwqHJLy snYdhBw8TiWV2Dfhcj2H94jDBlIXFFeDAyxR3wY7ry4vRAH9EOWPlcF4kHPKJ3YTPpWD rrbJaCkt+9+tG9Bby4FNwbWogjy4Ld0CnfJuj/gEIhVGhg30H2yi9P5jC385Vsgh2bbX /Xjw== 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=1dzywOX9z/brjwtycatwCM4ZWC+C4ZgzG/C4V9fXnTM=; b=lvrFAJ8QV5MzeQJmHqcVUEUHJ2QYQwFurFAvAqdey2hwo8n1tEyFdLQ6J05Ibtmdde F1PhWAcTLNqgX+eqf6K7QpwzgjMnQ57usuKCdUQrbH9kxbcgQ48nmAuQMpVWiVrDF7wO dA5I8bj1mtnvEWS8acm5IAl8ANq1KwdRwSJcSelk6QbarGxPRSOD92U9ywEJfMHXJRMO j4cDAuZsYZa4D/fCv8temvCnyGt8HQabZySxRX6JReZ6OSijIipX7AjHDpMUr5m/2SDw 2WaIY8UGiIpno1tZHY5GXQJvHOPSSbOmPWVzXDzyKdvF3Tix1KkBWHlAKaZtWqyFX03w 0Z7Q== X-Gm-Message-State: AGi0PuZtuUbe9ASxc6l6vFHRAMjHBWEOvIKXOlfLaZ4qMtP7zaaFyTcI EOuk65hb928uGxxQ0tDxOQwcJPk+7Pg= X-Google-Smtp-Source: APiQypKAjr+pcV1J+/Tf8Awzw9zN4nbZLhVHJs6KFzAnTWBxjahLGdcCwvDpSolpVtIGbZX6wTO7FQ== X-Received: by 2002:a63:575f:: with SMTP id h31mr8808119pgm.200.1587258510982; Sat, 18 Apr 2020 18:08:30 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:30 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:45 +0800 Message-Id: <1587258489-17189-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 2/7] lavutil: add DOVI 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: vacingfang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: vacingfang add DOVI related struct Signed-off-by: vacingfang --- libavutil/Makefile | 1 + libavutil/dovi_meta.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 libavutil/dovi_meta.h diff --git a/libavutil/Makefile b/libavutil/Makefile index 8feb029..1aac84c 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -23,6 +23,7 @@ HEADERS = adler32.h \ des.h \ dict.h \ display.h \ + dovi_meta.h \ downmix_info.h \ encryption_info.h \ error.h \ diff --git a/libavutil/dovi_meta.h b/libavutil/dovi_meta.h new file mode 100644 index 0000000..51c0a48 --- /dev/null +++ b/libavutil/dovi_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 + * DOVI configuration + */ + + +#ifndef AVUTIL_DOVI_META_H +#define AVUTIL_DOVI_META_H + +#include + +/* + * DOVI 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_DOVI_META_H */ From patchwork Sun Apr 19 01:07:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19082 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 8BF874493DB for ; Sun, 19 Apr 2020 04:16:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 73E3C68B782; Sun, 19 Apr 2020 04:16:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A03468B4E8 for ; Sun, 19 Apr 2020 04:16:26 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id q8so2384396pgq.6 for ; Sat, 18 Apr 2020 18:16:26 -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=ZWa7I3+t211se3AFFtxSOHrv2LJKyXNKZ1r9Jxmk3yc=; b=DeRni47/d4qPzgQ8ds6MKH30KXTcVb/KUU4qw6pt0fZXdQVO4sjTj+Lkqm2LfGlkLY bdyWmIkauJxIoQJCNxzD6H+0QfKaQOir6FVlSPJBBvtpgBJ72hyb/LhoVu+UGh9B7fQp caOJZpaVfkPcPkkwPj4CZorUhTBcBuLbS9JyNIekC+fDmjobFHuKQBRceIIuYH5vsC/5 wioopF/j08s4dkKm+Cmp1VJ3mQ1HsFUv9E5x0kLgz1N0yM4kkO+Sjdc5yx92w6n1VnEF 11QJi6W5RBhz5BERUqJ1akfh9Xg9rbjXQ0iB3/LThXMLwUMkroYUEBVc8v+dB+NaBUI6 Dhlg== 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=ZWa7I3+t211se3AFFtxSOHrv2LJKyXNKZ1r9Jxmk3yc=; b=UkX8ax0MBRCidScvwinQVBFIeQAX2PmfMWyA3QYlZEqGDmLOSkTJr7mcXHHQajdO12 +x0Sib0DiqyyBC64Kk51oV2omR21MD4noZDHDmP5GIm04+ShaAPtzhGrebDyyaSAbER5 8YLBJhFG48fDsnBqzWYyYX1v8Pww06bbfihKFa1H0npv4q17o/Pb/rj+ln7tCwrgeCRw Q38hT/H7U8SzqCQ8/hwLqOYeFwcv3WQrfJGa9UntujBxnWEF3ol21gAW5gCPZod4ctoA PGYqez2snfNuLPlcuusZupmW6MtbtuKaCxq1fTZCMedDQyBLpUripUZ7sFFvkpF+eMYr V1Ow== X-Gm-Message-State: AGi0PuaJG9RIBz1gYxLfDUgW8SVG1218t+51ANMbRJh0nUe5dgg/kYic YPeG3MTNIDzA8gos/7UcVUi/mYecosQ= X-Google-Smtp-Source: APiQypL261hD0TMRh+4jJMK+wUeLFDKy71BaMRJjtfx7QXAKJ2DvXuQrRCKePJ13z/U7I5HfkAN39w== X-Received: by 2002:a62:6106:: with SMTP id v6mr10647346pfb.199.1587258514098; Sat, 18 Apr 2020 18:08:34 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:33 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:46 +0800 Message-Id: <1587258489-17189-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 3/7] lavf/mpegts: support DOVI Video 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 DOVI Video 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 DOVI 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..c8f188d 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/dovi_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: /* DOVI 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_DOVI_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, "DOVI, 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 Sun Apr 19 01:07:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19079 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 4FBD744002F for ; Sun, 19 Apr 2020 04:08:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 37F8B68B65F; Sun, 19 Apr 2020 04:08:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4286868B785 for ; Sun, 19 Apr 2020 04:08:39 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id 7so3429584pjo.0 for ; Sat, 18 Apr 2020 18:08:39 -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=0rb90PoKax83U4w23M7f4c8c6+GvspMWAKn/wgz8KWI=; b=azSK/gNXZUBEqZIZBLz5khedCGua0DixVs3UTpvZvRrsD+ZOg77QBumYCFGVdHj6fb 5ag5BxeBgLBPrgBNfztx/7DhVqGnknKF7O05xOXAv3TRyScLcEOLUw09/inyhsMsNkJv 5SUYQ38fE8aQz7lxlqThpknUvZhkJYOAsVm/jlvHwK0adK5WFWCSL1hWM8TFXFgSx96e a8dPLINMO6uyZssUUpTSEMzqrcJNiEmRTx4LpYRMCSOueOx1w1nkERrchrBs8eVIS4Fe X3pkXu6YL6CTJKrkD74RpedphnAbuBcDKegJpvYESNeXr2UA4aW3mfU8DHxWkglVn1Cs jg7w== 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=0rb90PoKax83U4w23M7f4c8c6+GvspMWAKn/wgz8KWI=; b=GbnYnQF1f2wUSrDVTWPU2h/DbYvnMHGvBGhC3Qks6MwyzzopXWQFbi7VN+hOtRaj+O iGUaYxlIY0VVM0TYH8M7TK+d0viBqKZk4wbWnn7CuidQmrqxB05/SV2Zk9e0Mr6MaI8G cH/bR0Q4NAPgkalmtvnBw2fF3oMDvwq+ubERH9GODGTZVNUPmwSJBjsbFxhOzle/ZfHY t8H+mtSoRQTH++0bgYXEAf0pLcxkm18XEuJSBpEKfnS5Wxf/d3R4zA5vUJKKLPrZjm3j Z94RyEEWe1SUMv5lV1kA82aUA56WbvUwt39GQMV9yDmWzapm7ZMN0EGk/G1OnQbUHX/y eCkw== X-Gm-Message-State: AGi0Pub6AHSDG6qL7D1eVNcs73uJSCiuHzUl50MyiQ5rK5+tvUgx3cb8 yynWGJQ+xOllCiqWJYh3xzuhKn+GMS4= X-Google-Smtp-Source: APiQypIsJcFVtw1fKxo83uaftq0kgR9GQdm8XkgGbMOr6ypSvxHoK0iRydf5ZJDVw0GFKxRWLi3r6Q== X-Received: by 2002:a17:90a:ec0f:: with SMTP id l15mr13409145pjy.16.1587258517260; Sat, 18 Apr 2020 18:08:37 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:36 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:47 +0800 Message-Id: <1587258489-17189-5-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 4/7] lavf/mov: support dvcC/dvvC box for DOVI 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 DOVI 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 8e8aba7..eaf0c22 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/dovi_meta.h" #include "libavcodec/ac3tab.h" #include "libavcodec/flac.h" #include "libavcodec/mpegaudiodecheader.h" @@ -6786,6 +6787,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_DOVI_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, "DOVI in dvcC/dvvC box, 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 }, @@ -6881,6 +6931,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 Sun Apr 19 01:07:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19081 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 AC3DB44889C for ; Sun, 19 Apr 2020 04:15:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 810F068B785; Sun, 19 Apr 2020 04:15:59 +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 C924568B760 for ; Sun, 19 Apr 2020 04:15:52 +0300 (EEST) Received: by mail-pg1-f193.google.com with SMTP id w11so3206579pga.12 for ; Sat, 18 Apr 2020 18:15:52 -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=RnHBWRJP7jHlbT0nnH0o0ddK0ymZhlqUCqGUiTKk2Bo=; b=a7cG0GdlcP/eDmwFs47k9/vl+H7p1yiCFNE3jTeTs9E7r6yf3zau6nYRdcuh6kOQmX leTkSOniHgVXo4K3I2ZM2QbdzSaSwtum3zOMgqQLSO671UHy55eRHrKJjfQxE0P/6tcX TdEcZN1QVOWtF1R+mTcVsDDJ4IZv+XZyuiCQAFb62lexZ/RB2OxO8C0MIvIO/uy0MWIJ 2xV71FtHLqJ4cj/IMYmZOVnK34L4QsV3mJQU2U/CUh4lRq4npma1Fj7cM9ER/JU6Vq6S /rBoMv+p8bhU1uOeR5fDWfx7ZI1WzqLXF83ZMrO7t+G9F1Cs4zOtsZXY0N2b7Ju5U6sp mT6w== 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=RnHBWRJP7jHlbT0nnH0o0ddK0ymZhlqUCqGUiTKk2Bo=; b=mUGeV8ZgMnFTdVv06h0+SQGXbaQvD2vSF1+gCfVN832llkl+yA0n4bBgEHHNtQ2GOQ gqAyX/GZytxeej4GmzoU2wk3nvwBOpnM/NqGGOHPlVkjyegfM6+69My4OTDYaxiKw4Hj it2+nTTXWyddqwqeUMt7wmnnCn384s5mND/Ju5qKLdSvQw9BXHQzXdrRMLnnRdn6rq+t HzA2hosBBf5yuTGA31FLJNJ+3ZWh0BoQltD1Ngy77GDWP90GwAjIX4F2NEWI6YcIMUJy Nelbe8G1V6BpKXpQLIjVBn0IM1S8r7q/A/PM2206OfSbuN8uzQCI+TRMkeerNI1Y24WD czHg== X-Gm-Message-State: AGi0PuaQAe4iVhIE0gqsSA7Hmed201vqFzkGSpbsZflrBlsP9qAVt6ut fCrIvw+3RlJgE2gu+rLkrIMpNvaJ9A0= X-Google-Smtp-Source: APiQypJcV06zAQ56p7hoWvOeGhHQ7xnOO8KOGwVBgch5EK6iUSGxq59eGZiQN4SOTWmYk8p9vO4COA== X-Received: by 2002:a65:58c4:: with SMTP id e4mr10409062pgu.61.1587258520443; Sat, 18 Apr 2020 18:08:40 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.37 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:39 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:48 +0800 Message-Id: <1587258489-17189-6-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 5/7] lavf/dump: dump DOVI 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 DOVI 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..fa7ae1e 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/dovi_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_dovi_conf(void *ctx, AVPacketSideData* sd) +{ + AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *)sd->data; + av_log(ctx, AV_LOG_INFO, "DOVI metadata, 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_DOVI_CONF: + dump_dovi_conf(ctx, &sd); + break; default: av_log(ctx, AV_LOG_INFO, "unknown side data type %d (%d bytes)", sd.type, sd.size); From patchwork Sun Apr 19 01:07:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19085 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 C08F344A788 for ; Sun, 19 Apr 2020 04:39:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9EF8268B797; Sun, 19 Apr 2020 04:39:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f67.google.com (mail-vs1-f67.google.com [209.85.217.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3924B68B4CF for ; Sun, 19 Apr 2020 04:39:44 +0300 (EEST) Received: by mail-vs1-f67.google.com with SMTP id z1so3714709vsn.11 for ; Sat, 18 Apr 2020 18:39:44 -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=5LSHNLAEXGHS48GxPRO+9lq57s7q6/Mi6BvCF9DSDxs=; b=Rtq0LV3/TyACY2qob7917t4ZpV0+6vgaMx7qS1pJVMWCOGF2wz6i5KJ3kYIYHW/Zka 4OtYTmftKfMCzceXMH8plypzOYaPj30E/OdCHe+WVwH08GwRNGOfsBaVIueyPl4G4O1y ggW3L9AYjanBco0jDkxv4CdDajrMipPHmLh/eoe2HIWXRotwIk4/Xq1bI/Di/LeF7Ldv c30SWVkbtdAxlrlBSeLIA5plzaZ6H6Jr6DDL3OwyrPEeQKyu+ZMOIbUstFLCkwfuKHVv L2xRSXWNFcuqiGkGNKFMd4mEHzhAaATlxBfBnsXZRti4EYdZtDSs/3P7QeLWnnsrdP1L rm2Q== 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=5LSHNLAEXGHS48GxPRO+9lq57s7q6/Mi6BvCF9DSDxs=; b=HlBOTvQFfmoYfhmdjnHUP480w6g3jfrIudjWA86dAqq1sq+3TNAOU7BR/dhIjiaCYA Zs353bD/VvdMocVuV0bUXpcHrB0snFhoTtbuVGmTdeYvWgDWPg2RoM3kTWAc4ZHbXy9F 65yAwmENNlhi3OcAend5GdlMa0PMmAg9EVlW1VKRPZUKzq1hZYomo+9kOdYabUkCA5kV ZdcPoPmPzKFwSdfTFgnEoIH1D1gzNeMpD0GAKHj8ZSRQFgzAABp3UFdqqaQw6yrTLPaa XiVRFz7ZxWXZvBHRd0AiYoHV57X8esLgVd2wFQnMwdLxiPXXrpwSdjkBRTGgAvJxlTDM 4IBw== X-Gm-Message-State: AGi0PuYL4hHopsM5kULA5skFgsrrD4Ziss77NUl8YI2GRwLaHbme2yaF azUR5WHGuRJvfLRIxgp6YezWEq5GHeQ= X-Google-Smtp-Source: APiQypKaKW5yKbK0VAuyHee+M1Bu1DCXX62NBgwTaZ5U002gbP1aYCfe8rYbXVuiFXh1nOoF/1ypFw== X-Received: by 2002:a17:902:444:: with SMTP id 62mr10390898ple.109.1587258523534; Sat, 18 Apr 2020 18:08:43 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:42 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:49 +0800 Message-Id: <1587258489-17189-7-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 6/7] fftools/ffprobe: support DOVI 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 DOVI 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..840fcb7 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/dovi_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_DOVI_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 Sun Apr 19 01:07:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19080 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 2FBED44A0F0 for ; Sun, 19 Apr 2020 04:08:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1390368B7AF; Sun, 19 Apr 2020 04:08:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD98868AE4C for ; Sun, 19 Apr 2020 04:08:48 +0300 (EEST) Received: by mail-pj1-f50.google.com with SMTP id q16so3574316pje.1 for ; Sat, 18 Apr 2020 18:08:48 -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=wCuQzIC9ve/PG3Q0y2jtAlROSjp8k+nel1mUNkd6YH8=; b=oDcTm0IhT1wW55dHRc36UYPQxHes1d0PMWLBUBSUbUolCpOwZFXNUZNjIsNuafXn4P 4Kl1I5M4CJz65qC5FWjR/ZH2cc1YcNWt6TIAnzIS+d8vA4OcfnZI78hbRYQ0HBmtt7e4 Kmz6SLjoL3GsI8FD9e7CoV2q5kBXco3exYxAVB5pafMrAagdeN4ulEBZMVPHbUV+p4r3 X+707MVruhC1aBh7LwvTnoWF7LYzl+STO/8kVwmApbj74LgFE4SQ9Olg+BwqUUG97iK2 nDUpiLBp471RP1I8uR5KWQ5/IpxRmYc9pSOWs9MMPEeF3qRCMp6AgKVouEY09n+TfM8X 2bcg== 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=wCuQzIC9ve/PG3Q0y2jtAlROSjp8k+nel1mUNkd6YH8=; b=udZW0LUs9dRzb5T4YaHo55cY07OPo1SkKqKIsBW60XllFtai99UpbQlyJi+vovCSrF F4oAKuSb+WKOo8XVDcU2U/z9LYJW54atDo9IcvWWcUC9uUmW2CS/7NBAuEunbw3QQiBd WW/pktCYmz2EYYRsg7bGbFd0WVeB7goZbu4f+VG+lghg4ytRz8B9KtFfFEKbsTq7emYy LjbOX7senv5QxPMgJMJ45nCzAw7eRGhrVwgfDbYM/WXwXdrTgH+joJY/5eHQmD8z7zer xNK77bLMWUA5zJ6BrkYGzFEO+ymCgxjavtY/1uPGtk3r1jDHrk0ye6dTyB9QqWLI5frZ 4nJA== X-Gm-Message-State: AGi0PuZpC/5eniQ3Kb2I43dID6FRL/Lftj4B9C4wNT/oqhbZOuGCjSjR n9Rh160aQgU18Gbn26yq/s6w6vxufYU= X-Google-Smtp-Source: APiQypJ2/80rBNwmVZ2oCdZmFlfY3UBgBL4VZOJwnvHo5CLH0uTPeasEkN4WKa6mMEHZvIRgkz3s/w== X-Received: by 2002:a17:902:c202:: with SMTP id 2mr10216210pll.196.1587258526637; Sat, 18 Apr 2020 18:08:46 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id e11sm23498535pfl.65.2020.04.18.18.08.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2020 18:08:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Sun, 19 Apr 2020 09:07:50 +0800 Message-Id: <1587258489-17189-8-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> References: <1587258489-17189-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 7/7] lavf/movenc: enable dvcC/dvvC box support from DOVI 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 DOVI sidedata. Signed-off-by: Jun Zhao --- libavformat/movenc.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bf3e4fa..10aee5f 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/dovi_meta.h" #include "libavutil/color_utils.h" #include "hevc.h" #include "rtpenc.h" @@ -1814,6 +1815,36 @@ 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 */ + av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " + "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", + dovi->dv_profile > 7 ? "dvvC" : "dvcC", + 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 32; /* 8 + 24 */ +} + static int mov_write_clap_tag(AVIOContext *pb, MOVTrack *track) { avio_wb32(pb, 40); @@ -2147,11 +2178,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_DOVI_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) {