From patchwork Sun May 3 22:05:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 19469 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 0FD6C44B916 for ; Mon, 4 May 2020 01:06:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9A8268C220; Mon, 4 May 2020 01:06:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F2E68C13D for ; Mon, 4 May 2020 01:06:07 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id y24so6699288wma.4 for ; Sun, 03 May 2020 15:06:07 -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=QwhzAKTwK191m5b95Eud9XYjsaM7PM3ygH+mvmtf9Y0=; b=udjwEiNPui+cVSx0orfrl/ERfYQqsE6AQFFV2bPtKMhknyD4HxyICcvUvMFX6nrc8I oo/iA8rYV7tYiXFiC+gVPY20t/9ZPDQi1nJOsF0fRCR7ixj0NFdtF8feBwzHvtlDkDYS 8evdWjaBX59xDsd1Yi/PnRq026gxc8xAEg2ElAQIL7eSKUkpbxYASqVJYOZSonMbrl7X TjjFRCFBlMz7++kelipaLn3/hnx8ehcVObah1tjs73tCXz+AoENEVAuV6EXRXTO1FNjS SFZ+lCIgMvrXqfdhqwOHNrcawj1FL7J79c4Blv5BeE+zb5dh9kpEI5Qh7GNNQ7CGIzRa bgYA== 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=QwhzAKTwK191m5b95Eud9XYjsaM7PM3ygH+mvmtf9Y0=; b=bI84FFSsFX7ZAWHnXBVVSDzXkD3TOaEa6jrio7fceRVy/gVMkwzwNjIRU7eJqf52Mt s0jPm/rD07/1cm0/05/f8yGrq7lYmolTO9PJQc3TFzQ8D1KUM7ewxoIHf15D0zGC7wEv eUuKjwxnfcYM6oLQ3jfiQD1Yfe374uy3VJ5QOakjZpvgESj1KuFEcEj4Br4uCIIRs/gv 3Dgw13V+nG0ZapFHKWL0KTH/Xze8Xi7D/9d8L61z6A0J5n6wfXJKamF5ybHou2Cd/0Ih Pe1bxpteXW2TUecBnYdDgPNq9UMklXNPin8YZcLOZ7UY+nRy//6do8Cx1ALsrdFh7ntp Dzsw== X-Gm-Message-State: AGi0PuZOdzJAof0rDHg1abJ2/Rq6rOA46QBHskywGrD9mCHxEzclpEdz 84BQ+xOaZeRLG30MhLQmfmDjd6qmE4I= X-Google-Smtp-Source: APiQypI7xwIXVOHW4MIqC1HYx2XaauiIffEzwEqAp94OPgOVIxPqF49dmMdaTkR+XG6AKrmQeNjTDg== X-Received: by 2002:a7b:c417:: with SMTP id k23mr11501671wmi.147.1588543566808; Sun, 03 May 2020 15:06:06 -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 a24sm10307285wmb.24.2020.05.03.15.06.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 May 2020 15:06:06 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 May 2020 23:05:43 +0100 Message-Id: <20200503220548.23543-17-sw@jkqxz.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200503220548.23543-1-sw@jkqxz.net> References: <20200503220548.23543-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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 1329f6428f..3a095231fe 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -459,4 +459,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 67b1ecae1b..34a6a8993d 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 e20e8cbdd0..ee44d7c442 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;