summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
Diffstat (limited to 'media')
-rw-r--r--media/mf/mft_h264_decoder.cc3
-rw-r--r--media/mf/mft_h264_decoder_example.cc2
-rw-r--r--media/tools/mfdecoder/main.cc5
3 files changed, 5 insertions, 5 deletions
diff --git a/media/mf/mft_h264_decoder.cc b/media/mf/mft_h264_decoder.cc
index 0a7ba06..66d9015 100644
--- a/media/mf/mft_h264_decoder.cc
+++ b/media/mf/mft_h264_decoder.cc
@@ -354,7 +354,8 @@ bool MftH264Decoder::CreateD3DDevManager() {
HRESULT hr = d3d9_->CreateDevice(D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL,
device_window_,
- D3DCREATE_HARDWARE_VERTEXPROCESSING,
+ (D3DCREATE_HARDWARE_VERTEXPROCESSING |
+ D3DCREATE_MULTITHREADED),
&present_params,
device_.Receive());
if (FAILED(hr)) {
diff --git a/media/mf/mft_h264_decoder_example.cc b/media/mf/mft_h264_decoder_example.cc
index 5b66967..25c2947 100644
--- a/media/mf/mft_h264_decoder_example.cc
+++ b/media/mf/mft_h264_decoder_example.cc
@@ -315,8 +315,6 @@ static int Run(bool use_dxva, bool render, const std::string& input_file) {
mft->Initialize(MessageLoop::current(), handler.get(), config);
scoped_ptr<WindowObserver> observer;
-
- // If rendering, resize the window to fit the video frames.
if (render) {
observer.reset(new WindowObserver(reader.get(), mft.get()));
MessageLoopForUI::current()->AddObserver(observer.get());
diff --git a/media/tools/mfdecoder/main.cc b/media/tools/mfdecoder/main.cc
index 42d8d51..1ede4af 100644
--- a/media/tools/mfdecoder/main.cc
+++ b/media/tools/mfdecoder/main.cc
@@ -336,8 +336,9 @@ IDirect3DDeviceManager9* CreateD3DDevManager(HWND video_window,
// D3DCREATE_HARDWARE_VERTEXPROCESSING specifies hardware vertex processing.
HRESULT hr = d3d->CreateDevice(D3DADAPTER_DEFAULT,
D3DDEVTYPE_HAL,
- NULL,
- D3DCREATE_HARDWARE_VERTEXPROCESSING,
+ video_window,
+ (D3DCREATE_HARDWARE_VERTEXPROCESSING |
+ D3DCREATE_MULTITHREADED),
&present_params,
temp_device.Receive());
if (FAILED(hr)) {