From patchwork Tue Apr 21 04:48:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19128 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 5836244A2CB for ; Tue, 21 Apr 2020 07:49:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CAC468B92E; Tue, 21 Apr 2020 07:49:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 115A468A6F0 for ; Tue, 21 Apr 2020 07:49:04 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id hi11so861876pjb.3 for ; Mon, 20 Apr 2020 21:49:03 -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=JSJsLPwsyUUplge7EcPPE6LoGUqAtZEJUxpWe9LvmQg=; b=OoJsBjN3puT+xPN7rdtq1HOIOqsNAhanLDPlZBsypwMDLm9r5VMOJIh2TAS+lNe3aw oACQt4cpcZiEri5Y7wZWi2p2Z3WyC0uobYqZAlVUwJt5JU8IQYeVBQl07aLZuhb6FQRA Q7cXXwo3D3JzAQXwdXJOG36J//LpHi6yb5yxQXGwUBr11f7g6YIwO2gi7HiUH/7VCK6C 6gtlsbhGt+q3YclQCAEocVCP69WOdgrYn9opIr5MilwjsDC/VijJBj24tWy05wIAda1V Ob287RTZ5sji0dGkhc46KLkr5JRw83sqJ984CREOf0a/LNjUPG3xMnuO7jxDaq2abk7A RvfQ== 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=JSJsLPwsyUUplge7EcPPE6LoGUqAtZEJUxpWe9LvmQg=; b=T7M8L2PP1oHdxRqDsWCAOuOlxOs2oJbTCQbVko5uCLoH6ieotZVlk9lts+iuRVqU+M 8BbGIUK59mhZc8JjhNbEDzEW1LiMTqz+bf6MFuTfvfg69lAZbagemzTiqNFQnicth233 a99rkwaE/PK8pO+XOwBPMOowGQfljIuRx5cYZPtM6SKxvBqBE8p5IwIUom6JHeTKzDqI hRqRjB8jdBMEIbLd314Yr/C3AwAU7ACfcja3wYJIYQnGA5zruIeJ01yMQaq/D+pLazPf fN2gsefqldL/hBUIF/WGVTZ6ppZ6cnoplEdjlQYsN4DD0CVss4jMgSTbu9yRhTxPVWCN l5XA== X-Gm-Message-State: AGi0Pua5UwUGW2vAHpvhFwrADOd/qMBbNQ5vJocCoboVwVshqxBfK8nM o/xr2bnlZcvXN8XRz7Xyb3zlrl8F X-Google-Smtp-Source: APiQypLh7mWUx1I6z5pNaaeiWmZZRsV0Zzf1G8PnWXshESHPHvRjk5259NjeL+yObiNTm3k4ldeH7Q== X-Received: by 2002:a17:90a:8a03:: with SMTP id w3mr3332047pjn.29.1587444542174; Mon, 20 Apr 2020 21:49:02 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id j7sm1054475pjy.9.2020.04.20.21.49.01 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2020 21:49:01 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Apr 2020 12:48:54 +0800 Message-Id: <20200421044855.15005-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20200421044855.15005-1-lance.lmwang@gmail.com> References: <20200320151532.778-1-lance.lmwang@gmail.com> <20200421044855.15005-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 3/4] avformat/utils: move is_intra_only() to header and rename to ff_is_intra_only() 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/internal.h | 2 ++ libavformat/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 329b2e972d..716e42cc3e 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -521,6 +521,8 @@ unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id); enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag); +int ff_is_intra_only(enum AVCodecID id); + /** * Select a PCM codec based on the given parameters. * diff --git a/libavformat/utils.c b/libavformat/utils.c index 2fb2309f68..259b2f0aba 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1016,7 +1016,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } } -static int is_intra_only(enum AVCodecID id) +int ff_is_intra_only(enum AVCodecID id) { const AVCodecDescriptor *d = avcodec_descriptor_get(id); if (!d) @@ -1415,7 +1415,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, presentation_delayed, delay, av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), st->index, st->id); /* update flags */ - if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || is_intra_only(st->codecpar->codec_id)) + if (st->codecpar->codec_type == AVMEDIA_TYPE_DATA || ff_is_intra_only(st->codecpar->codec_id)) pkt->flags |= AV_PKT_FLAG_KEY; #if FF_API_CONVERGENCE_DURATION FF_DISABLE_DEPRECATION_WARNINGS