From patchwork Fri Jun 28 07:21:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 13741 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 2224C4477C4 for ; Fri, 28 Jun 2019 10:27:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C9C568AAE7; Fri, 28 Jun 2019 10:27:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f194.google.com (mail-oi1-f194.google.com [209.85.167.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEEA168A607 for ; Fri, 28 Jun 2019 10:27:44 +0300 (EEST) Received: by mail-oi1-f194.google.com with SMTP id a127so3583097oii.2 for ; Fri, 28 Jun 2019 00:27:44 -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=dVJGatD71reF1Da2ZLH5GTSw+WtkJyphNgT+VlzTeeU=; b=tslmeiA33hdeRfuUucivNyfi+JunILgLb5b1nzqBUOmHa9yvsV+fBaCq1acBJgkSts wrGOgt65B7WzndJ7jb4uYI1b7k0/JkO81OdwOzS+313JYiivtZVggV4VaRJqMJsKMBie K+QTvzxeH7k1whZjtF9xEAyXB2YwDaWx5IO/NEObKHD5zvepGQgGtVzCAs55S5XSoDW+ eClW1k7XU0jxCaywSKY6LJEZPzKm5XPCL4t6KWY3HyhZ1SGZurzMkLA0fafs8i6epwav lG/gn9W7qdMgTep9SaaNNCUFXaByW94x5PSpAQ6uQGRIrlvn84owg4zJPc3gmh7Do2av AN3Q== 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=dVJGatD71reF1Da2ZLH5GTSw+WtkJyphNgT+VlzTeeU=; b=dQkOg1QSX9g4bjumTzwV3DPqGIWBdFJCNgC6rFEFI74J6dCbayLUUvQwPoLyGXowG9 l5C4lG+Btb4/0a56/F3Uvye0voDIzwUomMxm5C6F0m/aKmjJtcJ7RkfGThioj3hIIXvX Lqsxkn/EE1I8yKWLG+wilRLpEYKrPKYSZXErF0++s034En923NXUxVjClDu6ts55sPD4 eRfl88lxN4JTAsj49MdnxwSlJa/qPy+EXqCCMlylY4fax9gzTcBm13+lLUKRjcuwfU7c f6HVmKn8LYkawv2nf+GMPr4RuUbSpF8Qt1di/bwqgsLnyQUQ+VEXe+kVd9XAeyAhRsOa hTpg== X-Gm-Message-State: APjAAAWG5e/xCXzWVnNzciUsWFXAJShGeD8j4KjoLSeVPuGEsEvBJGp3 t1qh/cgCjVaoVRZxJ2fvjWFYQqZV X-Google-Smtp-Source: APXvYqxEZO+3aVFD22ObB87GH8K+FNZ3SBJOWwQ+fAnnp4Ub+r1snamjWLGy6+8VH63ANqY7EX3AuQ== X-Received: by 2002:a63:4e5f:: with SMTP id o31mr7977577pgl.49.1561706483796; Fri, 28 Jun 2019 00:21:23 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id m5sm1206791pjl.24.2019.06.28.00.21.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Jun 2019 00:21:23 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Jun 2019 15:21:10 +0800 Message-Id: <1561706472-15018-3-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1561706472-15018-1-git-send-email-mypopydev@gmail.com> References: <1561706472-15018-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH V2 2/4] ffmpeg_opt: Respect default disposition when select audio/video 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao Respect default disposition when select audio/video Signed-off-by: Jun Zhao --- fftools/ffmpeg_opt.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 53d688b..f5ca18a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -2198,7 +2198,8 @@ static int open_output_file(OptionsContext *o, const char *filename) for (i = 0; i < nb_input_streams; i++) { int new_area; ist = input_streams[i]; - new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames; + new_area = ist->st->codecpar->width * ist->st->codecpar->height + 100000000*!!ist->st->codec_info_nb_frames + + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); if (ist->user_set_discard == AVDISCARD_ALL) continue; if((qcr!=MKTAG('A', 'P', 'I', 'C')) && (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC)) @@ -2221,7 +2222,8 @@ static int open_output_file(OptionsContext *o, const char *filename) for (i = 0; i < nb_input_streams; i++) { int score; ist = input_streams[i]; - score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames; + score = ist->st->codecpar->channels + 100000000*!!ist->st->codec_info_nb_frames + + 5000000*!!(ist->st->disposition & AV_DISPOSITION_DEFAULT); if (ist->user_set_discard == AVDISCARD_ALL) continue; if (ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&