Rename ScopedComPtr::Release() to ScopedComPtr::Reset()

media/gpu/dxva_video_decode_accelerator_win.cc

 // 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.
 
 #include "media/gpu/dxva_video_decode_accelerator_win.h"
 
 #include <memory>
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
@@ skipping 1960 matching lines @@
   if (GetState() == kUninitialized)
     return;
 
   // Best effort to make the GL context current.
   make_context_current_cb_.Run();
 
   StopDecoderThread();
   weak_this_factory_.InvalidateWeakPtrs();
   weak_ptr_ = weak_this_factory_.GetWeakPtr();
   pending_output_samples_.clear();
-  decoder_.Release();
+  decoder_.Reset();
   config_change_detector_.reset();
 
   // If we are processing a config change, then leave the d3d9/d3d11 objects
   // along with the output picture buffers intact as they can be reused. The
   // output picture buffers may need to be recreated in case the video
   // resolution changes. We already handle that in the
   // HandleResolutionChanged() function.
   if (GetState() != kConfigChange) {
     output_picture_buffers_.clear();
     stale_output_picture_buffers_.clear();
     // We want to continue processing pending input after detecting a config
     // change.
     pending_input_buffers_.clear();
     pictures_requested_ = false;
     if (use_dx11_) {
-      d3d11_processor_.Release();
-      enumerator_.Release();
-      video_context_.Release();
-      video_device_.Release();
-      d3d11_device_context_.Release();
-      d3d11_device_.Release();
-      d3d11_device_manager_.Release();
-      d3d11_query_.Release();
-      multi_threaded_.Release();
+      d3d11_processor_.Reset();
+      enumerator_.Reset();
+      video_context_.Reset();
+      video_device_.Reset();
+      d3d11_device_context_.Reset();
+      d3d11_device_.Reset();
+      d3d11_device_manager_.Reset();
+      d3d11_query_.Reset();
+      multi_threaded_.Reset();
       processor_width_ = processor_height_ = 0;
     } else {
-      d3d9_.Release();
-      d3d9_device_ex_.Release();
-      device_manager_.Release();
-      query_.Release();
+      d3d9_.Reset();
+      d3d9_device_ex_.Reset();
+      device_manager_.Reset();
+      query_.Reset();
     }
   }
   sent_drain_message_ = false;
   SetState(kUninitialized);
 }
 
 void DXVAVideoDecodeAccelerator::StopDecoderThread() {
   // Try to determine what, if any exception last happened before a hang. See
   // http://crbug.com/613701
   DWORD last_exception_code = g_last_exception_code;
@@ skipping 752 matching lines @@
       FROM_HERE, base::Bind(&DXVAVideoDecodeAccelerator::CopySurfaceComplete,
                             weak_ptr_, src_surface, dest_surface,
                             picture_buffer_id, input_buffer_id));
 }
 
 bool DXVAVideoDecodeAccelerator::InitializeID3D11VideoProcessor(
     int width,
     int height,
     const gfx::ColorSpace& color_space) {
   if (width < processor_width_ || height != processor_height_) {
-    d3d11_processor_.Release();
-    enumerator_.Release();
+    d3d11_processor_.Reset();
+    enumerator_.Reset();
     processor_width_ = 0;
     processor_height_ = 0;
 
     D3D11_VIDEO_PROCESSOR_CONTENT_DESC desc;
     desc.InputFrameFormat = D3D11_VIDEO_FRAME_FORMAT_PROGRESSIVE;
     desc.InputFrameRate.Numerator = 60;
     desc.InputFrameRate.Denominator = 1;
     desc.InputWidth = width;
     desc.InputHeight = height;
     desc.OutputFrameRate.Numerator = 60;
@@ skipping 147 matching lines @@
     if (out_subtype == output_type) {
       if (width && height) {
         hr = MFSetAttributeSize(media_type.get(), MF_MT_FRAME_SIZE, width,
                                 height);
         RETURN_ON_HR_FAILURE(hr, "Failed to set media type attributes", false);
       }
       hr = transform->SetOutputType(0, media_type.get(), 0);  // No flags
       RETURN_ON_HR_FAILURE(hr, "Failed to set output type", false);
       return true;
     }
-    media_type.Release();
+    media_type.Reset();
   }
   return false;
 }
 
 HRESULT DXVAVideoDecodeAccelerator::CheckConfigChanged(IMFSample* sample,
                                                        bool* config_changed) {
   if (codec_ != kCodecH264)
     return S_FALSE;
 
   base::win::ScopedComPtr<IMFMediaBuffer> buffer;
@@ skipping 22 matching lines @@
       base::Bind(&DXVAVideoDecodeAccelerator::DecodePendingInputBuffers,
                  base::Unretained(this)));
 }
 
 uint32_t DXVAVideoDecodeAccelerator::GetTextureTarget() const {
   bool provide_nv12_textures = share_nv12_textures_ || copy_nv12_textures_;
   return provide_nv12_textures ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
 }
 
 }  // namespace media