From patchwork Wed Jul 22 15:27:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 21223 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 DCD234482F1 for ; Wed, 22 Jul 2020 18:28:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B68F568B71D; Wed, 22 Jul 2020 18:28:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E82E268B6F6 for ; Wed, 22 Jul 2020 18:27:57 +0300 (EEST) Received: by mail-pl1-f179.google.com with SMTP id k4so1152236pld.12 for ; Wed, 22 Jul 2020 08:27:57 -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; bh=sqc+IaUiQ1KGmMc6ATeI+Ph2nLsSm6YcFM+RsIMyMV4=; b=lEOl2vQ7XTkdYx/yZi+pmeTvaZTNVAVCQne1+O48MaoE7WTH7Mg8ZoI+9z38iROu1B Zcv75mKfKViDUvFfRCfdfGKS+i7P1IFqZDWGo93RkS3CBXA1uOvkiJW8NJ0XBTCap5tK wbv9A/1IdzlL9bcdRgdHiZDtx0oHFc76X21y9ZWgjSkeCNtUGp7PrWkdRG091UIoRnYH 4j3AuZN1zHnC+T8tCM3yzSFxuenNsk3je0wTwLup+iGWp8GCZiMaEzzqbI6AJtGsDJsO vuljRn+ZtM3CUpdkOwSGS9GIj7ZF7PLd/Cl9h/E32fvyfiKU3njuWrplZ0ILQ7o0gDTk RDiA== 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; bh=sqc+IaUiQ1KGmMc6ATeI+Ph2nLsSm6YcFM+RsIMyMV4=; b=ZtVZOw4ch0AYLB7JLRZUJ5ujMVTtG4WHAkGvc/oA8r//cCmSb/ad0Zh97Nw1RLrA3q t3HIXd0XmcdcX7gf9Ueaep8+Hc6xTU5i5l3FoNTVT5XktZEDJolQzuI1ly+7ocuoaZmL PR88bDM+eDI/HHmqJ0xFsl7iv8GPJbBrAhFoInDLZ4xHK7oSS5ebC/d7zXlDS9nf2ypq tJVR4w21RbhHJyi+Pqik96oY+U6zqXo4xH9tlA/ILNnQo7SqxNz2LBTlAxVwIvrSqugz BnKSR6E2Dk26ZYY0TNYFsE55rhBryrivKbsxmvbQWLHF+UvP6pEHPa4QRZzFPaoH839+ EKIA== X-Gm-Message-State: AOAM533MimY0U4eZbFdAQamVE5VygiBldisXIvTGjVJchMNLnsc0SpaN FQoeKaBUYyBbJmsRbr5YVToBQCgu X-Google-Smtp-Source: ABdhPJxf0TsxEMuxPLbFS6aa0XgVxVgywxhSfqGW367Cev9F10gi+Q1cS4Lk9/1gGhyAg43FGvaZDg== X-Received: by 2002:a17:90a:1089:: with SMTP id c9mr10658975pja.180.1595431676045; Wed, 22 Jul 2020 08:27:56 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w71sm233889pfd.6.2020.07.22.08.27.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2020 08:27:55 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Jul 2020 23:27:34 +0800 Message-Id: <1595431659-664-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1595431659-664-1-git-send-email-lance.lmwang@gmail.com> References: <1595431659-664-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/8] avformat/mpegtsenc: simplify code for condition checks 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavformat/mpegtsenc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index d827ba3..2d7a8ab 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -483,16 +483,18 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) /* write optional descriptors here */ switch (st->codecpar->codec_type) { case AVMEDIA_TYPE_AUDIO: - if (st->codecpar->codec_id==AV_CODEC_ID_AC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) { + if (ts->flags & MPEGTS_FLAG_SYSTEM_B) { + if (st->codecpar->codec_id==AV_CODEC_ID_AC3) { *q++=0x6a; // AC3 descriptor see A038 DVB SI *q++=1; // 1 byte, all flags sets to 0 *q++=0; // omit all fields... } - if (st->codecpar->codec_id==AV_CODEC_ID_EAC3 && (ts->flags & MPEGTS_FLAG_SYSTEM_B)) { + else if (st->codecpar->codec_id==AV_CODEC_ID_EAC3) { *q++=0x7a; // EAC3 descriptor see A038 DVB SI *q++=1; // 1 byte, all flags sets to 0 *q++=0; // omit all fields... } + } if (st->codecpar->codec_id==AV_CODEC_ID_S302M) put_registration_descriptor(&q, MKTAG('B', 'S', 'S', 'D')); if (st->codecpar->codec_id==AV_CODEC_ID_OPUS) {