From patchwork Mon Apr 13 11:57:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18910 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 48E1744B1F1 for ; Mon, 13 Apr 2020 15:04:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E89368B6F9; Mon, 13 Apr 2020 15:04:34 +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 5673468B671 for ; Mon, 13 Apr 2020 15:04:27 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id p8so4360880pgi.5 for ; Mon, 13 Apr 2020 05:04: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=ZWa7I3+t211se3AFFtxSOHrv2LJKyXNKZ1r9Jxmk3yc=; b=CDkefJBNZ6ftVAUfi70esBcfs0snIN/27sblvpl6CuKP5deu+ZeM5sZE8O7LFnJLOl S61R/U7g12ioe/svzPGxUAbgZ+6hxbstNawiOQWkXYVpt186is7kwKNvvk6qN0tOJ59n nonx8EpkZJ3AdccZQLmRUka/BM+4usfGzCkOcqv7F2stnZ7v5pGN39s45VzmJ/Ev9rQf wWgafpnN5krTIfWDWVP/Ii58kN871mt8ArpznI30B5M93Fhfkv0cAcJs5sAB9kQxZ+MG lP4BEaeE/PScp2XsEgZZO9X6Y0dKj5XMaeq0uiDwnLwfs7oBQN0yXx7UBWvFROKjZ9oQ KJFQ== 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=RH/w5tGjgBpJlrwNNJgs3+Qi50EWfvnFFOP1kfYDKH9J3dDKCpXv6mpAaJ620lMCWV WMYthrDnKZv1l/lD5cuI5PhmEmC1uD278gNhq80q/Oqpq0q46i73QgAVmlSu+CXVFlwX VO7Moz8uiKAdPiRpcilRhkPYOzaz1Z8V05LyfxpenGJDEp7EOxGM3FVeLXoNX6vd9gp7 bU+0Ie0fkK96pqweBfOBwjoteG5EMO04WPsCzMsrw7dD2741hUfna3gMwjV9YfSkfQNm X4OWf82umnwEoHQ1bM3Byp4U/epkFEatrkT4c/3PF3ZA3VP10NFjbjbUmdCychfeICg2 /trw== X-Gm-Message-State: AGi0PubkFuN3mL61y5u8HgDHaDY/WwVx3pBia18w68mHQ5pXi4Q6W4Fx B6vI+KfhQpBS71ekC7qwwHo6GBIsIpQ= X-Google-Smtp-Source: APiQypKPrwPi7iLcXiBcnI7w27Qtd+36JTqYbKwTpGw8ZJCRK6tTt0XEUFcqTlOokYiAV/rd6z2P6Q== X-Received: by 2002:a63:5457:: with SMTP id e23mr16459640pgm.451.1586779123496; Mon, 13 Apr 2020 04:58:43 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id gi2sm8882204pjb.30.2020.04.13.04.58.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Apr 2020 04:58:42 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Apr 2020 19:57:32 +0800 Message-Id: <1586779102-31293-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586779102-31293-1-git-send-email-mypopydev@gmail.com> References: <1586779102-31293-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 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; }