vlc | branch: master | Steve Lhomme <[email protected]> | Wed Feb 5 14:48:14 2020 +0100| [4dc4f90edf5ededdfb6c6c4c89c1aa1b29f2fc48] | committer: Steve Lhomme
libvlc: rename libvlc_video_direct3d_hdr10_metadata_t to a more generic name > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4dc4f90edf5ededdfb6c6c4c89c1aa1b29f2fc48 --- include/vlc/libvlc_media_player.h | 4 ++-- modules/video_output/win32/d3d11_swapchain.c | 2 +- modules/video_output/win32/direct3d11.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index 1c83ccc378..1d3870c08e 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -571,10 +571,10 @@ typedef struct unsigned int MinMasteringLuminance; uint16_t MaxContentLightLevel; uint16_t MaxFrameAverageLightLevel; -} libvlc_video_direct3d_hdr10_metadata_t; +} libvlc_video_frame_hdr10_metadata_t; typedef enum libvlc_video_metadata_type_t { - libvlc_video_metadata_frame_hdr10, /**< libvlc_video_direct3d_hdr10_metadata_t */ + libvlc_video_metadata_frame_hdr10, /**< libvlc_video_frame_hdr10_metadata_t */ } libvlc_video_metadata_type_t; /** diff --git a/modules/video_output/win32/d3d11_swapchain.c b/modules/video_output/win32/d3d11_swapchain.c index 4dbbce7a90..ec333c3854 100644 --- a/modules/video_output/win32/d3d11_swapchain.c +++ b/modules/video_output/win32/d3d11_swapchain.c @@ -519,7 +519,7 @@ void LocalSwapchainSetMetadata( void *opaque, libvlc_video_metadata_type_t type, assert(type == libvlc_video_metadata_frame_hdr10); if (type == libvlc_video_metadata_frame_hdr10 && metadata && display->dxgiswapChain4) { - const libvlc_video_direct3d_hdr10_metadata_t *p_hdr10 = metadata; + const libvlc_video_frame_hdr10_metadata_t *p_hdr10 = metadata; DXGI_HDR_METADATA_HDR10 hdr10 = { 0 }; hdr10.GreenPrimary[0] = p_hdr10->GreenPrimary[0]; hdr10.GreenPrimary[1] = p_hdr10->GreenPrimary[1]; diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 3f2d04d662..64adc7d09a 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -694,7 +694,7 @@ static void Prepare(vout_display_t *vd, picture_t *picture, { if ( sys->sendMetadataCb && picture->format.mastering.max_luminance ) { - libvlc_video_direct3d_hdr10_metadata_t hdr10; + libvlc_video_frame_hdr10_metadata_t hdr10; hdr10.GreenPrimary[0] = picture->format.mastering.primaries[0]; hdr10.GreenPrimary[1] = picture->format.mastering.primaries[1]; hdr10.BluePrimary[0] = picture->format.mastering.primaries[2]; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
