From patchwork Wed May 9 21:35:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8896 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp323275jad; Wed, 9 May 2018 14:35:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoKOVD0gD1W42FR1pReEa0FXzcdr+mBLhXN6zoXKTvxbI5B4EltbwwbP97imLkiCdAhxNEX X-Received: by 10.28.147.131 with SMTP id v125mr6950825wmd.58.1525901733628; Wed, 09 May 2018 14:35:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525901733; cv=none; d=google.com; s=arc-20160816; b=c8pS5Z0PM3xmuPsHIy3DBBLzRBNoX+dKM/N7bPofLeBkxiLjrX4uev5bwTUWsgWwhQ TuxdxkFjtJKYd7Il7gqkAVpsSe9NuSjbVg8Gnh+2F1JR1fYPfFbfuRWh9LVWetCFnlya FDL/I3Krd3tZo9aNWBgX8RZxtrKkDxFscKMq+Y9tWsoiPH2FZPu0hipd7BOLSEnD2e+B uZSYCS2m3wT3wESzL7dvJzNk46RkQ4171Gw8t0wbF1nK7QjARhSBpikOcvFJo35FER63 cAvSEd6dOe6VLc6wAiHPBIbZD8x4bkw06Sbie70Ay5vDVcOrXbWknHpKF1NUnNTuNWnF HAOA== 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:dkim-signature:delivered-to:arc-authentication-results; bh=uVQc3HIJ8F+fE8+0h+v/q9QfNzXqt+oPZD31Xo3xx9o=; b=jRB6xaQkxWYjdUPSil6ypfTOb4AZUj+gMXDEZcBMTwmAui8jFtTm09YONqFeIAHTz2 LguWuLhZBkSrOpc3ru3LkYaBRbZdnaVOSPqGBmY4oqUDxDRfSSjgXxL/xsiQetXbvLXr 75M9hNfi4D52UlRko75Op/sIXbgBzt2eyFp+urqmUJQOygJJsBPAc5+bW5prpGQ03o77 jBSnx90CfgC/AUJKIoVWozwAA6l1Iw/Ksy4PHGTUzXPAl3pUZgC/dguATFVoDUPoBNsN 0Rxyk4KwGfsCwVsmNbcQ6F6yZZrV8p904NDPnCwAro/6o0Ttixv343snF+dtapiDDc0g udSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=fZA5zTFk; 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 q18-v6si3730930wre.417.2018.05.09.14.35.33; Wed, 09 May 2018 14:35:33 -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; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=fZA5zTFk; 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 09386689C7C; Thu, 10 May 2018 00:34:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 320E6689958 for ; Thu, 10 May 2018 00:34:37 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id v63-v6so816pfk.8 for ; Wed, 09 May 2018 14:35:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KAsW/6kc7wgX5YRf83RUb2b3D7y8P1rLp2TwlO9U9Ww=; b=fZA5zTFkLgiGgXMrjE7vlgPSLAFzNar8yrm0zfsk5ynUjoVML8d/7yK3R6DqOjQRLw a9I2jeRcCs136aDO28mosqpW1NgVSk5L5U9TgmvUmaRXFLEkk5ivbxX0StiOVILO4Rae qxSFxoD7SIuSPcedFNWj8Jc7LPDM7+smBRysJ12T/iwYG2djidpylBeXlbnAG580pIgd W3H8noTTujGFAHVhCIrBxrvXT2SszgDgnP7rEUI2GYE5bxjEEYJ86jYOKZonqh3WdOMm aoBGUeZ8e+1o5bnqsm0fZohR7dvHrwWaRG2UZTDQwJoFNbfbePbDDeW+WjmeA1YK4ThF arcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=KAsW/6kc7wgX5YRf83RUb2b3D7y8P1rLp2TwlO9U9Ww=; b=YC1c+i/TRfApaekxf71IftYK8Ll0tGugqW1LnFSv9lvml+VL/23iBw7ma7xoPoVU9i OCEvtnL1liGn05+xNf0CDMw1Af8ryLP+TbEZ7iDZVIfw5Roan12Q16ra9WcstFg+VpCV 32yuUgFpX56ZaURLTQrjiVb6pYpXnaar3eaiy/515uE0QXE5T6BPCNltH8S6gG9Jl0ih t9gGzYJyNQP1M3fZ0bbjevJDXjntj5NKD95IiNmNOasrtHFpi/tRnBblwa5k/AX972Gk LYeuKjIS6QasGanNIj9x0f/9D3tdISf4fgzTYisWECO0ZEwo6ZOef8mVvX7yIY7mYqsZ iSYw== X-Gm-Message-State: ALQs6tAtjydfd6lrT4IaMFkza/A0J8b94Cb3Y2KRuHcflzoW5Is+p4fI KSFyKoklMivCtQq/iaZWA8Nl/l+D X-Received: by 10.98.14.198 with SMTP id 67mr45220559pfo.36.1525901711439; Wed, 09 May 2018 14:35:11 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id c7sm68549598pfg.81.2018.05.09.14.35.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 May 2018 14:35:10 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 9 May 2018 14:35:01 -0700 Message-Id: <20180509213501.49966-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180509213501.49966-1-ffmpeg@tmm1.net> References: <20180509213501.49966-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mpegts: reindent after last change 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: michael@niedermayer.cc, cus@passwd.hu, Aman Gupta , jeebjp@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Signed-off-by: Aman Gupta --- libavformat/mpegts.c | 70 ++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 3c9f9421cb..9c09819531 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -412,44 +412,44 @@ static void write_section_data(MpegTSContext *ts, MpegTSFilter *tss1, offset = 0; cur_section_buf = tss->section_buf; while (cur_section_buf - tss->section_buf < MAX_SECTION_SIZE && cur_section_buf[0] != 0xff) { - /* compute section length if possible */ - if (tss->section_h_size == -1 && tss->section_index - offset >= 3) { - len = (AV_RB16(cur_section_buf + 1) & 0xfff) + 3; - if (len > MAX_SECTION_SIZE) - return; - tss->section_h_size = len; - } - - if (tss->section_h_size != -1 && - tss->section_index >= offset + tss->section_h_size) { - int crc_valid = 1; - tss->end_of_section_reached = 1; - - if (tss->check_crc) { - crc_valid = !av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, cur_section_buf, tss->section_h_size); - if (tss->section_h_size >= 4) - tss->crc = AV_RB32(cur_section_buf + tss->section_h_size - 4); + /* compute section length if possible */ + if (tss->section_h_size == -1 && tss->section_index - offset >= 3) { + len = (AV_RB16(cur_section_buf + 1) & 0xfff) + 3; + if (len > MAX_SECTION_SIZE) + return; + tss->section_h_size = len; + } + if (tss->section_h_size != -1 && + tss->section_index >= offset + tss->section_h_size) { + int crc_valid = 1; + tss->end_of_section_reached = 1; + + if (tss->check_crc) { + crc_valid = !av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1, cur_section_buf, tss->section_h_size); + if (tss->section_h_size >= 4) + tss->crc = AV_RB32(cur_section_buf + tss->section_h_size - 4); + + if (crc_valid) { + ts->crc_validity[ tss1->pid ] = 100; + }else if (ts->crc_validity[ tss1->pid ] > -10) { + ts->crc_validity[ tss1->pid ]--; + }else + crc_valid = 2; + } if (crc_valid) { - ts->crc_validity[ tss1->pid ] = 100; - }else if (ts->crc_validity[ tss1->pid ] > -10) { - ts->crc_validity[ tss1->pid ]--; - }else - crc_valid = 2; - } - if (crc_valid) { - tss->section_cb(tss1, cur_section_buf, tss->section_h_size); - if (crc_valid != 1) - tss->last_ver = -1; - } + tss->section_cb(tss1, cur_section_buf, tss->section_h_size); + if (crc_valid != 1) + tss->last_ver = -1; + } - cur_section_buf += tss->section_h_size; - offset += tss->section_h_size; - tss->section_h_size = -1; - } else { - tss->end_of_section_reached = 0; - break; - } + cur_section_buf += tss->section_h_size; + offset += tss->section_h_size; + tss->section_h_size = -1; + } else { + tss->end_of_section_reached = 0; + break; + } } }