From patchwork Thu Jul 9 19:20:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20930 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 CE62844B0C4 for ; Thu, 9 Jul 2020 22:20:38 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5526688151; Thu, 9 Jul 2020 22:20:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 80B27688151 for ; Thu, 9 Jul 2020 22:20:32 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id f18so3579728wrs.0 for ; Thu, 09 Jul 2020 12:20: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:in-reply-to:references :mime-version:content-transfer-encoding; bh=QGb0Fun7ZmQM2Zc2eKyv5Ej+M1TPlDgabwzDhFbif5Y=; b=X4HlFsrhjgtneVSBRgIm7SM6LEAgiIPcUQZx6lqOn819U2r5a6E+rBWjtjOwDQfyLE M6tPTKa0mbhy1pi+/WTTMvdAyNUfMQiVf/UMK6Y7I2BL/UiSIsgKvYj7ARU8XXUk/UBl 2D45YMWJ3S6hDJskWGUnNw/fDKig2oZV4x+2DRc1hj8MQcmHxJ48+OaiOM+Q0pIqnBl/ 0b55aITpYPal4Xtev2hyoAkjVwdAWNQKpFdhQ4+dc+A3lx4iG/Ydfmvrmav9dL7/9EzP qgSm6ni/UfiHENRxyoDhX1hFIleQ8zvMwDROxBfwPegNlCHCqwDQYIoSe/834qeBg9gg w/Iw== 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=QGb0Fun7ZmQM2Zc2eKyv5Ej+M1TPlDgabwzDhFbif5Y=; b=QD54sG65MW4q2kZ2IMVjjpVT0EKZ/bGhlfW94IO3VyCQhL2+e4tSrrbx+7R08LcgJu EOWFHVmS/NZ2we7XYIAp4zrY4Ljb3CpQhCJcL96gkuh5TIMvIXj90uTPDbBIj4WcHZAR NE31/jEajMHLlEmcB8VoNrYVHKAdbdzOqcOq454lr9q4GsP5frUmCPZMx3uZ1YVfqmTv +N+wamYWeHiookXROwsRujkeu6i+/KBVO22151IjXFckFtJsblmal5wuigNdHcHvk1ES ehygQj7oBOfId+/zQ3r5PUpdPKGMpChZsjKUwBw6z45qdnoqjXP41opkeZ38TBX88wXH gKRQ== X-Gm-Message-State: AOAM532S+1YASscl0A9IEgPNbQbf8hvzOhrBWbX2ncKrytnx8elspajS IFhlmILkF744cCvXisa8BxbyD8fb X-Google-Smtp-Source: ABdhPJxVylIxohXvVIGNB8aRrPt/cZ+kn1N92pqcGAyTWuNu/NHUHwNBTf3xNRBIWMaippcQdaM1Lw== X-Received: by 2002:adf:f10a:: with SMTP id r10mr33749941wro.406.1594322431706; Thu, 09 Jul 2020 12:20:31 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 12:20:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 Jul 2020 21:20:14 +0200 Message-Id: <20200709192022.9412-1-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 09/17] avformat/avc, movenccenc: Simplify annex B->mp4 transformation 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 the new ff_avc_parse_nalu function. Signed-off-by: Andreas Rheinhardt --- libavformat/avc.c | 11 ++--------- libavformat/movenccenc.c | 12 ++---------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 39078aa5be..d089051034 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -120,20 +120,13 @@ int ff_avc_parse_nal_units(AVIOContext *pb, const uint8_t *buf_in, int size) { const uint8_t *p = buf_in; const uint8_t *end = p + size; - const uint8_t *nal_start, *nal_end; + const uint8_t *nal_start, *nal_end = NULL; size = 0; - nal_start = ff_avc_find_startcode(p, end); - for (;;) { - while (nal_start < end && !*(nal_start++)); - if (nal_start == end) - break; - - nal_end = ff_avc_find_startcode(nal_start, end); + while (nal_start = ff_avc_parse_nalu(&p, &nal_end, end)) { avio_wb32(pb, nal_end - nal_start); avio_write(pb, nal_start, nal_end - nal_start); size += 4 + nal_end - nal_start; - nal_start = nal_end; } return size; } diff --git a/libavformat/movenccenc.c b/libavformat/movenccenc.c index b91294f706..75244ab70b 100644 --- a/libavformat/movenccenc.c +++ b/libavformat/movenccenc.c @@ -194,7 +194,7 @@ int ff_mov_cenc_avc_parse_nal_units(MOVMuxCencContext* ctx, AVIOContext *pb, { const uint8_t *p = buf_in; const uint8_t *end = p + size; - const uint8_t *nal_start, *nal_end; + const uint8_t *nal_start, *nal_end = NULL; int ret; ret = mov_cenc_start_packet(ctx); @@ -203,14 +203,7 @@ int ff_mov_cenc_avc_parse_nal_units(MOVMuxCencContext* ctx, AVIOContext *pb, } size = 0; - nal_start = ff_avc_find_startcode(p, end); - for (;;) { - while (nal_start < end && !*(nal_start++)); - if (nal_start == end) - break; - - nal_end = ff_avc_find_startcode(nal_start, end); - + while (nal_start = ff_avc_parse_nalu(&p, &nal_end, end)) { avio_wb32(pb, nal_end - nal_start); avio_w8(pb, *nal_start); mov_cenc_write_encrypted(ctx, pb, nal_start + 1, nal_end - nal_start - 1); @@ -218,7 +211,6 @@ int ff_mov_cenc_avc_parse_nal_units(MOVMuxCencContext* ctx, AVIOContext *pb, auxiliary_info_add_subsample(ctx, 5, nal_end - nal_start - 1); size += 4 + nal_end - nal_start; - nal_start = nal_end; } ret = mov_cenc_end_packet(ctx);