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; }