From patchwork Mon Mar 30 08:22:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18505 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 02305448F59 for ; Mon, 30 Mar 2020 11:53:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA04E68B135; Mon, 30 Mar 2020 11:53:29 +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 28C1168B0C2 for ; Mon, 30 Mar 2020 11:53:24 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id u20so10273274oic.4 for ; Mon, 30 Mar 2020 01:53:24 -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=4K9p26dB0hfORGRcxi5X6+VYMJoBFwQCoSZGU1IAwi0=; b=JNLYrRt4972p+qxcX6aTRTWH6/UBfi1ZUahEIUarFxutpFeC3vccm2YKJuqRge0VJb HXB2ZQRRXhDs4LCBj8u5DXqWEFmNDgL5sugjJch1cSDivPUcxPZmk2yv5iOwApX3+yfu 1q1CaEM8o4Rzf4Brxp5w8BhjjmQfz99lzLjZBs/y2aOtrJZb5tSM51awATkZeJ+eULRS N04MIW1dknEaWmmwbl+j+vprCrzqVYlpxUd2WhCqQBKMbII5DNQTkHCKieYzB7rinSdE oRhfVvvPI1pFqWZrBJiyoU37r3Yvdgsvy8zZ7Sq6Tva8dZFIuUTsHMs9zNoVKFtxsMnt o4ig== 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=4K9p26dB0hfORGRcxi5X6+VYMJoBFwQCoSZGU1IAwi0=; b=m7jVnuoEwC6T9vTCYFb8GwZwXNjcmP/E26Oe+qyUFzU1AsIuRtuWJa1UiQ3z/zC1Qp TzdjJIOGJ0xdpEoZr9YAKFxXLAq9V7T77ixfFEaaAvtD6dcAzpyjIeZssqE1P+27Ur6F iRTj7Om3oWWL1oL0v4lRc8ff7junqkCi+YL3TM1g1n5TjnoYYQBkGWHnoPY6SfscF/8Z e43/c+fJVp1St0618ssiSsRjsvAfJaSt7YzAtZNprBqx9aw0xXIyQR1n5U7aNkdBJjRx veH4h4wzcrt3ALSoNpmVy6ndSAPMskFtfE46ibOlj1Rm96B0IXQrQTj8qxG55MoSPtub 2P0g== X-Gm-Message-State: ANhLgQ3VuGj11URw6g/8kfmMWTPDlVgl6/g7KEBo07HW6/LdwDHHddXe SYSE4py0foUGJLhoH5wkpnw+mhcJlvmeOAmHA/A= X-Google-Smtp-Source: ADFU+vsmDpl7bN7uE/HlK2RmHcR9UI31gmXdeSVgRYewP1IcYVlmDA6jYqLGe4Hvh7eo7WSAPTsKUw== X-Received: by 2002:a17:90a:b003:: with SMTP id x3mr14464108pjq.140.1585556609624; Mon, 30 Mar 2020 01:23:29 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id w2sm3510261pff.195.2020.03.30.01.23.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2020 01:23:29 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 16:22:53 +0800 Message-Id: <1585556574-31762-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1585556574-31762-1-git-send-email-mypopydev@gmail.com> References: <1585556574-31762-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V1 3/4] 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 profile/level with metadata. Signed-off-by: vacingfang --- libavformat/mpegts.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 7f56bac..e035605 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2135,6 +2135,27 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type st->request_probe = 0; } break; + case 0xb0: /* dolby vision video stream descriptor*/ + { + int version_major, version_minor, profile, level; + char str_buf[32]; + if (desc_end - *pp < 4) // 8 + 8 + 7 + 6 + 1 + 1 + 1 + return AVERROR_INVALIDDATA; + + version_major = get8(pp, desc_end); + version_minor = get8(pp, desc_end); + profile = get16(pp, desc_end); + level = (profile >> 3) & 0x3f; // 6 bits + profile = (profile >> 9) & 0x7f; // 7 bits + av_log(fc, AV_LOG_DEBUG, "dolby vision stream, version: %d.%d, profile: %d, level: %d\n", + version_major, version_minor, profile, level); + + snprintf(str_buf, sizeof(str_buf), "%d", profile); + av_dict_set(&st->metadata, "dovi_profile", str_buf, 0); + snprintf(str_buf, sizeof(str_buf), "%d", level); + av_dict_set(&st->metadata, "dovi_level", str_buf, 0); + } + break; default: break; }