From patchwork Wed Nov 29 01:43:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 6434 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3918003jah; Tue, 28 Nov 2017 17:43:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMYgAXF3wRdVltN/LTKe5P95cUwvypZ+RApemeZT0Rjnl9n3RfRxCCBT1D/PWokfvKfxKqlc X-Received: by 10.28.226.214 with SMTP id z205mr1187173wmg.149.1511919832352; Tue, 28 Nov 2017 17:43:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511919832; cv=none; d=google.com; s=arc-20160816; b=hJWixEmvEZxf6iSZ/svWkRel8YXhrkGskbeFljG6srYXQeyOwncJt0kuhUZbpKA8S5 /+zZbQGDZi2ugsDvIwEzQPzG7S+G1NauhGTrL82mpVm2zl+qbpV0z/HibKbVbRDQ8IsG vqx1dEVy0WYXBX6mdTM9d+T5YvTCi56x1st5RmObDvYaJITU5HsyTr9vJ6pWFXprKgYJ l1VjK5E84T1qQNVszmpR2PBItdHkHfEEl1LJ2LvVdN2uppwoYip5ce5i9uGGYJ+P15o6 UpOKG3obYcgK26Y0MOyThbQ+Iue6rlfMCiT8j9p2NaWvdWWrNg+4PiA4AjCEH1z2hzKt o29Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=tzrORfHV9ltPvb11ezF/GIhehNvzAKoiLKGEk3YXJlA=; b=NOxEUiN+KsR8Ru05xeD3VhxdAKeg8ktprsmXTtAj6fS0iPpkoqgOpC12+vNbEVPi+x oeYdKoKymB+NyfRYRVQwH7eXHbIvCTSAGapBrc/VDzaFr5KSlfwlqIAMAqHD8SBEFrG5 xahkBCLk6kRRMmZlqSS2y5u0dgbQseh6042a8yUJ/rUS5z4V/O1pbSGHnyfLRkgaAfej zfsnfzCCXUMFVyR/YJpGV0jUjbyQjFRO+fJS8WMyEAZ1VTPQs8Kt5+Ft3iG5iVTOf8g4 LsFVDxewNSpGGMsGUIjyh8WEFuxRZvsLI1BipPzM2DYC30gjOcVn3HG1Lk7m1QkySRP7 fiLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E+uEcw6f; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c16si392257wrb.267.2017.11.28.17.43.52; Tue, 28 Nov 2017 17:43:52 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E+uEcw6f; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9A5DC68A1BF; Wed, 29 Nov 2017 03:43:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE07968A101 for ; Wed, 29 Nov 2017 03:43:32 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id i40so2472697qti.8 for ; Tue, 28 Nov 2017 17:43:35 -0800 (PST) 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; bh=7O05wFcrF1H59gBHHo9cgMpMk34ymJIsnEs4xcr0fHQ=; b=E+uEcw6fxL+H+UdvdkhsiXHZc5TajEJKcvdYt/V2dO/bklBGvWdRyZjpgf8JKTn42k hg5K0Epmyrs0u/1VcsuKNLVjE6aBX7F7poU+IWCzP4+a4svjgSqrTvuuTtaJRoQKkrbG go2p6m7Wv1CGOQO4TaSOCqFskxNtjG7XCDJMghmmvBGc61BXRT1Gd6+ahoq2tylET/EM MwpKTtqQtkdFjSCHrVxkspRL6M3OW3/a6NZBSeyu8rX35PFHJm9LvEwkC9je1p39JRzD Lo1j9rMj1GSr2YPug/gKcyYQTEnXnw+FdO84lDufz8UBmjpNQ0q4Ou89PZBo1jgLM2AQ kccQ== 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; bh=7O05wFcrF1H59gBHHo9cgMpMk34ymJIsnEs4xcr0fHQ=; b=ceJPfjc+d0+NPHXtHpwtokkLLk9F2ScnSSoHvZfZRkxEgPGEWsqFX1DDggBdAzSnUI VrLnYbPmoBRQMrQGa7M34OFSfYRus35WOtRDZY678mG1beH/vz93FneNkdBS07A5znL3 q5GlNGmf68e7FrfOlKVeGfjrYSdruurWmXRViWeezLCqx4oVLYTyserGiZQT6Af1Rty2 megzyQl7jGQLpke+3dupO5RhaaOFZdI1/iPG6j+no1K+WLBCLa/FVW18ZXAchNBTyPBh faHAFcoG2xBQ+wSrSdA24n9VHOoWsPE/MQL5xUhECrkBg9HQ5bcSPETcECK8Vnt8AdaA hfGA== X-Gm-Message-State: AJaThX6zpHiP3RWJDY3UpN9IRd+lq9CP1+6nTdl5G9A2GMBhAwl669k6 BIlps+3VSHx+SdL6F3/0ukcKvg== X-Received: by 10.200.15.249 with SMTP id f54mr2039814qtk.216.1511919814542; Tue, 28 Nov 2017 17:43:34 -0800 (PST) Received: from localhost.localdomain ([181.231.59.220]) by smtp.gmail.com with ESMTPSA id k7sm407365qkf.57.2017.11.28.17.43.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Nov 2017 17:43:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Nov 2017 22:43:00 -0300 Message-Id: <20171129014303.3716-2-jamrial@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171129014303.3716-1-jamrial@gmail.com> References: <20171129014303.3716-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/avc: refactor ff_isom_write_avcc 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This lets us remove one indentation level. Signed-off-by: James Almer --- libavformat/avc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/avc.c b/libavformat/avc.c index 7b32590778..6ec2f19577 100644 --- a/libavformat/avc.c +++ b/libavformat/avc.c @@ -105,17 +105,22 @@ int ff_avc_parse_nal_units_buf(const uint8_t *buf_in, uint8_t **buf, int *size) int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) { + uint8_t *buf = NULL, *end, *start; + uint8_t *sps = NULL, *pps = NULL; + uint32_t sps_size = 0, pps_size = 0; + int ret; + if (len < 6) return AVERROR_INVALIDDATA; /* check for H.264 start code */ - if (AV_RB32(data) == 0x00000001 || - AV_RB24(data) == 0x000001) { - uint8_t *buf=NULL, *end, *start; - uint32_t sps_size=0, pps_size=0; - uint8_t *sps=0, *pps=0; + if (AV_RB32(data) != 0x00000001 && + AV_RB24(data) != 0x000001) { + avio_write(pb, data, len); + return 0; + } - int ret = ff_avc_parse_nal_units_buf(data, &buf, &len); + ret = ff_avc_parse_nal_units_buf(data, &buf, &len); if (ret < 0) return ret; start = buf; @@ -156,9 +161,6 @@ int ff_isom_write_avcc(AVIOContext *pb, const uint8_t *data, int len) avio_wb16(pb, pps_size); avio_write(pb, pps, pps_size); av_free(start); - } else { - avio_write(pb, data, len); - } return 0; }