DeprecatedForks/crossxtex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SaveToWIC* functions updated with optional setCustomProps parameter for setting custom encoding options

Browse Source
This commit is contained in:
walbourn_cp 2013-06-27 11:05:15 -07:00
parent bb622bf4ec
commit 61a0a1a19c
4 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
DirectXTex/DirectXTex.h
View File

@ -23,10 +23,13 @@
#pragma warning(pop) #pragma warning(pop)
#include <algorithm> #include <algorithm>
#include <functional>
#include <dxgiformat.h> #include <dxgiformat.h>
#include <d3d11.h> #include <d3d11.h>
#include <ocidl.h>
#define DIRECTX_TEX_VERSION 110 #define DIRECTX_TEX_VERSION 110
#if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_) #if defined(_MSC_VER) && (_MSC_VER<1610) && !defined(_In_reads_)
@ -330,14 +333,14 @@ namespace DirectX
_Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image ); _Out_opt_ TexMetadata* metadata, _Out_ ScratchImage& image );
HRESULT SaveToWICMemory( _In_ const Image& image, _In_ DWORD flags, _In_ REFGUID guidContainerFormat, HRESULT SaveToWICMemory( _In_ const Image& image, _In_ DWORD flags, _In_ REFGUID guidContainerFormat,
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr ); _Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
HRESULT SaveToWICMemory( _In_count_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags, _In_ REFGUID guidContainerFormat, HRESULT SaveToWICMemory( _In_count_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags, _In_ REFGUID guidContainerFormat,
_Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr ); _Out_ Blob& blob, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
HRESULT SaveToWICFile( _In_ const Image& image, _In_ DWORD flags, _In_ REFGUID guidContainerFormat, HRESULT SaveToWICFile( _In_ const Image& image, _In_ DWORD flags, _In_ REFGUID guidContainerFormat,
_In_z_ LPCWSTR szFile, _In_opt_ const GUID* targetFormat = nullptr ); _In_z_ LPCWSTR szFile, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
HRESULT SaveToWICFile( _In_count_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags, _In_ REFGUID guidContainerFormat, HRESULT SaveToWICFile( _In_count_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags, _In_ REFGUID guidContainerFormat,
_In_z_ LPCWSTR szFile, _In_opt_ const GUID* targetFormat = nullptr ); _In_z_ LPCWSTR szFile, _In_opt_ const GUID* targetFormat = nullptr, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
enum WICCodecs enum WICCodecs
{ {

54
DirectXTex/DirectXTexWIC.cpp
View File

@ -573,7 +573,8 @@ static HRESULT _EncodeImage( _In_ const Image& image, _In_ DWORD flags, _In_ REF
} }
static HRESULT _EncodeSingleFrame( _In_ const Image& image, _In_ DWORD flags, static HRESULT _EncodeSingleFrame( _In_ const Image& image, _In_ DWORD flags,
_In_ REFGUID containerFormat, _Inout_ IStream* stream, _In_opt_ const GUID* targetFormat ) _In_ REFGUID containerFormat, _Inout_ IStream* stream,
_In_opt_ const GUID* targetFormat, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !stream ) if ( !stream )
return E_INVALIDARG; return E_INVALIDARG;
@ -598,21 +599,21 @@ static HRESULT _EncodeSingleFrame( _In_ const Image& image, _In_ DWORD flags,
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
if ( memcmp( &containerFormat, &GUID_ContainerFormatBmp, sizeof(WICPixelFormatGUID) ) == 0 ) if ( memcmp( &containerFormat, &GUID_ContainerFormatBmp, sizeof(WICPixelFormatGUID) ) == 0 && _IsWIC2() )
{ {
// Opt-in to the Windows 8 support for writing 32-bit Windows BMP files with an alpha channel if supported // Opt-in to the WIC2 support for writing 32-bit Windows BMP files with an alpha channel
PROPBAG2 option = { 0 }; PROPBAG2 option = { 0 };
option.pstrName = L"EnableV5Header32bppBGRA"; option.pstrName = L"EnableV5Header32bppBGRA";
VARIANT varValue; VARIANT varValue;
varValue.vt = VT_BOOL; varValue.vt = VT_BOOL;
varValue.boolVal = VARIANT_TRUE; varValue.boolVal = VARIANT_TRUE;
hr = props->Write( 1, &option, &varValue ); (void)props->Write( 1, &option, &varValue );
if ( FAILED(hr) )
{
// Fails on older versions of WIC, so we default to the null property bag
props.Reset();
} }
if ( setCustomProps )
{
setCustomProps( props.Get() );
} }
hr = _EncodeImage( image, flags, containerFormat, frame.Get(), props.Get(), targetFormat ); hr = _EncodeImage( image, flags, containerFormat, frame.Get(), props.Get(), targetFormat );
@ -631,7 +632,8 @@ static HRESULT _EncodeSingleFrame( _In_ const Image& image, _In_ DWORD flags,
// Encodes an image array // Encodes an image array
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
static HRESULT _EncodeMultiframe( _In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags, static HRESULT _EncodeMultiframe( _In_reads_(nimages) const Image* images, _In_ size_t nimages, _In_ DWORD flags,
_In_ REFGUID containerFormat, _Inout_ IStream* stream, _In_opt_ const GUID* targetFormat ) _In_ REFGUID containerFormat, _Inout_ IStream* stream,
_In_opt_ const GUID* targetFormat, _In_opt_ std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !stream || nimages < 2 ) if ( !stream || nimages < 2 )
return E_INVALIDARG; return E_INVALIDARG;
@ -669,11 +671,17 @@ static HRESULT _EncodeMultiframe( _In_reads_(nimages) const Image* images, _In_
for( size_t index=0; index < nimages; ++index ) for( size_t index=0; index < nimages; ++index )
{ {
ScopedObject<IWICBitmapFrameEncode> frame; ScopedObject<IWICBitmapFrameEncode> frame;
hr = encoder->CreateNewFrame( &frame, nullptr ); ScopedObject<IPropertyBag2> props;
hr = encoder->CreateNewFrame( &frame, &props );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
hr = _EncodeImage( images[index], flags, containerFormat, frame.Get(), nullptr, targetFormat ); if ( setCustomProps )
{
setCustomProps( props.Get() );
}
hr = _EncodeImage( images[index], flags, containerFormat, frame.Get(), props.Get(), targetFormat );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
} }
@ -901,7 +909,8 @@ HRESULT LoadFromWICFile( LPCWSTR szFile, DWORD flags, TexMetadata* metadata, Scr
// Save a WIC-supported file to memory // Save a WIC-supported file to memory
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
_Use_decl_annotations_ _Use_decl_annotations_
HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerFormat, Blob& blob, const GUID* targetFormat ) HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerFormat, Blob& blob,
const GUID* targetFormat, std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !image.pixels ) if ( !image.pixels )
return E_POINTER; return E_POINTER;
@ -913,7 +922,7 @@ HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerForma
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
hr = _EncodeSingleFrame( image, flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeSingleFrame( image, flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
@ -947,7 +956,8 @@ HRESULT SaveToWICMemory( const Image& image, DWORD flags, REFGUID containerForma
} }
_Use_decl_annotations_ _Use_decl_annotations_
HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGUID containerFormat, Blob& blob, const GUID* targetFormat ) HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGUID containerFormat, Blob& blob,
const GUID* targetFormat, std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !images || nimages == 0 ) if ( !images || nimages == 0 )
return E_INVALIDARG; return E_INVALIDARG;
@ -960,9 +970,9 @@ HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGU
return hr; return hr;
if ( nimages > 1 ) if ( nimages > 1 )
hr = _EncodeMultiframe( images, nimages, flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeMultiframe( images, nimages, flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
else else
hr = _EncodeSingleFrame( images[0], flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeSingleFrame( images[0], flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
@ -1001,7 +1011,8 @@ HRESULT SaveToWICMemory( const Image* images, size_t nimages, DWORD flags, REFGU
// Save a WIC-supported file to disk // Save a WIC-supported file to disk
//------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------
_Use_decl_annotations_ _Use_decl_annotations_
HRESULT SaveToWICFile( const Image& image, DWORD flags, REFGUID containerFormat, LPCWSTR szFile, const GUID* targetFormat ) HRESULT SaveToWICFile( const Image& image, DWORD flags, REFGUID containerFormat, LPCWSTR szFile,
const GUID* targetFormat, std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !szFile ) if ( !szFile )
return E_INVALIDARG; return E_INVALIDARG;
@ -1022,7 +1033,7 @@ HRESULT SaveToWICFile( const Image& image, DWORD flags, REFGUID containerFormat,
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
hr = _EncodeSingleFrame( image, flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeSingleFrame( image, flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
@ -1030,7 +1041,8 @@ HRESULT SaveToWICFile( const Image& image, DWORD flags, REFGUID containerFormat,
} }
_Use_decl_annotations_ _Use_decl_annotations_
HRESULT SaveToWICFile( const Image* images, size_t nimages, DWORD flags, REFGUID containerFormat, LPCWSTR szFile, const GUID* targetFormat ) HRESULT SaveToWICFile( const Image* images, size_t nimages, DWORD flags, REFGUID containerFormat, LPCWSTR szFile, const GUID* targetFormat,
std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !szFile || !images || nimages == 0 ) if ( !szFile || !images || nimages == 0 )
return E_INVALIDARG; return E_INVALIDARG;
@ -1049,9 +1061,9 @@ HRESULT SaveToWICFile( const Image* images, size_t nimages, DWORD flags, REFGUID
return hr; return hr;
if ( nimages > 1 ) if ( nimages > 1 )
hr = _EncodeMultiframe( images, nimages, flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeMultiframe( images, nimages, flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
else else
hr = _EncodeSingleFrame( images[0], flags, containerFormat, stream.Get(), targetFormat ); hr = _EncodeSingleFrame( images[0], flags, containerFormat, stream.Get(), targetFormat, setCustomProps );
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;

17
ScreenGrab/ScreenGrab.cpp
View File

@ -839,7 +839,8 @@ HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
_In_ ID3D11Resource* pSource, _In_ ID3D11Resource* pSource,
_In_ REFGUID guidContainerFormat, _In_ REFGUID guidContainerFormat,
_In_z_ LPCWSTR fileName, _In_z_ LPCWSTR fileName,
_In_opt_ const GUID* targetFormat ) _In_opt_ const GUID* targetFormat,
_In_opt_ std::function<void(IPropertyBag2*)> setCustomProps )
{ {
if ( !fileName ) if ( !fileName )
return E_INVALIDARG; return E_INVALIDARG;
@ -927,21 +928,21 @@ HRESULT DirectX::SaveWICTextureToFile( _In_ ID3D11DeviceContext* pContext,
if ( FAILED(hr) ) if ( FAILED(hr) )
return hr; return hr;
if ( targetFormat && memcmp( &guidContainerFormat, &GUID_ContainerFormatBmp, sizeof(WICPixelFormatGUID) ) == 0 ) if ( targetFormat && memcmp( &guidContainerFormat, &GUID_ContainerFormatBmp, sizeof(WICPixelFormatGUID) ) == 0 && g_WIC2 )
{ {
// Opt-in to the Windows 8 support for writing 32-bit Windows BMP files with an alpha channel if supported // Opt-in to the WIC2 support for writing 32-bit Windows BMP files with an alpha channel
PROPBAG2 option = { 0 }; PROPBAG2 option = { 0 };
option.pstrName = L"EnableV5Header32bppBGRA"; option.pstrName = L"EnableV5Header32bppBGRA";
VARIANT varValue; VARIANT varValue;
varValue.vt = VT_BOOL; varValue.vt = VT_BOOL;
varValue.boolVal = VARIANT_TRUE; varValue.boolVal = VARIANT_TRUE;
hr = props->Write( 1, &option, &varValue ); (void)props->Write( 1, &option, &varValue );
if ( FAILED(hr) )
{
// Fails on older versions of WIC, so we default to the null property bag
props.Reset();
} }
if ( setCustomProps )
{
setCustomProps( props.Get() );
} }
hr = frame->Initialize( props.Get() ); hr = frame->Initialize( props.Get() );

7
ScreenGrab/ScreenGrab.h
View File

@ -25,11 +25,15 @@
#include <d3d11.h> #include <d3d11.h>
#include <ocidl.h>
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4005) #pragma warning(disable : 4005)
#include <stdint.h> #include <stdint.h>
#pragma warning(pop) #pragma warning(pop)
#include <functional>
namespace DirectX namespace DirectX
{ {
HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext, HRESULT SaveDDSTextureToFile( _In_ ID3D11DeviceContext* pContext,
@ -42,7 +46,8 @@ namespace DirectX
_In_ ID3D11Resource* pSource, _In_ ID3D11Resource* pSource,
_In_ REFGUID guidContainerFormat, _In_ REFGUID guidContainerFormat,
_In_z_ LPCWSTR fileName, _In_z_ LPCWSTR fileName,
_In_opt_ const GUID* targetFormat = nullptr ); _In_opt_ const GUID* targetFormat = nullptr,
_In_opt_ std::function<void(IPropertyBag2*)> setCustomProps = nullptr );
#endif #endif
} }