From patchwork Wed Apr 22 04:35: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: 19150 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 BF529449D7A for ; Wed, 22 Apr 2020 08:06:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 969DE68BB54; Wed, 22 Apr 2020 08:06:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0449B68B5C2 for ; Wed, 22 Apr 2020 08:06:37 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id k133so822460oih.12 for ; Tue, 21 Apr 2020 22:06:36 -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=EikxCx+qs6akfQ4/ugP0ES4VAIPXKsmR89DkkAvOECo=; b=GtZDMGL4tzeA4EQTsf6YsLiDUiG3erY7WfZU+qJ6PgqTCvvPrxhokR6WfmVx8aLBZ7 0rplTo2/JB03irXMusayocyIjToMjq6Gi9GkbWQOC7NJQyn+PEAo61ZL7aECrC+FN5jE nyPLyIncF1vIO7UiRp3GMrjNX14zyhkQvp8/BJNAJADKuFWReLFcbv6KRrCZlsINuyMM Qs5DZYTXrXLtgSjlvkD/+SYjs8nzizThex5F6XPNtI729ICkHUDRAVe8TMZFUNaA3ahy O/U+O3slmXzdmJi1mNzUKIOcEsqsczcarJThJrAf2nrscH+GQKLr47Zu8GldGtdnrZQa vLqQ== 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=EikxCx+qs6akfQ4/ugP0ES4VAIPXKsmR89DkkAvOECo=; b=RJEFTiCEPdqA83BP705DlNNOzJ14VZLVbo+/J7Q8RSASCf8hxmchS3rHu5LxTmxrUi 4xCZF6O87o6TrxiHGrFUu2RgVDAvN7mCv23rjcub7roJfd5xlQd7cQXxN97zcH9XxiFS asaRgsZTLv8OzfkX1Da9WJKNTK0CCP9AiEibey4xlgSHIuavA2pw87iZO5Pi9wwrT/jL n2SKjmoJXXZFRC4AIME95ZzREYFD7Vf5P8VFO2ZqwhtRYbDH7qHeqd+UOML+r+/ISL63 w/WnABv8/+nLiojFcReU56xiqkUdOlT74p6WG0zPZcaByaGYXO0eHvEhHiKbKdRV9QRO L3Vw== X-Gm-Message-State: AGi0PuZierDBTr5h8AokDliCLiFyJ/+s7y8C78087dBPiPfCJ5Le9Dle YIVUX//+UEyd1zz+kqigPB0CLSfZpSd6Gg== X-Google-Smtp-Source: APiQypJOEefk6Jy2QDYlheyizRlT7bqRz4Cn4UCK8PN0VjM6025cC1GVZjDvLFpXeM4dfudSS5jD9w== X-Received: by 2002:a17:90a:48:: with SMTP id 8mr9217065pjb.65.1587530178685; Tue, 21 Apr 2020 21:36:18 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id z6sm3714261pgg.39.2020.04.21.21.36.16 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Apr 2020 21:36:17 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Apr 2020 12:35:44 +0800 Message-Id: <1587530154-27795-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587530154-27795-1-git-send-email-mypopydev@gmail.com> References: <1587530154-27795-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v5 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 | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a4ecb2e..ff3898c 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,53 @@ 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; + size_t dovi_size; + int ret; + if (desc_end - *pp < 4) // (8 + 8 + 7 + 6 + 1 + 1 + 1) / 8 + return AVERROR_INVALIDDATA; + + dovi = av_dovi_alloc(&dovi_size); + 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; + } + + ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, + (uint8_t *)dovi, dovi_size); + if (ret < 0) { + av_freep(dovi); + return ret; + } + + 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; }