From patchwork Thu Jul 9 19:20:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20931 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 D93CF44B0C4 for ; Thu, 9 Jul 2020 22:20:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE63B68B5B0; Thu, 9 Jul 2020 22:20:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B79A68B485 for ; Thu, 9 Jul 2020 22:20:37 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id j18so3167474wmi.3 for ; Thu, 09 Jul 2020 12:20:37 -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=G6N4bXwH4+xxXK5kWZrX9yMURWDP7v9T5kgeJH+7O7c=; b=ZeEmcjAp+ppaykdGeJgURxlQsHP1uZ88bpdxBBbK1IlpLSXtECgC9/Q7/iagAIsh/T KI5XjMOamMmgu2wPHczcURouLwHz86SHI/sKJj8Iu8uPtGqMQMhTMMmyWn+X1zAu2eSP VveDxxwGYCUn6e/dh25RlfFiThHNvcOLb+UhhlfSyPNMhB4h747TPVBGVqQzPegyNXv/ bYcSzl82aoz/nzfZnXqp0jUqmmULBQjjE69AhsBxdzaSiGi5cC4Nex/v83rs90i751Ld 2dVe9StRFv79nybyyGbJxy/3FZkxqEQqKfxCUGUWVpm0bNP7iGgUxPVnlSXW7EqhF5iu 3V4Q== 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=G6N4bXwH4+xxXK5kWZrX9yMURWDP7v9T5kgeJH+7O7c=; b=B4rEKjVOHpiPMSPkbEDkx36/GdfUNXekgJ4F27oC/WMQ2EyUn8r/oFGjUjCnhN8XUt cjWkHC9GM2jqDITU9QpZxcZYz4jPrQoH81RPA549avyHgseWrtWKiWsRF1GzkdHZp26h mKrcyUY3ukjd9OqF4XxA+7t0jS8ZgV6m7KHHbg3vQfG61axMhNrxF6V0A+9tX5LtNiu0 BVzbNzhPVkbYYHk9xMPpjjzNwBlxl4uY4BMqBdDUqJdQVIJkuRFmKI89+KoBGUvf8wZx DcoeIvJDN+J+TuRDNarxr0FTF+RWNVWYRiiZ6DlmrcFNqBln4T3vMumRYlIdK9Tam0yk vEnQ== X-Gm-Message-State: AOAM533FgfEZJ6hxvHGVPnv3rj+L7KTCUi5FXdYhFtM45K+5BrvG99oi f4xsUct4URzQTzsyETiM0YeWhahL X-Google-Smtp-Source: ABdhPJwh2RmH1LuzXXoXKGeiPj/uwC+QMbCWxcBBPdbQZiDo8VWGcoNrbxYRbzJxtdzza4X7CRhtHA== X-Received: by 2002:a7b:c259:: with SMTP id b25mr1411095wmj.107.1594322436489; Thu, 09 Jul 2020 12:20:36 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id p25sm5485330wmg.39.2020.07.09.12.20.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 12:20:35 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 21:20:15 +0200 Message-Id: <20200709192022.9412-2-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 10/17] avformat/sdp: Simplify creating H.264 media attributes 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" by using ff_avc_parse_nalu() which means that one no longer has to take care of finding both the start as well as the end of a NAL unit separately. Signed-off-by: Andreas Rheinhardt --- libavformat/sdp.c | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/libavformat/sdp.c b/libavformat/sdp.c index 023c88a583..bc0c39c8b5 100644 --- a/libavformat/sdp.c +++ b/libavformat/sdp.c @@ -156,11 +156,10 @@ static int sdp_get_address(char *dest_addr, int size, int *ttl, const char *url) static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) { char *psets, *p; - const uint8_t *r; static const char pset_string[] = "; sprop-parameter-sets="; static const char profile_string[] = "; profile-level-id="; - uint8_t *extradata = par->extradata; - int extradata_size = par->extradata_size; + const uint8_t *r = par->extradata, *end = r + par->extradata_size; + const uint8_t *nal, *nal_end = NULL; uint8_t *tmpbuf = NULL; const uint8_t *sps = NULL; @@ -170,10 +169,12 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) return NULL; } if (par->extradata[0] == 1) { - if (ff_avc_write_annexb_extradata(par->extradata, &extradata, + int extradata_size = par->extradata_size; + if (ff_avc_write_annexb_extradata(par->extradata, &tmpbuf, &extradata_size)) return NULL; - tmpbuf = extradata; + r = tmpbuf; + end = r + extradata_size; } psets = av_mallocz(MAX_PSET_SIZE); @@ -184,34 +185,29 @@ static char *extradata2psets(AVFormatContext *s, AVCodecParameters *par) } memcpy(psets, pset_string, strlen(pset_string)); p = psets + strlen(pset_string); - r = ff_avc_find_startcode(extradata, extradata + extradata_size); - while (r < extradata + extradata_size) { - const uint8_t *r1; - uint8_t nal_type; - - while (!*(r++)); - nal_type = *r & 0x1f; - r1 = ff_avc_find_startcode(r, extradata + extradata_size); + while (nal = ff_avc_parse_nalu(&r, &nal_end, end)) { + uint8_t nal_type = *nal & 0x1f; + ptrdiff_t size = nal_end - nal; + if (nal_type != 7 && nal_type != 8) { /* Only output SPS and PPS */ - r = r1; continue; } if (p != (psets + strlen(pset_string))) { *p = ','; p++; } - if (nal_type == H264_NAL_SPS && !sps && r1 - r >= 4) - sps = r; + if (nal_type == H264_NAL_SPS && !sps && size >= 4) + sps = nal; - 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); + if (!av_base64_encode(p, MAX_PSET_SIZE - (p - psets), nal, size)) { + av_log(s, AV_LOG_ERROR, "Cannot Base64-encode %"PTRDIFF_SPECIFIER" " + "%"PTRDIFF_SPECIFIER"!\n", MAX_PSET_SIZE - (p - psets), size); av_free(psets); av_free(tmpbuf); return NULL; } p += strlen(p); - r = r1; } if (sps && p - psets <= MAX_PSET_SIZE - strlen(profile_string) - 7) { memcpy(p, profile_string, strlen(profile_string));