From patchwork Tue Nov 6 12:15:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Sidler X-Patchwork-Id: 10947 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 B5D3644D7C2 for ; Tue, 6 Nov 2018 22:13:37 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2742868A6A3; Tue, 6 Nov 2018 22:13:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4829D68A659 for ; Tue, 6 Nov 2018 14:21:12 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id h21-v6so9859398edq.9 for ; Tue, 06 Nov 2018 04:21:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=uHwBosAZI31VfE1bC8U232g7ARp4GTCSjI2/SFc5S5I=; b=hJMQWM6LT3mk3xTrBFbiV9A09r1nmb+EOKbo0pMyBDXKkWUOB64IVN7IQSzGg27vX0 bHqAb/L2OKmMEe4Zh/hDme8rltV5wDbpRpA0n7nw6RWlg+Rxq3E9wRX2TdS6iQvy0CGQ CwxnXDhXXKF4VsHSSF6z6f50LipB4TsXNLmNeUbpwjMPCPxP92N3Mxu/5ez+ffQx7f7S wqoO7/pCYTyixcr6MIKX9KdQ+iNjRt305VDKq/0l6pZBWmRydlqRs/GZJP1hvc7PyCI9 ZrsQ38tXd5+LWq7/miyhPZ9cSSNpaZxEsfO6XVzpS9vT3MUNNinOVgP3179tvaayJB9W +vkA== 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; bh=uHwBosAZI31VfE1bC8U232g7ARp4GTCSjI2/SFc5S5I=; b=eyWjEoNkwffOvXlAfrYxNP9Eawhi6xhq8zHe89k8KT3SzW1d1K3n8NQDY49DxiKKzm mff4anyicG1r5uqPQPGePqoH5boXgNqtDJPSDXkigu4vcuRhI2LCcbLtIf8goNBJQhbb wkxBQh/mOOoKdU7SEoHsd+JMHzwKATYEYlBh17vVhoAZCew+lGl1YGq62wp4kD4eCd8N rI/zhib2mvpP37hcsXy5MYTbz8ZMrUTWJf9LpxqZoPpfBvrg0I7WQ83wB7kuzlWFNDgP ANQ9cMDID9thSIK8ayObE9zmFVEvdgrfKF15k2y6Qp+3ZpR8w4h6JKEp64V8/wIVLYHU UG8w== X-Gm-Message-State: AGRZ1gKCC/65BpCBRH2KyszfObD9l9qspsE5vuFLI4+PJcmLUOospjxR GAeQ1OXh0ZP3lYzrczOj10bI8wzF X-Google-Smtp-Source: AJdET5fAvOXz2+9RJLpAmVRp45JE3MEx6qEIKQhGxQ+C1WSwQFg29QfAmrUBJ0vhYb4cVOfTtkdFng== X-Received: by 2002:a50:f1cc:: with SMTP id y12-v6mr21769887edl.140.1541506522777; Tue, 06 Nov 2018 04:15:22 -0800 (PST) Received: from localhost.localdomain ([178.197.248.39]) by smtp.gmail.com with ESMTPSA id d1-v6sm4883831edd.32.2018.11.06.04.15.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Nov 2018 04:15:22 -0800 (PST) From: Roman Sidler X-Google-Original-From: Roman Sidler To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Nov 2018 13:15:10 +0100 Message-Id: <20181106121510.13484-1-roman.sidler@sidler-se.net> X-Mailer: git-send-email 2.14.1.windows.1 X-Mailman-Approved-At: Tue, 06 Nov 2018 22:13:08 +0200 Subject: [FFmpeg-devel] [PATCH] round-robin like scheduling for multichannel inputs. Important in case of capture devices. Else the first channel is preferred always. 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: Roman Sidler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- fftools/ffmpeg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index da4259a9a8..fa54421d73 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -3869,12 +3869,14 @@ static int need_output(void) */ static OutputStream *choose_output(void) { - int i; + int i,_i; + static int last_i; int64_t opts_min = INT64_MAX; OutputStream *ost_min = NULL; for (i = 0; i < nb_output_streams; i++) { - OutputStream *ost = output_streams[i]; + _i = (last_i + 1 + i) %nb_output_streams; + OutputStream *ost = output_streams[_i]; int64_t opts = ost->st->cur_dts == AV_NOPTS_VALUE ? INT64_MIN : av_rescale_q(ost->st->cur_dts, ost->st->time_base, AV_TIME_BASE_Q); @@ -3889,6 +3891,8 @@ static OutputStream *choose_output(void) ost_min = ost->unavailable ? NULL : ost; } } + if (ost_min) + last_i = ost_min->file_index; return ost_min; }