From patchwork Sun Mar 11 18:30:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 7910 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp823011jad; Sun, 11 Mar 2018 11:30:46 -0700 (PDT) X-Google-Smtp-Source: AG47ELvsk7XL6ClmwwTWKFO+kJwzXX8dLaTKMkeH9WcIX91imdNYmy70tVQgNK3vHZtT2F9fs42t X-Received: by 10.223.130.76 with SMTP id 70mr4091892wrb.95.1520793046317; Sun, 11 Mar 2018 11:30:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520793046; cv=none; d=google.com; s=arc-20160816; b=RsnaT/homOJg4tkigrtT3Iq+4D8uoXzg5EooB62Jmtf3TeUAWlzxs4oRXalG//NWe9 1N6nJZOEVkvZTYcLgVcIo4QEMOwg32ezU03ZloRuIpocnw1dynZaVS89LjA8N3R0XLX2 eFNPDyGF+ZBP4b2ZL8XszigRgwf7vrVI5m765ODQQbkew4eWoyQtbzTlcuNW2G0UcORC 9yL8C7eATF2rpmjE27XB7kptZzg5i8Qef1ikQG8p5TyqSOattaDoHiLAw6D30kHeZT/2 6InwI1LZd90VH3UQG8zIq2mSmKRINvyZ2J9KSTPy+yMpxEja9QtveBUKk1PxV9vcWILx c4rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=5GlzjWOIZko1fTe5pRV2PwyN0VPLVZV9BlML5U1/gj8=; b=SOcUk22ETZNvnzUXoY3O+7FpZzaid4XaDcovZYeaGk8oixiQLe2UJfFQBhEHTygeHd 6bwxZVM0/+OU/2pZXXDPj0PQFrS6Lj9oi28ZeplBFchqzXfZfaRfP5Goe8PujEPNGfcG kmwhO6SxtSIhs5y4ARVZ2MNswKXEAh0bf+7qCxHx/5WtcD+ev40uRwLrcRdOHjBU54JF StfAluoenVoQF+jbJUKcn3c9MAa0SAbwjy0O568XP+R/B2cpZtkGpt4Ve2pORASwcHI9 g/fw5/VQ4UxTfyOVcV2DC3PfHrzLGyJt/71+qjr98Odzv0Izy6ueWW4NCOPgCHoEuvN0 iPRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=LHjTOfOw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l4si3875609wre.478.2018.03.11.11.30.45; Sun, 11 Mar 2018 11:30:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=LHjTOfOw; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2FE368A11B; Sun, 11 Mar 2018 20:30:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41E1368A1BA for ; Sun, 11 Mar 2018 20:30:21 +0200 (EET) Received: by mail-wr0-f193.google.com with SMTP id n7so13504657wrn.5 for ; Sun, 11 Mar 2018 11:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=Qo+08VNW5+st782kwBoAaEeAQJX27ocAqulT+FKU/6s=; b=LHjTOfOwgqEvFuAfst5Ii34kqwkOa+IAqI1XlUu6i41+c7ayntWy/yRtqlQcQ2UCcQ 5dWjvJ71IGVRpS0kGu8E+3nlX/jhut/QaRtjRuXrO/2ux26n3yDSB5xcUjjfWzboMcJM gCJRvrfTfuOAq3JtsAiSAEdzm+idhriNNomB8cYoq5sj6EtVu7e8+1cw50M7KBPhLEVu 0mEDmsmA5jVBhotmvXwlkuueiffymmDG1fJL13PYEknh8iAQ6i5FbjRHH1OMEodMsggz qFs3ZLgirWjAv6f5kniF8tFyhNXjPVwvmO5Vm5t4XferipIYe7mIhekNvFn5mcJ2TCbw 1G/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Qo+08VNW5+st782kwBoAaEeAQJX27ocAqulT+FKU/6s=; b=YHksamV1o9WFfTUha5zzi4s2TAtxw0YWN0oftYy8XR9sXBkTW9cw1xdm+FiwJtFfkv 97d8+QXjeLKugWUhJMw53eT7IoRMO2IPBGmDx5+DJCOB8fJk2gaXwUEIPSlPLtnIZ4Qs jZq3EA5EywM85LIGbd07b30p1kIeQrEfiR6phlj82iXKAeyWpBfoQ/Qvu9QsPtPgadZ8 M08xwWM6XtKuTexPppLdUwlNYfcfgKtcO68DCBtzhF90gcqQoW9Ea1EI8ayZf/76EPEv /9IV+4EPaz3mEbHuXELf75f2kfKSkXzbn//+7k/tdG7qVxTVyxyDzp4Mx5Tybe53CgkG cRFQ== X-Gm-Message-State: AElRT7Gy+0lJ2yFoHwu7SJvc+EVpxGCcqLpfasHAIKt+Ynlw8S9heDgV r6AWGQuEfj+jCkYqZxNNnR7/y59w X-Received: by 10.223.147.36 with SMTP id 33mr3896304wro.133.1520793030883; Sun, 11 Mar 2018 11:30:30 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 31sm5064514wrr.59.2018.03.11.11.30.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 11:30:30 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 18:30:20 +0000 Message-Id: <20180311183021.25556-7-sw@jkqxz.net> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180311183021.25556-1-sw@jkqxz.net> References: <20180311183021.25556-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 7/8] cbs: Add a table of all supported codec IDs 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Use it as the set of codec IDs supported by the trace_headers BSF. --- configure | 1 - libavcodec/cbs.c | 13 +++++++++++++ libavcodec/cbs.h | 8 ++++++++ libavcodec/trace_headers_bsf.c | 9 +-------- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/configure b/configure index 5e38bdab17..95354611ff 100755 --- a/configure +++ b/configure @@ -2905,7 +2905,6 @@ h264_redundant_pps_bsf_select="cbs_h264" hevc_metadata_bsf_select="cbs_h265" mjpeg2jpeg_bsf_select="jpegtables" mpeg2_metadata_bsf_select="cbs_mpeg2" -trace_headers_bsf_select="cbs_h264 cbs_h265 cbs_mpeg2" # external libraries aac_at_decoder_deps="audiotoolbox" diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 62f60be437..897e0bb28e 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -40,6 +40,19 @@ static const CodedBitstreamType *cbs_type_table[] = { #endif }; +const enum AVCodecID ff_cbs_all_codec_ids[] = { +#if CONFIG_CBS_H264 + AV_CODEC_ID_H264, +#endif +#if CONFIG_CBS_H265 + AV_CODEC_ID_H265, +#endif +#if CONFIG_CBS_MPEG2 + AV_CODEC_ID_MPEG2VIDEO, +#endif + AV_CODEC_ID_NONE +}; + int ff_cbs_init(CodedBitstreamContext **ctx_ptr, enum AVCodecID codec_id, void *log_ctx) { diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 396ff0faec..402eb39e00 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -201,6 +201,14 @@ typedef struct CodedBitstreamContext { } CodedBitstreamContext; +/** + * Table of all supported codec IDs. + * + * Terminated by AV_CODEC_ID_NONE. + */ +extern const enum AVCodecID ff_cbs_all_codec_ids[]; + + /** * Create and initialise a new context for the given codec. */ diff --git a/libavcodec/trace_headers_bsf.c b/libavcodec/trace_headers_bsf.c index 93d04cb509..f742e36d77 100644 --- a/libavcodec/trace_headers_bsf.c +++ b/libavcodec/trace_headers_bsf.c @@ -109,18 +109,11 @@ static int trace_headers(AVBSFContext *bsf, AVPacket *out) return 0; } -static const enum AVCodecID trace_headers_codec_ids[] = { - AV_CODEC_ID_H264, - AV_CODEC_ID_HEVC, - AV_CODEC_ID_MPEG2VIDEO, - AV_CODEC_ID_NONE, -}; - const AVBitStreamFilter ff_trace_headers_bsf = { .name = "trace_headers", .priv_data_size = sizeof(TraceHeadersContext), .init = &trace_headers_init, .close = &trace_headers_close, .filter = &trace_headers, - .codec_ids = trace_headers_codec_ids, + .codec_ids = ff_cbs_all_codec_ids, };