Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC
Commits: b7378da2 by Martin Finkel at 2021-05-07T08:21:48+00:00 d3d11_player: field renaming - - - - - 65226020 by Martin Finkel at 2021-05-07T08:21:48+00:00 lib: docs: align group_id variable naming Signed-off-by: Martin Finkel <mar...@videolabs.io> - - - - - b48fd310 by Martin Finkel at 2021-05-07T08:21:48+00:00 lib: docs: indicate programs are also deleted with the list Signed-off-by: Martin Finkel <mar...@videolabs.io> - - - - - 2 changed files: - doc/libvlc/d3d11_player.cpp - include/vlc/libvlc_media_player.h Changes: ===================================== doc/libvlc/d3d11_player.cpp ===================================== @@ -47,7 +47,7 @@ struct render_context struct { ID3D11Texture2D *textureVLC; // shared between VLC and the app ID3D11RenderTargetView *textureRenderTarget; - HANDLE sharedHandled; // handle of the texture used by VLC and the app + HANDLE sharedHandle; // handle of the texture used by VLC and the app /* texture VLC renders into */ ID3D11Texture2D *texture; @@ -280,10 +280,10 @@ static void init_direct3d(struct render_context *ctx) static void release_textures(struct render_context *ctx) { ULONG ref; - if (ctx->resized.sharedHandled) + if (ctx->resized.sharedHandle) { - CloseHandle(ctx->resized.sharedHandled); - ctx->resized.sharedHandled = NULL; + CloseHandle(ctx->resized.sharedHandle); + ctx->resized.sharedHandle = NULL; } if (ctx->resized.textureVLC) { @@ -382,7 +382,6 @@ static bool UpdateOutput_cb( void *opaque, const libvlc_video_render_cfg_t *cfg, D3D11_TEXTURE2D_DESC texDesc = { }; texDesc.MipLevels = 1; texDesc.SampleDesc.Count = 1; - texDesc.MiscFlags = 0; texDesc.BindFlags = D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE; texDesc.Usage = D3D11_USAGE_DEFAULT; texDesc.CPUAccessFlags = 0; @@ -397,12 +396,12 @@ static bool UpdateOutput_cb( void *opaque, const libvlc_video_render_cfg_t *cfg, IDXGIResource1* sharedResource = NULL; ctx->resized.texture->QueryInterface(__uuidof(IDXGIResource1), (LPVOID*) &sharedResource); - hr = sharedResource->CreateSharedHandle(NULL, DXGI_SHARED_RESOURCE_READ|DXGI_SHARED_RESOURCE_WRITE, NULL, &ctx->resized.sharedHandled); + hr = sharedResource->CreateSharedHandle(NULL, DXGI_SHARED_RESOURCE_READ|DXGI_SHARED_RESOURCE_WRITE, NULL, &ctx->resized.sharedHandle); sharedResource->Release(); ID3D11Device1* d3d11VLC1; ctx->d3deviceVLC->QueryInterface(__uuidof(ID3D11Device1), (LPVOID*) &d3d11VLC1); - hr = d3d11VLC1->OpenSharedResource1(ctx->resized.sharedHandled, __uuidof(ID3D11Texture2D), (void**)&ctx->resized.textureVLC); + hr = d3d11VLC1->OpenSharedResource1(ctx->resized.sharedHandle, __uuidof(ID3D11Texture2D), (void**)&ctx->resized.textureVLC); d3d11VLC1->Release(); D3D11_SHADER_RESOURCE_VIEW_DESC resviewDesc; ===================================== include/vlc/libvlc_media_player.h ===================================== @@ -1533,9 +1533,10 @@ libvlc_player_programlist_at( libvlc_player_programlist_t *list, size_t index ); /** * Release a programlist * + * \note program structs from the list are also deleted. + * * \version LibVLC 4.0.0 and later. * - * \see libvlc_media_get_programlist * \see libvlc_media_player_get_programlist * * \param list valid programlist @@ -1552,9 +1553,9 @@ libvlc_player_programlist_delete( libvlc_player_programlist_t *list ); * \version LibVLC 4.0.0 or later * * \param p_mi opaque media player handle - * \param program_id + * \param i_group_id program id */ -LIBVLC_API void libvlc_media_player_select_program_id( libvlc_media_player_t *p_mi, int program_id); +LIBVLC_API void libvlc_media_player_select_program_id( libvlc_media_player_t *p_mi, int i_group_id); /** * Get the selected program @@ -1577,7 +1578,7 @@ libvlc_media_player_get_selected_program( libvlc_media_player_t *p_mi); * \param p_mi opaque media player handle * \param i_group_id program id * - * \return a valid program struct or NULL if the group_id is not found. The + * \return a valid program struct or NULL if the i_group_id is not found. The * program need to be freed with libvlc_player_program_delete(). */ LIBVLC_API libvlc_player_program_t * View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1d02d748ee36202a805063b1e6a919042a9d60d7...b48fd310931f8c84e6b976ee2b0feef700aa8c09 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/1d02d748ee36202a805063b1e6a919042a9d60d7...b48fd310931f8c84e6b976ee2b0feef700aa8c09 You're receiving this email because of your account on code.videolan.org.
_______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits