From patchwork Wed Apr 22 11:52:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 19158 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 963F944B1D2 for ; Wed, 22 Apr 2020 14:53:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8024468BC0E; Wed, 22 Apr 2020 14:53:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94EF568BC0D for ; Wed, 22 Apr 2020 14:53:12 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id r14so953341pfg.2 for ; Wed, 22 Apr 2020 04:53:12 -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=nid+5FGWw8otmeYN1tZOZAdzI8oHtz417eaBZMc0ok+q8YM68MpevT155uCqofmk4R AVsQcD0Vo1ye7hoNtUYTRkilXbqpgPVwyMk4C1HC/gjEgMpBy3ZI5JtrJ9HvjULgMEls ScZXby8gAiytbBGxQthGdmSrToXd6sBmk4Boyj0OPUKzfsX0EhkeUzwiNhADqJlXz8Kl 5VJgXL8K3a9bagkhlq9dwojB8JLvxqmlw1QaQB/0JaxbvQlBark9c7TyYX1LZugqhjuY 0M7L+07dv9rSPFQPuTQLtEVvrrh0ZKHDygFq4MYYZ9I103zfV3Fzk/Kk9Sis630VNU31 krJg== 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=TloBMmEvy2XhH0U69rv7BwbpjgINmzXk2rmw+5eDdbWu/jk878eMm6j9914AMPj7W/ SGmLZy8UmP7on0ajfyi8dMXReYL6ojk3ECUdi6fhdKVVIqPIoDGthJg81HbPpNYhKj1w TAMpJhthgZ39gBOvqBDwACOjSk1jKg3Hr1ybd/8KhmnmNM3XOKbnh1ICe3HK7RSHMPQk Gy5i8LskkD2nhiONk9OGGDpy06/0Nr1ByB1uini0NdK6OMgqHE0Yp27VXRBLVILV7Nha LZzlom64pHMRjL2fQrpTT0qC29JPQzBsP0nrwJNehakLbZghXqbGA6aC4qxchB7IBytC Lt2A== X-Gm-Message-State: AGi0Puazo40VpO0K/XeHXhNNEoaMBmCTfkaEuCmDTKblsQTwEKnhBP3t rd4DUGFvoHCCi91zOhEnUxu94RlB0Hw= X-Google-Smtp-Source: APiQypLAuMi9Eg77lLqAoZqNIm+SrZQns5BdnGDDkV+KqPl2cd3X4dVwSL8+7SMtxx3GVRRPCh1sZg== X-Received: by 2002:a62:ee05:: with SMTP id e5mr27140474pfi.288.1587556390646; Wed, 22 Apr 2020 04:53:10 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id v32sm1715240pgn.35.2020.04.22.04.53.07 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Apr 2020 04:53:09 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Apr 2020 19:52:43 +0800 Message-Id: <1587556372-24387-4-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587556372-24387-1-git-send-email-mypopydev@gmail.com> References: <1587556372-24387-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH v6 3/9] 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; }