[vlc-devel] [PATCH 5/6] direct3d11: add an adjust filter for d3d11 opaque formats
Steve Lhomme
robux4 at videolabs.io
Sat Jul 1 18:03:37 CEST 2017
it's missing the gamma handling
---
configure.ac | 2 +-
modules/video_output/Makefile.am | 7 +-
modules/video_output/win32/d3d11_adjust.c | 612 ++++++++++++++++++++++++++++++
3 files changed, 618 insertions(+), 3 deletions(-)
create mode 100644 modules/video_output/win32/d3d11_adjust.c
diff --git a/configure.ac b/configure.ac
index ceefa3a915..e8dc6867d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3285,7 +3285,7 @@ AS_IF([test "${enable_directx}" != "no"], [
dnl Direct3D11
AC_CHECK_HEADERS(d3d11.h, [
- VLC_ADD_PLUGIN([direct3d11 direct3d11_deinterlace])
+ VLC_ADD_PLUGIN([direct3d11 direct3d11_deinterlace direct3d11_adjust])
])
dnl Direct3D9
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index fc066606c4..e082b263b6 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -268,8 +268,11 @@ EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
libdirect3d11_deinterlace_plugin_la_SOURCES = video_output/win32/d3d11_deinterlace.c \
video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
libdirect3d11_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace)
-EXTRA_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la
+libdirect3d11_adjust_plugin_la_SOURCES = video_output/win32/d3d11_adjust.c \
+ video_chroma/dxgi_fmt.c video_chroma/dxgi_fmt.h
+libdirect3d11_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+video_filter_LTLIBRARIES += $(LTLIBdirect3d11_deinterlace) $(LTLIBdirect3d11_adjust)
+EXTRA_LTLIBRARIES += libdirect3d11_deinterlace_plugin.la libdirect3d11_adjust_plugin.la
libdirectdraw_plugin_la_SOURCES = video_output/win32/directdraw.c \
video_output/win32/common.c video_output/win32/common.h \
diff --git a/modules/video_output/win32/d3d11_adjust.c b/modules/video_output/win32/d3d11_adjust.c
new file mode 100644
index 0000000000..1371b52895
--- /dev/null
+++ b/modules/video_output/win32/d3d11_adjust.c
@@ -0,0 +1,612 @@
+/*****************************************************************************
+ * d3d11_adjust.c: D3D11 adjust filter (no gamma)
+ *****************************************************************************
+ * Copyright (C) 2017 Videolabs SAS
+ *
+ * Authors: Steve Lhomme <robux4 at gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_configuration.h>
+#include <vlc_plugin.h>
+#include <vlc_filter.h>
+#include <vlc_picture.h>
+#include <vlc_atomic.h>
+
+#define COBJMACROS
+#include <initguid.h>
+#include <d3d11.h>
+
+#include "../../video_chroma/d3d11_fmt.h"
+
+#ifdef __MINGW32__
+#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS 0x1
+#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST 0x2
+#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE 0x4
+#define D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION 0x8
+#endif
+
+#define PROCESSOR_SLICES 2
+
+struct filter_level
+{
+ atomic_int level;
+ float default_val;
+ float min;
+ float max;
+ D3D11_VIDEO_PROCESSOR_FILTER_RANGE Range;
+};
+
+struct filter_sys_t
+{
+ float f_gamma;
+ bool b_brightness_threshold;
+
+ struct filter_level Brightness;
+ struct filter_level Contrast;
+ struct filter_level Hue;
+ struct filter_level Saturation;
+
+ ID3D11VideoDevice *d3dviddev;
+ ID3D11VideoContext *d3dvidctx;
+ ID3D11VideoProcessor *videoProcessor;
+ ID3D11VideoProcessorEnumerator *procEnumerator;
+
+ HANDLE context_mutex;
+ union {
+ ID3D11Texture2D *outTexture;
+ ID3D11Resource *outResource;
+ };
+ ID3D11VideoProcessorInputView *procInput[PROCESSOR_SLICES];
+ ID3D11VideoProcessorOutputView *procOutput[PROCESSOR_SLICES];
+};
+
+#define THRES_TEXT N_("Brightness threshold")
+#define THRES_LONGTEXT N_("When this mode is enabled, pixels will be " \
+ "shown as black or white. The threshold value will be the brightness " \
+ "defined below." )
+#define CONT_TEXT N_("Image contrast (0-2)")
+#define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1.")
+#define HUE_TEXT N_("Image hue (0-360)")
+#define HUE_LONGTEXT N_("Set the image hue, between 0 and 360. Defaults to 0.")
+#define SAT_TEXT N_("Image saturation (0-3)")
+#define SAT_LONGTEXT N_("Set the image saturation, between 0 and 3. Defaults to 1.")
+#define LUM_TEXT N_("Image brightness (0-2)")
+#define LUM_LONGTEXT N_("Set the image brightness, between 0 and 2. Defaults to 1.")
+#define GAMMA_TEXT N_("Image gamma (0-10)")
+#define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.")
+
+static const char *const ppsz_filter_options[] = {
+ "contrast", "brightness", "hue", "saturation", "gamma",
+ "brightness-threshold", NULL
+};
+
+static int assert_ProcessorInput(filter_t *p_filter, picture_sys_t *p_sys_src)
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+ if (!p_sys_src->processorInput)
+ {
+ D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC inDesc = {
+ .FourCC = 0,
+ .ViewDimension = D3D11_VPIV_DIMENSION_TEXTURE2D,
+ .Texture2D.MipSlice = 0,
+ .Texture2D.ArraySlice = p_sys_src->slice_index,
+ };
+ HRESULT hr;
+
+ hr = ID3D11VideoDevice_CreateVideoProcessorInputView(p_sys->d3dviddev,
+ p_sys_src->resource[KNOWN_DXGI_INDEX],
+ p_sys->procEnumerator,
+ &inDesc,
+ &p_sys_src->processorInput);
+ if (FAILED(hr))
+ {
+#ifndef NDEBUG
+ msg_Dbg(p_filter,"Failed to create processor input for slice %d. (hr=0x%lX)", p_sys_src->slice_index, hr);
+#endif
+ return VLC_EGENERIC;
+ }
+ }
+ return VLC_SUCCESS;
+}
+
+static bool ApplyFilter( filter_sys_t *p_sys,
+ D3D11_VIDEO_PROCESSOR_FILTER filter,
+ const struct filter_level *p_level,
+ ID3D11VideoProcessorInputView *input,
+ ID3D11VideoProcessorOutputView *output )
+{
+ HRESULT hr;
+
+ int level = atomic_load(&p_level->level);
+ if (level == p_level->Range.Default)
+ return false;
+
+ ID3D11VideoContext_VideoProcessorSetStreamFilter(p_sys->d3dvidctx,
+ p_sys->videoProcessor,
+ 0,
+ filter,
+ TRUE,
+ level);
+
+ D3D11_VIDEO_PROCESSOR_STREAM stream = {0};
+ stream.Enable = TRUE;
+ stream.pInputSurface = input;
+
+ hr = ID3D11VideoContext_VideoProcessorBlt(p_sys->d3dvidctx,
+ p_sys->videoProcessor,
+ output,
+ 0, 1, &stream);
+ return SUCCEEDED(hr);
+}
+
+static void SetLevel(struct filter_level *range, float val)
+{
+ int level;
+ if (val > range->default_val)
+ level = (range->Range.Maximum - range->Range.Default) * (val - range->default_val) /
+ (range->max - range->default_val);
+ else if (val < range->default_val)
+ level = (range->Range.Minimum - range->Range.Default) * (val - range->default_val) /
+ (range->min - range->default_val);
+ else
+ level = 0;
+
+ atomic_store( &range->level, range->Range.Default + level );
+}
+
+static void InitLevel(filter_t *filter, struct filter_level *range, const char *p_name, float def)
+{
+ int level;
+
+ module_config_t *cfg = config_FindConfig( VLC_OBJECT(filter), p_name);
+ range->min = cfg->min.f;
+ range->max = cfg->max.f;
+ range->default_val = def;
+
+ float val = var_CreateGetFloatCommand( filter, p_name );
+
+ if (val > range->default_val)
+ level = (range->Range.Maximum - range->Range.Default) * (val - range->default_val) /
+ (range->max - range->default_val);
+ else if (val < range->default_val)
+ level = (range->Range.Minimum - range->Range.Default) * (val - range->default_val) /
+ (range->min - range->default_val);
+ else
+ level = 0;
+
+ atomic_init( &range->level, range->Range.Default + level );
+}
+
+static picture_t *Filter(filter_t *p_filter, picture_t *p_pic)
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ picture_sys_t *p_src_sys = ActivePictureSys(p_pic);
+ if ( assert_ProcessorInput(p_filter, ActivePictureSys(p_pic) ) )
+ {
+ picture_Release( p_pic );
+ return NULL;
+ }
+
+ picture_t *p_outpic = filter_NewPicture( p_filter );
+ if( !p_outpic )
+ {
+ picture_Release( p_pic );
+ return NULL;
+ }
+
+ picture_CopyProperties( p_outpic, p_pic );
+
+ if( p_sys->context_mutex != INVALID_HANDLE_VALUE )
+ WaitForSingleObjectEx( p_sys->context_mutex, INFINITE, FALSE );
+
+ ID3D11VideoProcessorInputView *inputs[4] = {
+ p_src_sys->processorInput,
+ p_sys->procInput[0],
+ p_sys->procInput[1],
+ p_sys->procInput[0]
+ };
+
+ ID3D11VideoProcessorOutputView *outputs[4] = {
+ p_sys->procOutput[0],
+ p_sys->procOutput[1],
+ p_sys->procOutput[0],
+ p_sys->procOutput[1]
+ };
+
+ size_t idx = 0;
+ /* contrast */
+ if ( ApplyFilter( p_sys,
+ D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST, &p_sys->Contrast,
+ inputs[idx], outputs[idx] ) )
+ idx++;
+ /* brightness */
+ if ( ApplyFilter( p_sys,
+ D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS, &p_sys->Brightness,
+ inputs[idx], outputs[idx] ) )
+ idx++;
+ /* hue */
+ if ( ApplyFilter( p_sys,
+ D3D11_VIDEO_PROCESSOR_FILTER_HUE, &p_sys->Hue,
+ inputs[idx], outputs[idx] ) )
+ idx++;
+ /* saturation */
+ if ( ApplyFilter( p_sys,
+ D3D11_VIDEO_PROCESSOR_FILTER_SATURATION, &p_sys->Saturation,
+ inputs[idx], outputs[idx] ) )
+ idx++;
+
+ ID3D11DeviceContext_CopySubresourceRegion(p_outpic->p_sys->context,
+ p_outpic->p_sys->resource[KNOWN_DXGI_INDEX],
+ p_outpic->p_sys->slice_index,
+ 0, 0, 0,
+ p_sys->outResource,
+ outputs[idx] == p_sys->procOutput[0] ? 1 : 0,
+ NULL);
+
+ if( p_sys->context_mutex != INVALID_HANDLE_VALUE )
+ ReleaseMutex( p_sys->context_mutex );
+
+ picture_Release( p_pic );
+ return p_outpic;
+}
+
+static int AdjustCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+
+ if( !strcmp( psz_var, "contrast" ) )
+ SetLevel( &p_sys->Contrast, newval.f_float );
+ else if( !strcmp( psz_var, "brightness" ) )
+ SetLevel( &p_sys->Brightness, newval.f_float );
+ else if( !strcmp( psz_var, "hue" ) )
+ SetLevel( &p_sys->Hue, newval.f_float );
+ else if( !strcmp( psz_var, "saturation" ) )
+ SetLevel( &p_sys->Saturation, newval.f_float );
+
+ return VLC_SUCCESS;
+}
+
+static int Open(vlc_object_t *obj)
+{
+ filter_t *filter = (filter_t *)obj;
+ HRESULT hr;
+ ID3D11Device *d3ddevice = NULL;
+ ID3D11VideoProcessorEnumerator *processorEnumerator = NULL;
+
+ if (filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE
+ && filter->fmt_in.video.i_chroma != VLC_CODEC_D3D11_OPAQUE_10B)
+ return VLC_EGENERIC;
+ if (!video_format_IsSimilar(&filter->fmt_in.video, &filter->fmt_out.video))
+ return VLC_EGENERIC;
+
+ picture_t *dst = filter_NewPicture(filter);
+ if (dst == NULL)
+ return VLC_EGENERIC;
+ if (!dst->p_sys)
+ {
+ msg_Dbg(filter, "D3D11 opaque without a texture");
+ return VLC_EGENERIC;
+ }
+
+ D3D11_TEXTURE2D_DESC dstDesc;
+ ID3D11Texture2D_GetDesc(dst->p_sys->texture[KNOWN_DXGI_INDEX], &dstDesc);
+
+ filter_sys_t *sys = malloc(sizeof (*sys));
+ if (unlikely(sys == NULL))
+ goto error;
+ memset(sys, 0, sizeof (*sys));
+
+ ID3D11DeviceContext_GetDevice(dst->p_sys->context, &d3ddevice);
+
+ hr = ID3D11Device_QueryInterface(d3ddevice, &IID_ID3D11VideoDevice, (void **)&sys->d3dviddev);
+ if (FAILED(hr)) {
+ msg_Err(filter, "Could not Query ID3D11VideoDevice Interface. (hr=0x%lX)", hr);
+ goto error;
+ }
+
+ hr = ID3D11DeviceContext_QueryInterface(dst->p_sys->context, &IID_ID3D11VideoContext, (void **)&sys->d3dvidctx);
+ if (FAILED(hr)) {
+ msg_Err(filter, "Could not Query ID3D11VideoContext Interface from the picture. (hr=0x%lX)", hr);
+ goto error;
+ }
+
+ HANDLE context_lock = INVALID_HANDLE_VALUE;
+ UINT dataSize = sizeof(context_lock);
+ hr = ID3D11Device_GetPrivateData(d3ddevice, &GUID_CONTEXT_MUTEX, &dataSize, &context_lock);
+ if (FAILED(hr))
+ msg_Warn(filter, "No mutex found to lock the decoder");
+ sys->context_mutex = context_lock;
+
+ const video_format_t *fmt = &dst->format;
+
+ D3D11_VIDEO_PROCESSOR_CONTENT_DESC processorDesc = {
+ .InputFrameFormat = D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE,
+ .InputFrameRate = {
+ .Numerator = fmt->i_frame_rate,
+ .Denominator = fmt->i_frame_rate_base,
+ },
+ .InputWidth = fmt->i_width,
+ .InputHeight = fmt->i_height,
+ .OutputWidth = dst->format.i_width,
+ .OutputHeight = dst->format.i_height,
+ .OutputFrameRate = {
+ .Numerator = dst->format.i_frame_rate,
+ .Denominator = dst->format.i_frame_rate_base,
+ },
+ .Usage = D3D11_VIDEO_USAGE_PLAYBACK_NORMAL,
+ };
+ hr = ID3D11VideoDevice_CreateVideoProcessorEnumerator(sys->d3dviddev, &processorDesc, &processorEnumerator);
+ if ( processorEnumerator == NULL )
+ {
+ msg_Dbg(filter, "Can't get a video processor for the video.");
+ goto error;
+ }
+
+ UINT flags;
+#ifndef NDEBUG
+ for (int format = 0; format < 188; format++) {
+ hr = ID3D11VideoProcessorEnumerator_CheckVideoProcessorFormat(processorEnumerator, format, &flags);
+ if (SUCCEEDED(hr) && (flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT))
+ msg_Dbg(filter, "processor format %s (%d) is supported for input", DxgiFormatToStr(format),format);
+ if (SUCCEEDED(hr) && (flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT))
+ msg_Dbg(filter, "processor format %s (%d) is supported for output", DxgiFormatToStr(format),format);
+ }
+#endif
+ hr = ID3D11VideoProcessorEnumerator_CheckVideoProcessorFormat(processorEnumerator, dst->p_sys->formatTexture, &flags);
+ if (!SUCCEEDED(hr))
+ {
+ msg_Dbg(filter, "can't read processor support for %s", DxgiFormatToStr(dst->p_sys->formatTexture));
+ goto error;
+ }
+ if ( !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_INPUT) ||
+ !(flags & D3D11_VIDEO_PROCESSOR_FORMAT_SUPPORT_OUTPUT) )
+ {
+ msg_Dbg(filter, "input/output %s is not supported", DxgiFormatToStr(dst->p_sys->formatTexture));
+ goto error;
+ }
+
+ D3D11_VIDEO_PROCESSOR_CAPS processorCaps;
+ hr = ID3D11VideoProcessorEnumerator_GetVideoProcessorCaps(processorEnumerator, &processorCaps);
+ if (FAILED(hr))
+ goto error;
+
+ const UINT neededCaps = D3D11_VIDEO_PROCESSOR_FILTER_CAPS_BRIGHTNESS |
+ D3D11_VIDEO_PROCESSOR_FILTER_CAPS_CONTRAST |
+ D3D11_VIDEO_PROCESSOR_FILTER_CAPS_HUE |
+ D3D11_VIDEO_PROCESSOR_FILTER_CAPS_SATURATION;
+ if ((processorCaps.FilterCaps & neededCaps) != neededCaps)
+ {
+ msg_Dbg(filter, "missing capabilities 0x%x", neededCaps - (processorCaps.FilterCaps & neededCaps));
+ goto error;
+ }
+
+ hr = ID3D11VideoProcessorEnumerator_GetVideoProcessorFilterRange(processorEnumerator,
+ D3D11_VIDEO_PROCESSOR_FILTER_BRIGHTNESS,
+ &sys->Brightness.Range);
+ if (FAILED(hr))
+ goto error;
+
+ hr = ID3D11VideoProcessorEnumerator_GetVideoProcessorFilterRange(processorEnumerator,
+ D3D11_VIDEO_PROCESSOR_FILTER_CONTRAST,
+ &sys->Contrast.Range);
+ if (FAILED(hr))
+ goto error;
+
+ hr = ID3D11VideoProcessorEnumerator_GetVideoProcessorFilterRange(processorEnumerator,
+ D3D11_VIDEO_PROCESSOR_FILTER_HUE,
+ &sys->Hue.Range);
+ if (FAILED(hr))
+ goto error;
+
+ hr = ID3D11VideoProcessorEnumerator_GetVideoProcessorFilterRange(processorEnumerator,
+ D3D11_VIDEO_PROCESSOR_FILTER_SATURATION,
+ &sys->Saturation.Range);
+ if (FAILED(hr))
+ goto error;
+
+ /* needed to get options passed in transcode using the
+ * adjust{name=value} syntax */
+ config_ChainParse( filter, "", ppsz_filter_options, filter->p_cfg );
+
+ InitLevel(filter, &sys->Contrast, "contrast", 1.0 );
+ InitLevel(filter, &sys->Brightness, "brightness", 1.0 );
+ InitLevel(filter, &sys->Hue, "hue", 0.0 );
+ InitLevel(filter, &sys->Saturation, "saturation", 1.0 );
+ sys->f_gamma = var_CreateGetFloatCommand( filter, "gamma" );
+ sys->b_brightness_threshold =
+ var_CreateGetBoolCommand( filter, "brightness-threshold" );
+
+ var_AddCallback( filter, "contrast", AdjustCallback, sys );
+ var_AddCallback( filter, "brightness", AdjustCallback, sys );
+ var_AddCallback( filter, "hue", AdjustCallback, sys );
+ var_AddCallback( filter, "saturation", AdjustCallback, sys );
+ var_AddCallback( filter, "gamma", AdjustCallback, sys );
+ var_AddCallback( filter, "brightness-threshold",
+ AdjustCallback, sys );
+
+ hr = ID3D11VideoDevice_CreateVideoProcessor(sys->d3dviddev,
+ processorEnumerator, 0,
+ &sys->videoProcessor);
+ if (FAILED(hr) || sys->videoProcessor == NULL)
+ {
+ msg_Dbg(filter, "failed to create the processor");
+ goto error;
+ }
+
+ D3D11_TEXTURE2D_DESC texDesc;
+ ZeroMemory(&texDesc, sizeof(texDesc));
+ texDesc.MipLevels = 1;
+ texDesc.SampleDesc.Count = 1;
+ texDesc.MiscFlags = 0; //D3D11_RESOURCE_MISC_SHARED;
+ texDesc.Usage = D3D11_USAGE_DEFAULT;
+ texDesc.CPUAccessFlags = 0;
+ texDesc.Format = dstDesc.Format;
+ texDesc.BindFlags = D3D11_BIND_RENDER_TARGET;
+ texDesc.Usage = D3D11_USAGE_DEFAULT;
+ texDesc.CPUAccessFlags = 0;
+ texDesc.ArraySize = PROCESSOR_SLICES;
+ texDesc.Height = dstDesc.Height;
+ texDesc.Width = dstDesc.Width;
+
+ hr = ID3D11Device_CreateTexture2D( d3ddevice, &texDesc, NULL, &sys->outTexture );
+ if (FAILED(hr)) {
+ msg_Err(filter, "CreateTexture2D failed. (hr=0x%0lx)", hr);
+ goto error;
+ }
+
+ D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC outDesc = {
+ .ViewDimension = D3D11_VPOV_DIMENSION_TEXTURE2DARRAY,
+ .Texture2DArray.MipSlice = 0,
+ .Texture2DArray.ArraySize = 1,
+ };
+
+ D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC inDesc = {
+ .FourCC = 0,
+ .ViewDimension = D3D11_VPIV_DIMENSION_TEXTURE2D,
+ .Texture2D.MipSlice = 0,
+ };
+
+ for (int i=0; i<PROCESSOR_SLICES; i++)
+ {
+ outDesc.Texture2DArray.FirstArraySlice = i;
+ hr = ID3D11VideoDevice_CreateVideoProcessorOutputView(sys->d3dviddev,
+ sys->outResource,
+ processorEnumerator,
+ &outDesc,
+ &sys->procOutput[i]);
+ if (FAILED(hr))
+ {
+ msg_Dbg(filter,"Failed to create processor output. (hr=0x%lX)", hr);
+ goto error;
+ }
+
+ inDesc.Texture2D.ArraySlice = i;
+ hr = ID3D11VideoDevice_CreateVideoProcessorInputView(sys->d3dviddev,
+ sys->outResource,
+ processorEnumerator,
+ &inDesc,
+ &sys->procInput[i]);
+
+ if (FAILED(hr))
+ {
+ msg_Dbg(filter,"Failed to create processor input. (hr=0x%lX)", hr);
+ goto error;
+ }
+ }
+
+ sys->procEnumerator = processorEnumerator;
+
+ filter->pf_video_filter = Filter;
+ filter->p_sys = sys;
+
+ ID3D11Device_Release(d3ddevice);
+ picture_Release(dst);
+ return VLC_SUCCESS;
+error:
+ if (d3ddevice)
+ ID3D11Device_Release(d3ddevice);
+ picture_Release(dst);
+
+ for (int i=0; i<PROCESSOR_SLICES; i++)
+ {
+ if (sys->procInput[i])
+ ID3D11VideoProcessorInputView_Release(sys->procInput[i]);
+ if (sys->procOutput[i])
+ ID3D11VideoProcessorOutputView_Release(sys->procOutput[i]);
+ }
+
+ if (sys->outTexture)
+ ID3D11Texture2D_Release(sys->outTexture);
+ if (sys->videoProcessor)
+ ID3D11VideoProcessor_Release(sys->videoProcessor);
+ if (processorEnumerator)
+ ID3D11VideoProcessorEnumerator_Release(processorEnumerator);
+ if (sys->d3dvidctx)
+ ID3D11VideoContext_Release(sys->d3dvidctx);
+ if (sys->d3dviddev)
+ ID3D11VideoDevice_Release(sys->d3dviddev);
+
+ return VLC_EGENERIC;
+}
+
+static void Close(vlc_object_t *obj)
+{
+ filter_t *filter = (filter_t *)obj;
+ filter_sys_t *sys = filter->p_sys;
+
+ var_DelCallback( filter, "contrast", AdjustCallback, sys );
+ var_DelCallback( filter, "brightness", AdjustCallback, sys );
+ var_DelCallback( filter, "hue", AdjustCallback, sys );
+ var_DelCallback( filter, "saturation", AdjustCallback, sys );
+ var_DelCallback( filter, "gamma", AdjustCallback, sys );
+ var_DelCallback( filter, "brightness-threshold",
+ AdjustCallback, sys );
+
+ for (int i=0; i<PROCESSOR_SLICES; i++)
+ {
+ ID3D11VideoProcessorInputView_Release(sys->procInput[i]);
+ ID3D11VideoProcessorOutputView_Release(sys->procOutput[i]);
+ }
+ ID3D11Texture2D_Release(sys->outTexture);
+ ID3D11VideoProcessor_Release(sys->videoProcessor);
+ ID3D11VideoProcessorEnumerator_Release(sys->procEnumerator);
+ ID3D11VideoContext_Release(sys->d3dvidctx);
+ ID3D11VideoDevice_Release(sys->d3dviddev);
+
+ free(sys);
+}
+
+vlc_module_begin()
+ set_description(N_("Direct3D11 adjust filter"))
+ set_capability("video filter", 0)
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
+ set_callbacks(Open, Close)
+ add_shortcut( "adjust" )
+
+ add_float_with_range( "contrast", 1.0, 0.0, 2.0,
+ CONT_TEXT, CONT_LONGTEXT, false )
+ change_safe()
+ add_float_with_range( "brightness", 1.0, 0.0, 2.0,
+ LUM_TEXT, LUM_LONGTEXT, false )
+ change_safe()
+ add_float_with_range( "hue", 0, -180., +180.,
+ HUE_TEXT, HUE_LONGTEXT, false )
+ change_safe()
+ add_float_with_range( "saturation", 1.0, 0.0, 3.0,
+ SAT_TEXT, SAT_LONGTEXT, false )
+ change_safe()
+ add_float_with_range( "gamma", 1.0, 0.01, 10.0,
+ GAMMA_TEXT, GAMMA_LONGTEXT, false )
+ change_safe()
+ add_bool( "brightness-threshold", false,
+ THRES_TEXT, THRES_LONGTEXT, false )
+ change_safe()
+
+vlc_module_end()
--
2.13.0
More information about the vlc-devel
mailing list