From patchwork Thu Jun 4 14:12: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: 20149 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 E202D44A4A1 for ; Thu, 4 Jun 2020 17:45:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B046B68B074; Thu, 4 Jun 2020 17:45:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78D1E68AF82 for ; Thu, 4 Jun 2020 17:45:31 +0300 (EEST) Received: by mail-il1-f194.google.com with SMTP id 18so6285233iln.9 for ; Thu, 04 Jun 2020 07:45: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; bh=BvIZ8da8aXoHvr9ml1RijSe1CifFgjaucYpu9WMxKx8=; b=Ksg/brpUDwp+hNeSThAYVvsmSdjMP37pv/sPPDr+FrA8bOGbc9yI1bnxo5Hf5Ief1w nfQc1TF1/GLj/OlBsUjsg5RJng5CFqi91bPrhem79Qsd6yFy3zKPIHCKDTlnYnj6Bfpd vsXQGQbf6P39Dgx/en7at1HSQF+J4f6S7oN0OFu7V+MoW79/gqcEAJu7I7i2poWOXI5N iv5oP+a4NJI8gHWT1Z8uhLTYAQ7abbHzAs/kdcoDqbFjet26syH7QzuQGgmrMAApCTJC zkYwyYFsHcF46x9Jss/WtaztXMS6+Qu/7KTh0TiRS0L46+aKO6WYDK5vkNhGGm1IOHZ1 3vgg== 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=BvIZ8da8aXoHvr9ml1RijSe1CifFgjaucYpu9WMxKx8=; b=m6KBeh2Nma2MycAyCaOUTB6QRK4au8dF0I42BwkX9t6FobnzWJ6rbSMp/HTJWTGVmX BA5uZnB7RvVnsmodW/Gk10Q0+Lik5zV8lTpxbYlu9m8M02lKYO1WA5lGQL6qPUqg5jPw PStT/28PoSa9OCkkdajd73ItcEto7owTUr1qEmSgQaTvlGMyocgV+pWTRANY/GAURLB/ loKammRNe1b/q/DYueDvfN2eleFlCKD4OZ5B/gbdgc44Xl0f9k4cG95M8eRmGrzytNfl 4Wzzrb8o9wQoXkLH7xlorE33BhJSfGnd4/dfeBAqWi/ClU6uSjg4sZyKyOfuGZJogNGs aPKQ== X-Gm-Message-State: AOAM532eSNCHdHhT8ObJE6lrDTEghNyp2v2eCtfZmfgnehrR1wZgtNDX nlrnIMxy8mPHEOht5GL+eu2udWOh X-Google-Smtp-Source: ABdhPJz0p/7JHU2zdwevfKJoB42ukuJJL6ldF9C9/r8dOgQTXUQoXD95JQ4KWgD1YsyVDhJ99fLFAw== X-Received: by 2002:a63:715a:: with SMTP id b26mr4638423pgn.433.1591280005525; Thu, 04 Jun 2020 07:13:25 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i10sm4812525pfa.166.2020.06.04.07.13.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2020 07:13:24 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jun 2020 22:12:53 +0800 Message-Id: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH 1/3] fftools/ffmpeg: cosmetics 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 Signed-off-by: Jun Zhao --- fftools/ffmpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 2e9448e..93a86b9 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3118,8 +3118,7 @@ static int init_output_stream_streamcopy(OutputStream *ost) (AVRational){ par_dst->height, par_dst->width }); av_log(NULL, AV_LOG_WARNING, "Overriding aspect ratio " "with stream copy may produce invalid files\n"); - } - else if (ist->st->sample_aspect_ratio.num) + } else if (ist->st->sample_aspect_ratio.num) sar = ist->st->sample_aspect_ratio; else sar = par_src->sample_aspect_ratio; From patchwork Thu Jun 4 14:12: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: 20147 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 9BE76448E72 for ; Thu, 4 Jun 2020 17:39:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7669F68B035; Thu, 4 Jun 2020 17:39:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 923B36880DA for ; Thu, 4 Jun 2020 17:39:16 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id x207so3347449pfc.5 for ; Thu, 04 Jun 2020 07:39:16 -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=NE+A+9XgjX4uT17mS8PiEoubruI6ONPZueylvI0pzzc=; b=d1nDOf65qlpwa9O26VPzyyVzomNk5VxroF8yUqW8doGHFFVtAWdybpk9gQRFBT01Ln SoSzdB6l62CSj/9i0s1BkK0lEgWKRZORGKhlV/FadeKBvKO1efDvrX5yOxvVpolyH2Gy B1mkZOJPEDTw/TOqqZDwcOmZZe0/7eOImljm2Htu1qQvKLLOa/A1YAMmfsUu9pRV/ZnM Cp+/23kxTbOaeU5YYOeUZln/8/gUYIunhYSiyHX0LP1Mj/+/eTrrEPM2oBc43VtZXnDG RLSP0BVk/JKLQS26YuwXqgM7iuQDtGAGDIVpvxvZYpM4VJncrAZ11LeiYGpFIoMEoNA/ sQcQ== 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=NE+A+9XgjX4uT17mS8PiEoubruI6ONPZueylvI0pzzc=; b=DP3Z4Y/1ZHQX2tClimDgga2glSmuaJXyzFCVxvDaM9y0FrCe+30V4OfB5TaBW1HenD Es4RhcZoIntm5g6bACmqG5Z7hzAm19HBx7Upi87pMxwjMluMW6sGQi2iS8Nl124+AUHv LEE5IF132oXfbVk/FQkwGE2Sqzs8RKx8oH7fgZmvRhCkTIMKnudYaFnCE753By8NtATR rd/FZDiGxA01+TpAUPr1bvDuv4glw1H054wNLIYVlPi4w6E8Un/bRCkogXEh5xDwbn6o NLX22g6zc8rhckkOoctOTIehqY8Q3+mT3Eg0gv8XQFX2EebnqHHAr4to/H9Vi1HmrKYC Dh8w== X-Gm-Message-State: AOAM533ZdA7aWpi7pm1IFTwDeVK4ZDdwmPo+2oYrfh/Fl7gktmdk079+ Aq6/rGAcz9sK667sbQYS4RtZuMXM X-Google-Smtp-Source: ABdhPJxNVh5cQ9JYi/3TKGSCB9JE5CGKROX2dEU2F/T6zQHfiKhw5Fri1lB4JtmJLa0B+KlSS5toaw== X-Received: by 2002:a62:7bd6:: with SMTP id w205mr4334860pfc.181.1591280008610; Thu, 04 Jun 2020 07:13:28 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i10sm4812525pfa.166.2020.06.04.07.13.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2020 07:13:27 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jun 2020 22:12:54 +0800 Message-Id: <1591279975-31536-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> References: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavf/hls: Add missed side data/disposition 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 hls demuxer get the strem info form sub-stream, but missed sida data/disposition part, e,g, missed the DOVI sida data when the stream is Dolby Vision streams. Signed-off-by: vacingfang --- libavformat/hls.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3e35d15..c9b8fb7 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1740,6 +1740,20 @@ static int set_stream_info_from_input_stream(AVStream *st, struct playlist *pls, else avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); + // copy disposition + st->disposition = ist->disposition; + + // copy side data + for (int i = 0; i < ist->nb_side_data; i++) { + const AVPacketSideData *sd_src = &ist->side_data[i]; + uint8_t *dst_data; + + dst_data = av_stream_new_side_data(st, sd_src->type, sd_src->size); + if (!dst_data) + return AVERROR(ENOMEM); + memcpy(dst_data, sd_src->data, sd_src->size); + } + st->internal->need_context_update = 1; return 0; From patchwork Thu Jun 4 14:12:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20148 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 7D053449088 for ; Thu, 4 Jun 2020 17:40:11 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 67E7D68B051; Thu, 4 Jun 2020 17:40:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f195.google.com (mail-oi1-f195.google.com [209.85.167.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E330668B01C for ; Thu, 4 Jun 2020 17:40:04 +0300 (EEST) Received: by mail-oi1-f195.google.com with SMTP id s21so5251861oic.9 for ; Thu, 04 Jun 2020 07:40:04 -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=QsTYslWyk77GeGdY8lUhzOw6wEDH2SICyVgquixFgGQ=; b=iLDTtuw9aVaWDabH78OGe0B8NDik76UxU2/pj+jltanP2KVyyCRo3MsmfOYyxgBqWV rMEEWwC+OxJXQTn9Er+Km1RTOZB/O7slAfDdli2pQNu3xwfvtiDVqRbYKlT5HSMWedct pXI7FY48cHLV3qakpatFiMRw/ZTPuqDSKEPvM3V9u3f5y48eqzLgH8aUnJjS6Gz5gg7M BDvxISZTt0rmur17YjcQmP4X/XUYL7Q7y112liv9XyB5qFZU4t/hDBf6LKyOPNXRX4x8 hGEk+m0/naMq596j9adaZMT5PmeeoQ+cHJml2+O+7ZYDJKAxBJL/G9WpSAfInxIx75GA bnOg== 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=QsTYslWyk77GeGdY8lUhzOw6wEDH2SICyVgquixFgGQ=; b=SBjo3HM9OKDPi4ls/kqFW4AJKckAIdMtTtlqxEKetYL9sMFpNyoNZqswLXgRKU6eOi au5HOmAsN+Yfti2/7zFehgTts6G478cS9mKg+c5wVZiNgshe4HOALwBSymPUV1WkbxRA MEsOzCDUcA9B2jy07lFi0fHHI8QzoI/yytYvdgbdiHqiqT1YZGdvJc5u3Kw3pGqRGljy BwQGur6v6TCGorMIl2FHRiMlQnnQcChTwBVveW0p2gqPhYTgBBG9mvkOVduXJez4XmBE b1R+YnDtgptAgYDt3tB0Aul0aoILc1MycdqbbhzzIhF/fBbfSEzws4Hgxz2TC1/8gvg/ FweQ== X-Gm-Message-State: AOAM532djlfmUIOnrSsBBn0Z/8D17TRn5ZOcNUUMvbBzQ+IZHVj2RnVw WktYOirSwbMxjXXxEQ0DZRtAXJcY X-Google-Smtp-Source: ABdhPJwG/x2sBsZVV9uId0Adv1qHB892oRN9c9w1/ZmFDE0k94YBVVBv9Cyzix3PAQGU2OYTIXe3rg== X-Received: by 2002:a17:90a:c905:: with SMTP id v5mr6328634pjt.39.1591280011977; Thu, 04 Jun 2020 07:13:31 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i10sm4812525pfa.166.2020.06.04.07.13.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2020 07:13:31 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jun 2020 22:12:55 +0800 Message-Id: <1591279975-31536-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> References: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/3] lavf/dashdec: Add missed side data/disposition 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 dash demuxer get the strem info form sub-stream, but missed sida data/disposition part, e,g, missed the DOVI sida data when the stream is Dolby Vision streams Signed-off-by: Jun Zhao --- libavformat/dashdec.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c index ec2aadc..694782c 100644 --- a/libavformat/dashdec.c +++ b/libavformat/dashdec.c @@ -2001,6 +2001,20 @@ static int open_demux_for_component(AVFormatContext *s, struct representation *p st->id = i; avcodec_parameters_copy(st->codecpar, ist->codecpar); avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); + + // copy disposition + st->disposition = ist->disposition; + + // copy side data + for (int i = 0; i < ist->nb_side_data; i++) { + const AVPacketSideData *sd_src = &ist->side_data[i]; + uint8_t *dst_data; + + dst_data = av_stream_new_side_data(st, sd_src->type, sd_src->size); + if (!dst_data) + return AVERROR(ENOMEM); + memcpy(dst_data, sd_src->data, sd_src->size); + } } return 0;