From patchwork Thu Jul 9 10:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20911 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 7B25844A1A8 for ; Thu, 9 Jul 2020 13:44:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 593226881A5; Thu, 9 Jul 2020 13:44:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B66F680220 for ; Thu, 9 Jul 2020 13:44:28 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f139so1305024wmf.5 for ; Thu, 09 Jul 2020 03:44:28 -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 :mime-version:content-transfer-encoding; bh=tLNzPoH1bR6r/9m7LSME8G1DAv5nG3r6Xg4bMcFpl/k=; b=CX1kimKG6oCuJQp8fKYZUmdH0sm8FludRs1+6mBEc237onfwVXGT8BR+j1J+IRhjLI XA/0z9+Zwvz9JgFULg+ZCYFW9FyWuI0ZM391wb4dJPHMv/QwSCLQoJc9CBp+3mhCQYWU Xfmie3JvPvJwcklgRlUYzb3WHuMoX3ziHRnCLoFI6WbwZWdxAmc3vW9cblvw4sv01inz Zew4QT7dqoe9g+hUZUTgg7VY26P6TPwX+Nw0tx0E/PHncNokQXKa4OiEkaYbVCP4flBj PnQ0fJEQbhW04iLYo6NCz9MC1WSuspUteW05b0uwZUVKI/d+xg9D6nnMFgCZvK6KQP1D +9+g== 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:mime-version:content-transfer-encoding; bh=tLNzPoH1bR6r/9m7LSME8G1DAv5nG3r6Xg4bMcFpl/k=; b=MkvAP8udp2hIgL5OxTXf2m7W2n1ZyLEcgow9UIQLxnZ192WUu5WBcxwR+z9JqLwxOY tfgombx6a+2a9y/wur279H03Snf4qy/8DgDI9bFzBRCybeZ+V09h4nyyo1+yFMlPR6gr g5SVox12HOjvghbQ016CQnw6H2CJIC82lkHsIY/uYi7J5AynhHmGLgwKKy8BmN7RnXw7 qrNKbo0a6ZXi34iwOA8vGSzKwrc1QlTz8qg43mZUkpX8n74XWZDPm2yCrVRxKDRgJa0E P57fBGTx3rq3OvBtoTBi1UmefFEyLT0Rsmtfxi3pq2EcjBPFuYeh/EX1oQ2msAAo3mJO 93Hw== X-Gm-Message-State: AOAM532/LpYKc4TWDcVzizy1/hrqE238BOfWKEvInizuvImqHjUebNFB zItaozB8UVbpjH7zZgO4hBBLb1di X-Google-Smtp-Source: ABdhPJwGap0HfzfnV0M5wo9m3AW6ayrWMu5zVbWWsp2UE37A/qR2EbXcUKagJ+eqIt0MgTOl80TItw== X-Received: by 2002:a1c:49d4:: with SMTP id w203mr14379607wma.13.1594291033247; Thu, 09 Jul 2020 03:37:13 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id c15sm4155623wme.23.2020.07.09.03.37.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:37:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 12:35:42 +0200 Message-Id: <20200709103542.19909-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200709103542.19909-1-andreas.rheinhardt@gmail.com> References: <20200709103542.19909-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] avformat/sdp: Actually check that parameter set is SPS 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/sdp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/sdp.c b/libavformat/sdp.c index aa0569cd0d..023c88a583 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -24,6 +24,7 @@ #include "libavutil/dict.h" #include "libavutil/parseutils.h" #include "libavutil/opt.h" +#include "libavcodec/h264.h" #include "libavcodec/xiph.h" #include "libavcodec/mpeg4audio.h" #include "avformat.h" @@ -161,7 +162,7 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) uint8_t *extradata = par->extradata; int extradata_size = par->extradata_size; uint8_t *tmpbuf = NULL; - const uint8_t *sps = NULL, *sps_end; + const uint8_t *sps = NULL; if (par->extradata_size > MAX_EXTRADATA_SIZE) { av_log(s, AV_LOG_ERROR, "Too much extradata!\n"); @@ -199,10 +200,9 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) *p = ','; p++; } - if (!sps) { + if (nal_type == H264_NAL_SPS && !sps && r1 - r >= 4) sps = r; - sps_end = r1; - } + if (!av_base64_encode(p, MAX_PSET_SIZE - (p - psets), r, r1 - r)) { av_log(s, AV_LOG_ERROR, "Cannot Base64-encode %"PTRDIFF_SPECIFIER" %"PTRDIFF_SPECIFIER"!\n", MAX_PSET_SIZE - (p - psets), r1 - r); av_free(psets); @@ -213,7 +213,7 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) p += strlen(p); r = r1; } - if (sps && sps_end - sps >= 4 && p - psets <= MAX_PSET_SIZE - strlen(profile_string) - 7) { + if (sps && p - psets <= MAX_PSET_SIZE - strlen(profile_string) - 7) { memcpy(p, profile_string, strlen(profile_string)); p += strlen(p); ff_data_to_hex(p, sps + 1, 3, 0);