From patchwork Sun Jun 10 10:36:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9352 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2903131jad; Sun, 10 Jun 2018 03:38:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIDfHu5kuBVgRjA1T6AhbJJZShETD7jS0fVSzBVV4rIEKTdyeLBJm3UFeakBkzLdmr7+uzK X-Received: by 2002:a1c:6744:: with SMTP id b65-v6mr5473189wmc.9.1528627105192; Sun, 10 Jun 2018 03:38:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528627105; cv=none; d=google.com; s=arc-20160816; b=HqPAHusCuy2ylk2ujm65/SwOclETYu7HD5M6LdQdcivHP7RQGiY6p1VUejCT/VTnB/ ywulUWf8DuYjDthzSftlhxB10RTSJ4zilmgU5QG2vbML9qyH4M+STU6M7i7rmBeLDsoR +LwqnJ6XSenwc2KOzapLKDcwpVJw60g4ki42xzC4o+7sdreQTBDqWWdtZtXJdz8+byLV h63RBPPOEYNHDHAZY80PRrQRmRe7DolQnKsU/eW2WhKSTfFXE0RM/20RloRggiAyDPDo OmbgwY8L+qFiN+DxhGNcbiZu0B5obB4e08wYaoJnDsTFEjh0+t4IBcwAW2aAorJhe5wb FQbA== 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=0jYVf1q0meZXZnpP1EAColLDRgDNBPR8G43sL/y4wJw=; b=wfRdDT/76DTuMKSdsHTRygDz7Pt2oA9uDlN4vIwEnjdpJ3+nMLICa6gWr9B++qJQ5f gTptfWfmExP31glSzBvbPoPILQcjjztJrfPZvOJNq9f+ds622xJgEffWVap4emoQHrG9 Tt/uF1MSaQFs2wuUpNq0aPj/bFEoBt3ADnGKf6TWCrIEkJt4LzSGRXxyBft3r8Ug2yyj fSSmGnyw/IgNpMKr+D31iG83wBCRWKuPH/nK17TWlTexa0HTg35A0x2PqcSu77eiOYt2 /TG/R7uCHX6E+77yOXvGfnkFNGkQSwJten3VuXf4wPBZqzy/3m8S3LQjpZFmTxoEM2hp QULA== 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 g59-v6si30394295wrd.56.2018.06.10.03.38.24; Sun, 10 Jun 2018 03:38:25 -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 AC60468AE6A; Sun, 10 Jun 2018 13:36:31 +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 B1E7468ACDA for ; Sun, 10 Jun 2018 13:36:30 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 602F6E0F70; Sun, 10 Jun 2018 12:37:19 +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 0Om4NrBhmzrl; Sun, 10 Jun 2018 12:37:18 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 82515E0E49; Sun, 10 Jun 2018 12:37:18 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Jun 2018 12:36:48 +0200 Message-Id: <20180610103650.10155-10-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180610103650.10155-1-cus@passwd.hu> References: <20180610103650.10155-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 10/12] 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 d6d1628edb..04ec302110 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3291,7 +3291,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; @@ -3302,22 +3302,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; @@ -3588,7 +3588,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, };