From patchwork Sun Jun 24 22:12:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9493 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp3423119jad; Sun, 24 Jun 2018 15:12:45 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcYu2tnZTJ3KtlEc6xbPtEFhHx3kb6PaymNa69voP5ZKrcODH0xOTfcv2/4LRPI8Nhp8vUJ X-Received: by 2002:adf:dd8c:: with SMTP id x12-v6mr8864436wrl.212.1529878365227; Sun, 24 Jun 2018 15:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529878365; cv=none; d=google.com; s=arc-20160816; b=LrQ9ZIQ39ftwi1Qbf2SZp84KEe29gRA6FKn83fGdr4DCJfh6qLTVsAk+Qoh04ClXSh ShoE6kCox/iPxM47f5CjIAIxnMjPfP5dcnhR24SiPxd6zDk79PKEjDdA6XwI4e1ty90l gICStQHS8Yo2y+dtB2AiGGslcTe2HO3iybG1uLNL9FI5rqg/l29888WdJiYSsY2X0QDo M5igxbhjLbbECpajYqu/B2sdKjXUN/vvwOR/A9Njk7lI+y1BicD4z2bExfX1cXbbRP8A 3a8//yWLgQSnJY0ET3+MMte7P9HyHK/iMR07fmiaeEWcF//KO999EfBcD9UTSI1iYeX7 a2Zw== 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:cc: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:delivered-to:arc-authentication-results; bh=ztJ8oYeFOvpW6hxOT9fa63LtARHu0Xc37lG6yik+Vew=; b=Mb7UED+humDVJplCGhf71D7O6oK9PhKFJk8NZaRu4f6KD+OU4MmPeyQRFbNeMXuaYf Xk0cqtNE7kr1Cbmk/EmC7P0bkGm3YuH+9X9rsoH5GIviTU7vrhY9SCUzb3/ZQ49GQQQh d9Vz5kkqcFMWUkfhPqr6LBsO9i1+ABnJwCP16XDawA340rcYOPD6Qk+VSCQc+s7W7G9u UiTvDTZNfNDs78iJWbu9C8zdUAZYMLNkBAfF+Iux9jdGRVlrdcL4TqYGvrc8N0RgzEWU 8+g5MI4xyx24hv8xMq6CBlnWteLLRnq1OXylI3T+c8oftvGMMbuuvRp0R1W8Jjo0JnFx YTrw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s105-v6si2860985wrc.258.2018.06.24.15.12.44; Sun, 24 Jun 2018 15:12:45 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF448689D20; Mon, 25 Jun 2018 01:11:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08C88689723 for ; Mon, 25 Jun 2018 01:11:35 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 40DC8E04A0; Mon, 25 Jun 2018 00:12:30 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id y7G3RkUUcUrB; Mon, 25 Jun 2018 00:12:28 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 2CAA7E06CF; Mon, 25 Jun 2018 00:12:28 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jun 2018 00:12:21 +0200 Message-Id: <20180624221224.14892-2-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180624221224.14892-1-cus@passwd.hu> References: <20180624221224.14892-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/mxfdec: fix indentation and rename mxf_read_packet_old 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: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavformat/mxfdec.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index c25595a91f..fb03cb97f1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3284,7 +3284,7 @@ static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt) return 0; } -static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) +static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt) { KLVPacket klv; MXFContext *mxf = s->priv_data; @@ -3295,22 +3295,22 @@ static int mxf_read_packet_old(AVFormatContext *s, AVPacket *pkt) int64_t pos = avio_tell(s->pb); if (pos < mxf->current_klv_data.next_klv - mxf->current_klv_data.length || pos >= mxf->current_klv_data.next_klv) { - mxf->current_klv_data = (KLVPacket){{0}}; - ret = klv_read_packet(&klv, s->pb); - if (ret < 0) - break; - max_data_size = klv.length; - pos = klv.next_klv - klv.length; - PRINT_KEY(s, "read packet", klv.key); - av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset); - if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { - ret = mxf_decrypt_triplet(s, pkt, &klv); - if (ret < 0) { - av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n"); - return ret; + mxf->current_klv_data = (KLVPacket){{0}}; + ret = klv_read_packet(&klv, s->pb); + if (ret < 0) + break; + max_data_size = klv.length; + pos = klv.next_klv - klv.length; + PRINT_KEY(s, "read packet", klv.key); + av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset %#"PRIx64"\n", klv.length, klv.offset); + if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { + ret = mxf_decrypt_triplet(s, pkt, &klv); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "invalid encoded triplet\n"); + return ret; + } + return 0; } - return 0; - } } else { klv = mxf->current_klv_data; max_data_size = klv.next_klv - pos; @@ -3580,7 +3580,7 @@ AVInputFormat ff_mxf_demuxer = { .priv_data_size = sizeof(MXFContext), .read_probe = mxf_probe, .read_header = mxf_read_header, - .read_packet = mxf_read_packet_old, + .read_packet = mxf_read_packet, .read_close = mxf_read_close, .read_seek = mxf_read_seek, };