[vlc-commits] [Git][videolan/vlc][master] 2 commits: vlc_ancillary: remove extra doxygen group closing tag
François Cartegnie (@fcartegnie)
gitlab at videolan.org
Thu May 11 04:06:51 UTC 2023
François Cartegnie pushed to branch master at VideoLAN / VLC
Commits:
b6a39ae0 by Francois Cartegnie at 2023-05-11T10:13:03+07:00
vlc_ancillary: remove extra doxygen group closing tag
- - - - -
43907dd9 by Francois Cartegnie at 2023-05-11T10:39:01+07:00
vlc_es: move ancillaries to their own header
Ancillaries are opaque to es and tied to data
structures. It has nothing to do with ES as it
does not exists on fmt.
- - - - -
14 changed files:
- include/vlc_ancillary.h
- include/vlc_es.h
- include/vlc_opengl_filter.h
- modules/codec/avcodec/video.c
- modules/codec/jpeg.c
- modules/codec/png.c
- modules/codec/rawvideo.c
- modules/demux/image.c
- modules/video_output/libplacebo/display.c
- modules/video_output/libplacebo/utils.c
- modules/video_output/libplacebo/utils.h
- modules/video_output/win32/window.c
- modules/video_output/xcb/window.c
- src/video_output/video_window.c
Changes:
=====================================
include/vlc_ancillary.h
=====================================
@@ -116,8 +116,105 @@ vlc_ancillary_Hold(struct vlc_ancillary *ancillary);
VLC_API void *
vlc_ancillary_GetData(const struct vlc_ancillary *ancillary);
-/** @} */
+/**
+ * Dolby Vision metadata description
+ */
+enum vlc_dovi_reshape_method_t
+{
+ VLC_DOVI_RESHAPE_POLYNOMIAL = 0,
+ VLC_DOVI_RESHAPE_MMR = 1,
+};
+
+enum vlc_dovi_nlq_method_t
+{
+ VLC_DOVI_NLQ_NONE = -1,
+ VLC_DOVI_NLQ_LINEAR_DZ = 0,
+};
+
+#define VLC_ANCILLARY_ID_DOVI VLC_FOURCC('D','o','V','i')
+
+typedef struct vlc_video_dovi_metadata_t
+{
+ /* Common header fields */
+ uint8_t coef_log2_denom;
+ uint8_t bl_bit_depth;
+ uint8_t el_bit_depth;
+ enum vlc_dovi_nlq_method_t nlq_method_idc;
+
+ /* Colorspace metadata */
+ float nonlinear_offset[3];
+ float nonlinear_matrix[9];
+ float linear_matrix[9];
+ uint16_t source_min_pq; /* 12-bit PQ values */
+ uint16_t source_max_pq;
+
+ /**
+ * Do not reorder or modify the following structs, they are intentionally
+ * specified to be identical to AVDOVIReshapingCurve / AVDOVINLQParams.
+ */
+ struct vlc_dovi_reshape_t {
+ uint8_t num_pivots;
+ uint16_t pivots[9];
+ enum vlc_dovi_reshape_method_t mapping_idc[8];
+ uint8_t poly_order[8];
+ int64_t poly_coef[8][3];
+ uint8_t mmr_order[8];
+ int64_t mmr_constant[8];
+ int64_t mmr_coef[8][3][7];
+ } curves[3];
+
+ struct vlc_dovi_nlq_t {
+ uint8_t offset_depth; /* bit depth of offset value */
+ uint16_t offset;
+ uint64_t hdr_in_max;
+ uint64_t dz_slope;
+ uint64_t dz_threshold;
+ } nlq[3];
+} vlc_video_dovi_metadata_t;
+
+/**
+ * HDR10+ Dynamic metadata (based on ATSC A/341 Amendment 2094-40)
+ *
+ * This is similar to SMPTE ST2094-40:2016, but omits the mastering display and
+ * target display actual peak luminance LUTs, the rectangular boundaries and
+ * ellipse coefficients, and support for multiple processing windows, as these
+ * are intentionally left unused in this version of the specification.
+ */
+
+#define VLC_ANCILLARY_ID_HDR10PLUS VLC_FOURCC('H','D','R','+')
+
+typedef struct vlc_video_hdr_dynamic_metadata_t
+{
+ uint8_t country_code; /* ITU-T T.35 Annex A */
+ uint8_t application_version;
+ float targeted_luminance; /* in cd/m² */
-/** @} */
+ /* parameters for the first processing window (encompassing the frame) */
+ float maxscl[3]; /* in linearized range [0,1] */
+ float average_maxrgb; /* in linearized range [0,1] */
+ uint8_t num_histogram; /* in range [0,15] */
+ struct {
+ uint8_t percentage; /* in range [1,100] */
+ float percentile; /* in linearized range [0,1] */
+ } histogram[15];
+ float fraction_bright_pixels;/* in range [0,1] */
+ uint8_t tone_mapping_flag;
+ float knee_point_x; /* in ootf range [0,1] */
+ float knee_point_y; /* in ootf range [0,1] */
+ uint8_t num_bezier_anchors; /* in range [1,15] */
+ float bezier_curve_anchors[15]; /* in range [0,1] */
+} vlc_video_hdr_dynamic_metadata_t;
+
+/**
+ * Embedded ICC profiles
+ */
+
+#define VLC_ANCILLARY_ID_ICC VLC_FOURCC('i','C','C','P')
+
+typedef struct vlc_icc_profile_t
+{
+ size_t size;
+ uint8_t data[]; /* binary profile data, see ICC.1:2022 (or later) */
+} vlc_icc_profile_t;
#endif /* VLC_ANCILLARY_H */
=====================================
include/vlc_es.h
=====================================
@@ -554,106 +554,6 @@ static inline video_transform_t transform_Inverse( video_transform_t transform )
}
}
-/**
- * Dolby Vision metadata description
- */
-enum vlc_dovi_reshape_method_t
-{
- VLC_DOVI_RESHAPE_POLYNOMIAL = 0,
- VLC_DOVI_RESHAPE_MMR = 1,
-};
-
-enum vlc_dovi_nlq_method_t
-{
- VLC_DOVI_NLQ_NONE = -1,
- VLC_DOVI_NLQ_LINEAR_DZ = 0,
-};
-
-#define VLC_ANCILLARY_ID_DOVI VLC_FOURCC('D','o','V','i')
-
-typedef struct vlc_video_dovi_metadata_t
-{
- /* Common header fields */
- uint8_t coef_log2_denom;
- uint8_t bl_bit_depth;
- uint8_t el_bit_depth;
- enum vlc_dovi_nlq_method_t nlq_method_idc;
-
- /* Colorspace metadata */
- float nonlinear_offset[3];
- float nonlinear_matrix[9];
- float linear_matrix[9];
- uint16_t source_min_pq; /* 12-bit PQ values */
- uint16_t source_max_pq;
-
- /**
- * Do not reorder or modify the following structs, they are intentionally
- * specified to be identical to AVDOVIReshapingCurve / AVDOVINLQParams.
- */
- struct vlc_dovi_reshape_t {
- uint8_t num_pivots;
- uint16_t pivots[9];
- enum vlc_dovi_reshape_method_t mapping_idc[8];
- uint8_t poly_order[8];
- int64_t poly_coef[8][3];
- uint8_t mmr_order[8];
- int64_t mmr_constant[8];
- int64_t mmr_coef[8][3][7];
- } curves[3];
-
- struct vlc_dovi_nlq_t {
- uint8_t offset_depth; /* bit depth of offset value */
- uint16_t offset;
- uint64_t hdr_in_max;
- uint64_t dz_slope;
- uint64_t dz_threshold;
- } nlq[3];
-} vlc_video_dovi_metadata_t;
-
-/**
- * HDR10+ Dynamic metadata (based on ATSC A/341 Amendment 2094-40)
- *
- * This is similar to SMPTE ST2094-40:2016, but omits the mastering display and
- * target display actual peak luminance LUTs, the rectangular boundaries and
- * ellipse coefficients, and support for multiple processing windows, as these
- * are intentionally left unused in this version of the specification.
- */
-
-#define VLC_ANCILLARY_ID_HDR10PLUS VLC_FOURCC('H','D','R','+')
-
-typedef struct vlc_video_hdr_dynamic_metadata_t
-{
- uint8_t country_code; /* ITU-T T.35 Annex A */
- uint8_t application_version;
- float targeted_luminance; /* in cd/m² */
-
- /* parameters for the first processing window (encompassing the frame) */
- float maxscl[3]; /* in linearized range [0,1] */
- float average_maxrgb; /* in linearized range [0,1] */
- uint8_t num_histogram; /* in range [0,15] */
- struct {
- uint8_t percentage; /* in range [1,100] */
- float percentile; /* in linearized range [0,1] */
- } histogram[15];
- float fraction_bright_pixels;/* in range [0,1] */
- uint8_t tone_mapping_flag;
- float knee_point_x; /* in ootf range [0,1] */
- float knee_point_y; /* in ootf range [0,1] */
- uint8_t num_bezier_anchors; /* in range [1,15] */
- float bezier_curve_anchors[15]; /* in range [0,1] */
-} vlc_video_hdr_dynamic_metadata_t;
-
-/**
- * Embedded ICC profiles
- */
-
-#define VLC_ANCILLARY_ID_ICC VLC_FOURCC('i','C','C','P')
-
-typedef struct vlc_icc_profile_t
-{
- size_t size;
- uint8_t data[]; /* binary profile data, see ICC.1:2022 (or later) */
-} vlc_icc_profile_t;
/**
* subtitles format description
=====================================
include/vlc_opengl_filter.h
=====================================
@@ -25,7 +25,7 @@
#define VLC_OPENGL_FILTER_H
#include <vlc_tick.h>
-#include <vlc_es.h>
+#include <vlc_ancillary.h>
struct vlc_gl_filter;
struct vlc_gl_picture;
=====================================
modules/codec/avcodec/video.c
=====================================
@@ -34,6 +34,7 @@
#include <vlc_codec.h>
#include <vlc_avcodec.h>
#include <vlc_cpu.h>
+#include <vlc_ancillary.h>
#include <assert.h>
#include <libavcodec/avcodec.h>
=====================================
modules/codec/jpeg.c
=====================================
@@ -29,6 +29,7 @@
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_charset.h>
+#include <vlc_ancillary.h>
#include <jpeglib.h>
#include <setjmp.h>
=====================================
modules/codec/png.c
=====================================
@@ -31,6 +31,7 @@
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_rand.h>
+#include <vlc_ancillary.h>
#include <png.h>
/* PNG_SYS_COMMON_MEMBERS:
=====================================
modules/codec/rawvideo.c
=====================================
@@ -30,6 +30,7 @@
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
+#include <vlc_ancillary.h>
/*****************************************************************************
* decoder_sys_t : raw video decoder descriptor
=====================================
modules/demux/image.c
=====================================
@@ -34,6 +34,7 @@
#include <vlc_plugin.h>
#include <vlc_demux.h>
#include <vlc_image.h>
+#include <vlc_ancillary.h>
#include "mxpeg_helper.h"
/*****************************************************************************
=====================================
modules/video_output/libplacebo/display.c
=====================================
@@ -28,7 +28,6 @@
#endif
#include <vlc_common.h>
-#include <vlc_ancillary.h>
#include <vlc_plugin.h>
#include <vlc_vout_display.h>
#include <vlc_fs.h>
=====================================
modules/video_output/libplacebo/utils.c
=====================================
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <vlc_common.h>
-#include <vlc_ancillary.h>
#include "utils.h"
static void Log(void *priv, enum pl_log_level level, const char *msg)
=====================================
modules/video_output/libplacebo/utils.h
=====================================
@@ -23,6 +23,7 @@
#include <vlc_common.h>
#include <vlc_picture.h>
+#include <vlc_ancillary.h>
#include <libplacebo/colorspace.h>
#include <libplacebo/shaders/colorspace.h>
=====================================
modules/video_output/win32/window.c
=====================================
@@ -34,12 +34,12 @@
#include <vlc_common.h>
#include <vlc_threads.h>
#include <vlc_charset.h>
-#include <vlc_es.h>
#include <vlc_frame.h>
#include <vlc_plugin.h>
#include <vlc_window.h>
#include <vlc_mouse.h>
#include <vlc_actions.h>
+#include <vlc_ancillary.h>
#include <shellapi.h> /* ExtractIcon */
#include "../wasync_resize_compressor.h"
=====================================
modules/video_output/xcb/window.c
=====================================
@@ -50,7 +50,7 @@ typedef xcb_atom_t Atom;
#include <vlc_plugin.h>
#include <vlc_actions.h>
#include <vlc_window.h>
-#include <vlc_es.h>
+#include <vlc_ancillary.h>
typedef struct
{
=====================================
src/video_output/video_window.c
=====================================
@@ -29,6 +29,7 @@
#include <vlc_window.h>
#include <vlc_vout.h>
#include <vlc_vout_display.h>
+#include <vlc_ancillary.h>
#include "video_window.h"
#include "vout_internal.h"
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c2b716c3148fbd8c8137434289007d6b70f7f2c5...43907dd96ead9e6e1427856e2eeff05897b5b2dd
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/c2b716c3148fbd8c8137434289007d6b70f7f2c5...43907dd96ead9e6e1427856e2eeff05897b5b2dd
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list