From patchwork Mon Mar 30 08:22:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18503 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 9F88144B65C for ; Mon, 30 Mar 2020 11:30:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F90F68B6D5; Mon, 30 Mar 2020 11:30:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72BDC68B60C for ; Mon, 30 Mar 2020 11:30:32 +0300 (EEST) Received: by mail-vs1-f65.google.com with SMTP id s10so10433166vsi.9 for ; Mon, 30 Mar 2020 01:30:32 -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; bh=Y+88Zu+ifz37cuNTdALURpxUbpE5WGMupegb6YE5vxw=; b=nU6gJXUDb3VJiK3mAh6vW7VGr9vJfkIPQloiXpqCH395fyEzoKS7V/ZU7DurMQuh1A bTkbwCgNvUi8WsvCtifIMXc9ovXjXrvCj+9sVMCG3nGOjsO3UQo+dcxRObENN+lEk+bT +JL63uk7pP0YUXXae0FYkkwGJMoFd3An7x7fGOaYJT9RoaDYAYUev77qIshaVGcNhzyd h6wGv6hQRsUmJIn+jhYTlemiW+4SgwaE03wHaRNgPALuCG76c5pJk1H85GpgV1yt9oox PSl+iJYbfdNyAymrS5HUwJB7PBc/+I4YvGp/lB+4kL1jcppB2twBvfSmiyC2cj+5MvOE AOdw== 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; bh=Y+88Zu+ifz37cuNTdALURpxUbpE5WGMupegb6YE5vxw=; b=co/UAxpoJrIdlQtDP0LiA/s6FI2VTiGzIJZCwmqoM3nD3JxcoNCPFjDhFYx/N0gb1e KUS75FGBVxqL+X6ogAPfWytF73bhPRj928TDD/wHsKT3HArPh+L9Fvrp4fcrx2ixJH9s 0WIn+mGqXZYuDh9qvg9mJdEIrdhJDzUUey3Tpn+l2J/+bICHHGsKSe0hjL3BaM1VxDZt Ruqv9wXk/ihGMLINgxf/5BZQ+h7WsilyZ3GwCVThefMLeRZQpsELTvNxHPy5novhRP8T N1qE75boptq3G3Vlrn6tl0nJxLF2Sd5V2ZY0s0CSs5LIK7fpj4K0bGviU5rSHVaiHDVq ml0g== X-Gm-Message-State: AGi0PuY9kY5Q1546ntz/0+RVDW2efLr2MQNgBetWma86iP6bb8fSGE44 WzcE9klQEvlnJYGEtVy18m6DjpTys0K12TCaWJo= X-Google-Smtp-Source: ADFU+vu4cjo7TrV+sdj/Wz80Bdrs0EJiRnMCJLgWUBAGLQnnqNFce1isMNfDrJ/C3N0gstAfrv4nJQ== X-Received: by 2002:a17:902:db83:: with SMTP id m3mr10706438pld.143.1585556603547; Mon, 30 Mar 2020 01:23:23 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id w2sm3510261pff.195.2020.03.30.01.23.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2020 01:23:22 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 16:22:51 +0800 Message-Id: <1585556574-31762-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH V1 1/4] lavf/flvdec: set AVFMT_TS_DISCONT flag on FLV demuxer 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao There have been some reports about FLV timestamp discontinuities present. e,g, the file recorded from live RTMP FLV streaming, so add AVFMT_TS_DISCONT flag on FLV demuxer and also update the fate test fate-filter-aresample for test sample nellymoser-discont.flv. BTW: live_flv demuxer also enabled the AVFMT_TS_DISCONT flag. Signed-off-by: Jun Zhao --- libavformat/flvdec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 7c3e5b0..82afc31 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -1365,6 +1365,7 @@ AVInputFormat ff_flv_demuxer = { .read_close = flv_read_close, .extensions = "flv", .priv_class = &flv_class, + .flags = AVFMT_TS_DISCONT }; static const AVClass live_flv_class = { From patchwork Mon Mar 30 08:22:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18504 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 E24C144893D for ; Mon, 30 Mar 2020 11:31:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB23B68B6D8; Mon, 30 Mar 2020 11:31:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F58868AF8D for ; Mon, 30 Mar 2020 11:31:31 +0300 (EEST) Received: by mail-qv1-f66.google.com with SMTP id bp12so4466073qvb.7 for ; Mon, 30 Mar 2020 01:31:31 -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=uJ905Ny5ApPvE5YJjcZVO96TPNe/r2UYC/wXop7FkVw=; b=Lp7I8TF98v7nE9vlN7USmfye1EEeFdQc6nsY1GQt+lnQPbhRJqxO0N/ze9SSiBGYLN fntERazS1J8l1Htat7EeyJu92QwNSolvz48Ccf5jpNL3/HVNrrn709XirBhvDR6Tixct NqnR5QRrs3FW3IjOrvpS+1k0G5a0E934nCTUAOekz9MRJoKgCcimzXSyf+CYaAgnC6z9 DEbhwXiEEMIx/rZCPuLVKtUGhzxQvgx3woFgnFLRZPEMrnaQuCMJmUwiQ9kOdv9ckaKJ Q/faGg7iUdFkVxX6Hl6uIWMzt5DMw1UBJbQ/fSyRUx0qpGHDKZJfRSxEryZqwCKAh1Wc 9w9w== 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=uJ905Ny5ApPvE5YJjcZVO96TPNe/r2UYC/wXop7FkVw=; b=S6ctZZuI6qiFvA38kTwRJ0Fs5f2jMXzqejg3kG7PgBQrII0p0vJWte36AGlsOv9+lq irF49nujIsaTQkMX/QOqDBCdS7Y3TONTqrYAE7zvRcVMU4AuA11InuN22AC8LV93BqQ9 29L3CbyeJePs/aeYZmDthbc1soikrdhVC03bzkFshb9x9dJRawCyWJ8X97dB2BcSOKef PU9hjVYZNicsp8dN9zX5775lNbYbVOhM4xsJ0aK07NvIXftZ5aq8uMqFh5jIMhhw8fmB 4tCehWgVOt0fBS9VCCgOB2FVbh4hSGKkeSaA3NxK2RJbSpFvZzKA+/Z19UXDqFNy4kvV a6Vw== X-Gm-Message-State: ANhLgQ1pwbvlE4c2ALaXVtLI80o9RSjYXVyLZMI5S/ZSItNP2iJDCpws vDSpdrgUayLkMciv/XtaSVtehUmfLI4HVOqGNCg= X-Google-Smtp-Source: ADFU+vvtkp+wRsQlPpjZTljf+ZUS0tS8xQ8pCX6Ehz8E/mowX7VSKYGByy2RNzOW2sjhb0Mz6C0x0A== X-Received: by 2002:aa7:9f94:: with SMTP id z20mr11268477pfr.261.1585556606587; Mon, 30 Mar 2020 01:23:26 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id w2sm3510261pff.195.2020.03.30.01.23.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2020 01:23:25 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 16:22:52 +0800 Message-Id: <1585556574-31762-2-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 2/4] lavc/hevcdec: fix the HEVC decoder crash when memory over-read 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: qoroliang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: qoroliang Fix an occasional crash for hevc decoder in ARM 64 platform, the root cause is the memory over read(read cross the memory boundary) in SAO NENO functions ff_hevc_sao_band_filter_neon_8 and ff_hevc_sao_edge_filter_neon_8. After this fix, the crash disapper in the massive Android phone test. Signed-off-by: qoroliang --- libavcodec/arm/hevcdsp_sao_neon.S | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/libavcodec/arm/hevcdsp_sao_neon.S b/libavcodec/arm/hevcdsp_sao_neon.S index 3471679..8fd9d1e 100644 --- a/libavcodec/arm/hevcdsp_sao_neon.S +++ b/libavcodec/arm/hevcdsp_sao_neon.S @@ -35,10 +35,10 @@ function ff_hevc_sao_band_filter_neon_8, export=1 vmov.u16 q15, #1 vmov.u8 q14, #32 0: pld [r1] - vld1.8 {d16}, [r1], r3 cmp r5, #4 beq 4f 8: subs r4, #1 + vld1.8 {d16}, [r1], r3 vshr.u8 d17, d16, #3 // index = [src>>3] vshll.u8 q9, d17, #1 // lowIndex = 2*index vadd.u16 q11, q9, q15 // highIndex = (2*index+1) << 8 @@ -54,7 +54,6 @@ function ff_hevc_sao_band_filter_neon_8, export=1 vaddw.u8 q13, q12, d16 vqmovun.s16 d8, q13 vst1.8 d8, [r0], r2 - vld1.8 {d16}, [r1], r3 bne 8b subs r5, #8 beq 99f @@ -65,6 +64,7 @@ function ff_hevc_sao_band_filter_neon_8, export=1 mov r1, r7 b 0b 4: subs r4, #1 + vld1.32 {d16[0]}, [r1], r3 vshr.u8 d17, d16, #3 // src>>3 vshll.u8 q9, d17, #1 // lowIndex = 2*index vadd.u16 q11, q9, q15 // highIndex = (2*index+1) << 8 @@ -80,7 +80,6 @@ function ff_hevc_sao_band_filter_neon_8, export=1 vaddw.u8 q13, q12, d16 vqmovun.s16 d14, q13 vst1.32 d14[0], [r0], r2 - vld1.32 {d16[0]}, [r1], r3 bne 4b b 99f 99: @@ -110,12 +109,12 @@ function ff_hevc_sao_edge_filter_neon_8, export=1 mov r11, r1 add r11, r9 // src[x + b_stride] pld [r1] - vld1.8 {d16}, [r1], r3 // src[x] 8x8bit - vld1.8 {d17}, [r10], r3 // src[x + a_stride] - vld1.8 {d18}, [r11], r3 // src[x + b_stride] cmp r5, #4 beq 4f 8: subs r4, #1 + vld1.8 {d16}, [r1], r3 // src[x] 8x8bit + vld1.8 {d17}, [r10], r3 // src[x + a_stride] + vld1.8 {d18}, [r11], r3 // src[x + b_stride] vcgt.u8 d8, d16, d17 vshr.u8 d9, d8, #7 vclt.u8 d8, d16, d17 @@ -136,9 +135,6 @@ function ff_hevc_sao_edge_filter_neon_8, export=1 vaddw.u8 q12, q11, d16 vqmovun.s16 d26, q12 vst1.8 d26, [r0], r2 - vld1.8 {d16}, [r1], r3 // src[x] 8x8bit - vld1.8 {d17}, [r10], r3 // src[x + a_stride] - vld1.8 {d18}, [r11], r3 // src[x + b_stride] bne 8b subs r5, #8 beq 99f @@ -149,6 +145,9 @@ function ff_hevc_sao_edge_filter_neon_8, export=1 mov r1, r7 b 0b 4: subs r4, #1 + vld1.32 {d16[0]}, [r1], r3 + vld1.32 {d17[0]}, [r10], r3 // src[x + a_stride] + vld1.32 {d18[0]}, [r11], r3 // src[x + b_stride] vcgt.u8 d8, d16, d17 vshr.u8 d9, d8, #7 vclt.u8 d8, d16, d17 @@ -169,9 +168,6 @@ function ff_hevc_sao_edge_filter_neon_8, export=1 vaddw.u8 q12, q11, d16 vqmovun.s16 d26, q12 vst1.32 d26[0], [r0], r2 - vld1.32 {d16[0]}, [r1], r3 - vld1.32 {d17[0]}, [r10], r3 // src[x + a_stride] - vld1.32 {d18[0]}, [r11], r3 // src[x + b_stride] bne 4b b 99f 99: 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; } From patchwork Mon Mar 30 08:22:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 18506 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 E61E944BB4F for ; Mon, 30 Mar 2020 12:20:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C48D068B718; Mon, 30 Mar 2020 12:20:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBD6B68B61A for ; Mon, 30 Mar 2020 12:19:58 +0300 (EEST) Received: by mail-vs1-f65.google.com with SMTP id x82so10477243vsc.12 for ; Mon, 30 Mar 2020 02:19:58 -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=YfGNwiPDKRMgyrZZ9DHJ+alYX60oTvcLV4YoSfHWGjc=; b=uHuDD1UShHhMxKaUv4jq+oKGtAkO6oULRatKYCnhHKZU6A3vDxARW6zSXx8e0J8s3W 4bxKUqUaV7UPwubk9+BhhYul4OTifD2CeRKWTdbmYL95hG2VpEuDSoEUyXVnSacp8NxK 9zth+FQwU7/rNAHmh2ps2bFS4GkJBCTfc6wr4jTBVHQ3Unf69IUpabNIKupUsUGA2aRg F7ng2u3SnKgU3I6GkJ97XsHuH/SLnXOhbWbrEdKZlzeJ0qp8RT2/Lb0YZxS+aP0Eji7b Itp2fMpbqYs7KzPIjlb8xxKTYJnxTKi1QJBy0QIlgrzoGSz60h/+TtkiMglDuxyzPa6N Rz5A== 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=YfGNwiPDKRMgyrZZ9DHJ+alYX60oTvcLV4YoSfHWGjc=; b=o5Nol/9NMJW0jbJyL7ep+3rsh14jCsXrQjmZeMu1zL4PI5lLtOxoJKDmbEGqTi4Fcu lnZ87QHyANFM+lXn+RosKaNHym0a/1mMDZakGEw/ooLxpod5RLKkgOQ15HMxYpDwZYWI j8vTA2KNnAh6pqhTHApvFEgxGrQ+oS32kdgWc60HDN0RS5s/645a9Kn3b+Q8SGlqnozJ kzj/CHB4LfpE32jOH7HJSge4KUW6EbIR3EOQUUhRlSu6LOtNjnOzkHwUs1zECTTAC6GU Tde8W39Tx7MOF+Nvu+tJTMWanslVR18olnz9yxBdb0i35/Z6v0VlMG3P/8lsLezth14Q wzsw== X-Gm-Message-State: AGi0Pua5nooSIzNvXYVbvaDv6NvLJOdI6AAXwCNn17RhHGW8v1kyrCMQ P/ov0TVHbiljmPD2RsX1s4FMaRRpe5tRiqwBQ3Q= X-Google-Smtp-Source: ADFU+vusC5zFDjiAzEFhcXtqM0otUFdoh5ChaHfIOhWEuzHFz0iZthu/62s31M23HiUIb4IjWgO6Tg== X-Received: by 2002:aa7:949d:: with SMTP id z29mr12090379pfk.111.1585556612677; Mon, 30 Mar 2020 01:23:32 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id w2sm3510261pff.195.2020.03.30.01.23.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2020 01:23:32 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Mar 2020 16:22:54 +0800 Message-Id: <1585556574-31762-4-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 4/4] lavf/mov: support dvcC/dvvC box for Dolby Vision 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 dvcC/dvcC box from spec Dolby Vision Streams Within the ISO Base MediaFile Format Version 2.1.2 (https://www.dolby.com/in/en/technologies/dolby-vision/dolby-vision\ -bitstreams-within-the-iso-base-media-file-format-v2.1.2.pdf) And export the Dolby Vision profile/level with metadata. Signed-off-by: vacingfang --- libavformat/mov.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index f280f36..76d90a7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6766,6 +6766,37 @@ static int mov_read_dmlp(MOVContext *c, AVIOContext *pb, MOVAtom atom) return 0; } +static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) +{ + AVStream *st; + uint8_t version_major, version_minor, profile, level; + char str_buf[32]; + uint16_t tmp; + + if (c->fc->nb_streams < 1) + return 0; + st = c->fc->streams[c->fc->nb_streams-1]; + + if ((uint64_t)atom.size > (1<<30) || atom.size < 4) + return AVERROR_INVALIDDATA; + + version_major = avio_r8(pb); + version_minor = avio_r8(pb); + + tmp = avio_rb16(pb); + profile = (tmp >> 9) & 0x7f; // 7bits + level = (tmp >> 3) & 0x3f; // 6 bits + av_log(c, 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); + + return 0; +} + static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('A','C','L','R'), mov_read_aclr }, { MKTAG('A','P','R','G'), mov_read_avid }, @@ -6861,6 +6892,8 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('v','p','c','C'), mov_read_vpcc }, { MKTAG('m','d','c','v'), mov_read_mdcv }, { MKTAG('c','l','l','i'), mov_read_clli }, +{ MKTAG('d','v','c','C'), mov_read_dvcc_dvvc }, +{ MKTAG('d','v','v','C'), mov_read_dvcc_dvvc }, { 0, NULL } };