From patchwork Tue Jul 30 20:19:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 14153 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 F2E47447006 for ; Tue, 30 Jul 2019 23:22:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9C5B68A08B; Tue, 30 Jul 2019 23:22:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B8F31689CFE for ; Tue, 30 Jul 2019 23:21:59 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id l9so64244482qtu.6 for ; Tue, 30 Jul 2019 13:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lQqAvekIUdIPXgKZjy1lmksygaT3hAgf8Kdg+L33FZE=; b=bdMH79IF6g+KNTE2ExKMnlHiPuAZ+9VB70xNK3U+BbqdNZzbQMXyvDBDV17HU6Vsx9 bZhRFuT166hsFLda06UsE4tlXs43zB7+DXdScgGn1XTQxLY+tzO8y4rTOVkp4CKjtmbR cdYtRe2g/jggQCQqO1pbg/ONwpAY4sMZ/ykQYtP+f8mcy6T9XZpAU762e5eByLWBCihl wsNDO++wiLHuuGyGzHpGqgWx1cF9mw05vlXYEVRnSy8UcI+/AvZGqzHsHBs8aIpKBLD6 EUawcdpIGYMs3BP1AUjGpRyqz8/zIrjM1caqGtW5PoRfxJR3GlgDG7WJhhGk8aa64ZBW lt3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lQqAvekIUdIPXgKZjy1lmksygaT3hAgf8Kdg+L33FZE=; b=JMdCukdpi4BtPJeWq/y19Yes0fTmmlebFHkMKhILWPIMblQcKR4C0d3C06rKYmyqGY e2eVnKDiwxesJ+0ugxBHdIAk+RT/9FtfFqNtyYhvL7T8qRJN9c4Q3W9V4qauTgck72AH tc2nPLaCupjXk05t491yCvnxKTQh6zdn/GXf9bOvPdDHwSn4IhsyScrEI3mXhY2efypP bMHGgNX2NtNGW0UHOY726eFm32wOgu1B5N1wC5NItXPgVZbI8ohFHn0pd1g1oB8d6K4I ZXQxKJWinFwdQMkiEMHb7nSEOxMSK0GVXrEKz29+YfWf2NxugGd3fg1DUQWyVKt0V+UB ZmOA== X-Gm-Message-State: APjAAAUjeCyArgfPPxuoiYe4oz3zoD+o7CLJ1VxdGKfFqXzbDa20udj9 UlNaq+c7yPhB03OkNCeMtQSgI6KO X-Google-Smtp-Source: APXvYqx+fbXNtGo0RrqzFXm1mxHcqRzPv5NqCpUq6+TsleR2h6hdJIBaYDEJmDy608Qi7ZJiWdWGEA== X-Received: by 2002:ac8:2bd4:: with SMTP id n20mr84125697qtn.131.1564518118313; Tue, 30 Jul 2019 13:21:58 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.187]) by smtp.gmail.com with ESMTPSA id r36sm35243859qte.71.2019.07.30.13.21.57 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 30 Jul 2019 13:21:58 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Jul 2019 17:19:48 -0300 Message-Id: <20190730201951.2033-5-jamrial@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190730201951.2033-1-jamrial@gmail.com> References: <20190730201951.2033-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/7] avformat/dashenc: update stream extradata from packet side data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" codecpar->extradata is not going to change between packets. New extradata is instead propagated using packet side data. Signed-off-by: James Almer --- libavformat/dashenc.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 64e2dac77e..bded260806 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1464,25 +1464,29 @@ static void find_index_range(AVFormatContext *s, const char *full_path, } static int update_stream_extradata(AVFormatContext *s, OutputStream *os, - AVCodecParameters *par, - AVRational *frame_rate) + AVPacket *pkt, AVRational *frame_rate) { - uint8_t *extradata; + uint8_t *extradata, *new_extradata; + int extradata_size; - if (os->ctx->streams[0]->codecpar->extradata_size || !par->extradata_size) + if (os->ctx->streams[0]->codecpar->extradata_size) return 0; - extradata = av_malloc(par->extradata_size); + extradata = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &extradata_size); + if (!extradata_size) + return 0; + + new_extradata = av_malloc(extradata_size); - if (!extradata) + if (!new_extradata) return AVERROR(ENOMEM); - memcpy(extradata, par->extradata, par->extradata_size); + memcpy(new_extradata, extradata, extradata_size); - os->ctx->streams[0]->codecpar->extradata = extradata; - os->ctx->streams[0]->codecpar->extradata_size = par->extradata_size; + os->ctx->streams[0]->codecpar->extradata = new_extradata; + os->ctx->streams[0]->codecpar->extradata_size = extradata_size; - set_codec_str(s, par, frame_rate, os->codec_str, sizeof(os->codec_str)); + set_codec_str(s, os->ctx->streams[0]->codecpar, frame_rate, os->codec_str, sizeof(os->codec_str)); return 0; } @@ -1700,7 +1704,7 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) int64_t seg_end_duration, elapsed_duration; int ret; - ret = update_stream_extradata(s, os, st->codecpar, &st->avg_frame_rate); + ret = update_stream_extradata(s, os, pkt, &st->avg_frame_rate); if (ret < 0) return ret;