diff mbox series

[FFmpeg-devel,v6,17/22] vaapi_encode: Unify SEI types enum

Message ID 20200727163237.23371-18-sw@jkqxz.net
State New
Headers show
Series CBS unit type tables and assorted related stuff | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Mark Thompson July 27, 2020, 4:32 p.m. UTC 
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 mbox series

Patch

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;