From patchwork Mon Jul 27 16:32:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21302 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 F281D44A99C for ; Mon, 27 Jul 2020 19:35:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECE1968B956; Mon, 27 Jul 2020 19:33:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E71A768B8EB for ; Mon, 27 Jul 2020 19:33:00 +0300 (EEST) Received: by mail-wm1-f52.google.com with SMTP id p14so14375647wmg.1 for ; Mon, 27 Jul 2020 09:33:00 -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:mime-version :content-transfer-encoding; bh=2R0ormIUU9at0n6Lp2bzv6wTdgcn6yzZHYcwa5uyhog=; b=w9gNjh7rIZJBr0LD6ZEkSvg36ABUUngmaDCyfuwedP+rhsRAlbMT53znoLprE/qU9J GeYr17a0zYo+P7W6o+kk4BDeVobIwbBGFT56rpoyezP29bnKxZ0+RpZ6nnzfdTh/BDEp RzhplV00FHHbV3yvHG1C6abgBR6tbVvTLplKLrUJ6+5YdvXUXQ2cY6nAFM/Ws1PgCpey 9OAXaAir4mbz6lDOrMddTPKV3srKlZokcWXweh2LT1Tgz3+Baq2ZZp9bvVOWlqBa/FcX N2sIxdSJLdW1PoUP2LT/DiJSf9v1xmScNF60Q7xcKej7O/1dQJN+zf3hg1mqGIcmr372 zWzw== 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:mime-version:content-transfer-encoding; bh=2R0ormIUU9at0n6Lp2bzv6wTdgcn6yzZHYcwa5uyhog=; b=UoiCjIY0VQ23HPyqHnDRqWwvyCUnt0zCa6wK1hTOByjSI6TpIr0lvDiO4Ry5iSPM/+ rwdXo3hhvY9RvW2mTeqvN/vIR4Q0N6UU0ui+Snubd0u6hIwNfvDWyWrQiXcUM5wxs0XA m6NxtWH7UjuHZIQ8dUsGNWPbuUTyoT59rGP8o6sizCRydWifc2AMoKhFoDdaHIEyIOIw QG+XwYqxvPrTSpLXLfGkxQlXgXMTreWP9YS2gOOiMajHy40JszE3iVNmT3KR1QvcmjA9 3S105fYPLyZa+j6xTs6PwQlAo23zTbgqpeB9dRSrEfYVZHtI/8siOyw/VwAo78LGjIB/ kN6A== X-Gm-Message-State: AOAM5319TfFQeyBfQI7u2GQz0xpCZbkqtjfj/bmVbyuUz/Eb63Ki9O6d IQsYP+MWXf1SAKZCBKg9bgEQSvhDn0k= X-Google-Smtp-Source: ABdhPJxsjBeAC61iuN3IjTHErdm2d8YdseG4snbRrm35rV4KTvM5mekuTgmxLxZC3Sr0IgR9uPOrxQ== X-Received: by 2002:a1c:a54e:: with SMTP id o75mr82788wme.181.1595867580123; Mon, 27 Jul 2020 09:33:00 -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 w16sm14706791wrg.95.2020.07.27.09.32.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 09:32:59 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 27 Jul 2020 17:32:32 +0100 Message-Id: <20200727163237.23371-18-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727163237.23371-1-sw@jkqxz.net> References: <20200727163237.23371-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 17/22] vaapi_encode: Unify SEI types enum 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This was in two disjoint parts in the H.264 and H.265 files. Unify them in the header to avoid any confusion, because they are really the same enum. --- libavcodec/vaapi_encode.h | 10 ++++++++++ libavcodec/vaapi_encode_h264.c | 6 ------ libavcodec/vaapi_encode_h265.c | 5 ----- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 6487a99604..3bb240ec68 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -476,4 +476,14 @@ int ff_vaapi_encode_close(AVCodecContext *avctx); VAAPI_ENCODE_RC_MODE(AVBR, "Average variable-bitrate") +// SEI types used in options for both H.264 and H.265. +enum { + SEI_TIMING = 0x01, + SEI_IDENTIFIER = 0x02, + SEI_RECOVERY_POINT = 0x04, + SEI_MASTERING_DISPLAY = 0x08, + SEI_CONTENT_LIGHT_LEVEL = 0x10, +}; + + #endif /* AVCODEC_VAAPI_ENCODE_H */ diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 5e1683e851..62f95ea59f 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -35,12 +35,6 @@ #include "internal.h" #include "vaapi_encode.h" -enum { - SEI_TIMING = 0x01, - SEI_IDENTIFIER = 0x02, - SEI_RECOVERY_POINT = 0x04, -}; - // Random (version 4) ISO 11578 UUID. static const uint8_t vaapi_encode_h264_sei_identifier_uuid[16] = { 0x59, 0x94, 0x8b, 0x28, 0x11, 0xec, 0x45, 0xaf, diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index f6008778df..90fea83388 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -37,11 +37,6 @@ #include "put_bits.h" #include "vaapi_encode.h" -enum { - SEI_MASTERING_DISPLAY = 0x08, - SEI_CONTENT_LIGHT_LEVEL = 0x10, -}; - typedef struct VAAPIEncodeH265Picture { int pic_order_cnt;