From patchwork Thu Jan 24 20:38:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 11861 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 14F0C44D2A8 for ; Thu, 24 Jan 2019 22:38:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E47068AD01; Thu, 24 Jan 2019 22:38:00 +0200 (EET) 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 3FD8C68AB5B for ; Thu, 24 Jan 2019 22:37:54 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B7CE8E1346; Thu, 24 Jan 2019 21:38:12 +0100 (CET) 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 6e3jqsd0Mu4B; Thu, 24 Jan 2019 21:38:12 +0100 (CET) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9C034E166C; Thu, 24 Jan 2019 21:38:11 +0100 (CET) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Jan 2019 21:38:01 +0100 Message-Id: <20190124203801.18484-3-cus@passwd.hu> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20190124203801.18484-1-cus@passwd.hu> References: <20190124203801.18484-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 3/3] avformat/mpegts: use av_unlikely for detecting unknown streams 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" Strangely the previous commit caused a slowdown in overall performance and this fixes it. I used gcc 7.3.1. Does anybody else see this? time ffprobe -show_packets samples/ffmpeg-bugs/trac/ticket6132/Samsung_HDR_-_Chasing_the_Light.ts > /dev/null Before: real 0m2,010s user 0m1,413s sys 0m0,596s After: real 0m1,948s user 0m1,355s sys 0m0,592s Signed-off-by: Marton Balint --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index b04fd7b4f4..3003739b38 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2477,7 +2477,7 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet) pid = AV_RB16(packet + 1) & 0x1fff; is_start = packet[1] & 0x40; tss = ts->pids[pid]; - if (ts->auto_guess && !tss && is_start) { + if (av_unlikely(ts->auto_guess && !tss && is_start)) { add_pes_stream(ts, pid, -1); tss = ts->pids[pid]; }