Revert of Replace IMFTransform with ID3D11VideoProcessor

media/gpu/dxva_video_decode_accelerator_win.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_
 #define MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_
 
-#include <d3d11_1.h>
+#include <d3d11.h>
 #include <d3d9.h>
 #include <initguid.h>
 #include <stdint.h>
 
 // Work around bug in this header by disabling the relevant warning for it.
 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h-in-win8-sdk-triggers-c4201-with-w4
 #pragma warning(push)
 #pragma warning(disable : 4201)
 #include <dxva2api.h>
 #pragma warning(pop)
@@ skipping 291 matching lines @@
                    uint64_t keyed_mutex_value,
                    int picture_buffer_id,
                    int input_buffer_id,
                    const gfx::ColorSpace& color_space);
 
   // Copies the |video_frame| to the destination |dest_texture|.
   void CopyTextureOnDecoderThread(
       ID3D11Texture2D* dest_texture,
       base::win::ScopedComPtr<IDXGIKeyedMutex> dest_keyed_mutex,
       uint64_t keyed_mutex_value,
-      base::win::ScopedComPtr<IMFSample> input_sample,
+      base::win::ScopedComPtr<IMFSample> video_frame,
       int picture_buffer_id,
       int input_buffer_id);
 
   // Flushes the decoder device to ensure that the decoded surface is copied
   // to the target surface. |iterations| helps to maintain an upper limit on
   // the number of times we try to complete the flush operation.
   void FlushDecoder(int iterations,
                     IDirect3DSurface9* src_surface,
                     IDirect3DSurface9* dest_surface,
                     int picture_buffer_id,
                     int input_buffer_id);
 
   // Polls to wait for GPU commands to be finished on the picture buffer
   // before reusing it.
   void WaitForOutputBuffer(int32_t picture_buffer_id, int count);
 
-  // Initialize the DX11 video processor.
+  // Initializes the DX11 Video format converter media types.
   // Returns true on success.
-  bool InitializeID3D11VideoProcessor(int width,
-                                      int height,
-                                      const gfx::ColorSpace& color_space);
+  bool InitializeDX11VideoFormatConverterMediaType(
+      int width,
+      int height,
+      const gfx::ColorSpace& color_space);
 
   // Returns the output video frame dimensions (width, height).
   // |sample| :- This is the output sample containing the video frame.
   // |width| :- The width is returned here.
   // |height| :- The height is returned here.
   // Returns true on success.
   bool GetVideoFrameDimensions(IMFSample* sample, int* width, int* height);
 
   // Sets the output type on the |transform| to the GUID identified by the
   // the |output_type| parameter. The GUID can be MFVideoFormat_RGB32,
@@ skipping 17 matching lines @@
   // Called when we detect a stream configuration change. We reinitialize the
   // decoder here.
   void ConfigChanged(const Config& config);
 
   uint32_t GetTextureTarget() const;
 
   // To expose client callbacks from VideoDecodeAccelerator.
   VideoDecodeAccelerator::Client* client_;
 
   base::win::ScopedComPtr<IMFTransform> decoder_;
+  base::win::ScopedComPtr<IMFTransform> video_format_converter_mft_;
 
   base::win::ScopedComPtr<IDirect3D9Ex> d3d9_;
   base::win::ScopedComPtr<IDirect3DDevice9Ex> d3d9_device_ex_;
   base::win::ScopedComPtr<IDirect3DDeviceManager9> device_manager_;
   base::win::ScopedComPtr<IDirect3DQuery9> query_;
 
   base::win::ScopedComPtr<ID3D11Device> d3d11_device_;
   base::win::ScopedComPtr<ID3D11Device> angle_device_;
   base::win::ScopedComPtr<IMFDXGIDeviceManager> d3d11_device_manager_;
   base::win::ScopedComPtr<ID3D10Multithread> multi_threaded_;
   base::win::ScopedComPtr<ID3D11DeviceContext> d3d11_device_context_;
   base::win::ScopedComPtr<ID3D11Query> d3d11_query_;
 
-  base::win::ScopedComPtr<ID3D11VideoDevice> video_device_;
-  base::win::ScopedComPtr<ID3D11VideoContext> video_context_;
-  base::win::ScopedComPtr<ID3D11VideoProcessorEnumerator> enumerator_;
-  base::win::ScopedComPtr<ID3D11VideoProcessor> d3d11_processor_;
-
-  int processor_width_ = 0;
-  int processor_height_ = 0;
-
   base::win::ScopedComPtr<IDirectXVideoProcessorService>
       video_processor_service_;
   base::win::ScopedComPtr<IDirectXVideoProcessor> processor_;
   DXVA2_ProcAmpValues default_procamp_values_;
 
   // Ideally the reset token would be a stack variable which is used while
   // creating the device manager. However it seems that the device manager
   // holds onto the token and attempts to access it if the underlying device
   // changes.
   // TODO(ananta): This needs to be verified.
@@ skipping 115 matching lines @@
   // H/W decoding.
   bool use_dx11_;
 
   // True when using Microsoft's VP9 HMFT for decoding.
   bool using_ms_vp9_mft_ = false;
 
   // True if we should use DXGI keyed mutexes to synchronize between the two
   // contexts.
   bool use_keyed_mutex_;
 
+  // Set to true if the DX11 video format converter input media types need to
+  // be initialized. Defaults to true.
+  bool dx11_video_format_converter_media_type_needs_init_;
+
   // Color spaced used when initializing the dx11 format converter.
   gfx::ColorSpace dx11_converter_color_space_;
 
   // Set to true if we are sharing ANGLE's device.
   bool using_angle_device_;
 
   // Enables experimental hardware acceleration for VP8/VP9 video decoding.
   const gpu::GpuPreferences::VpxDecodeVendors enable_accelerated_vpx_decode_;
 
   // The media foundation H.264 decoder has problems handling changes like
@@ skipping 14 matching lines @@
 
   // Function pointer for the MFCreateDXGIDeviceManager API.
   static CreateDXGIDeviceManager create_dxgi_device_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_DXVA_VIDEO_DECODE_ACCELERATOR_WIN_H_