Remove duplicated code in for loop in VideoCapture on Windows

media/video/capture/win/video_capture_device_factory_win.cc

 // Copyright 2014 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/video/capture/win/video_capture_device_factory_win.h"
 
 #include <mfapi.h>
 #include <mferror.h>
 
 #include "base/command_line.h"
@@ skipping 281 matching lines @@
   base::win::ScopedComPtr<IMFSourceReader> reader;
   HRESULT hr =
       MFCreateSourceReaderFromMediaSource(source, NULL, reader.Receive());
   if (FAILED(hr)) {
     DLOG(ERROR) << "MFCreateSourceReaderFromMediaSource: " << std::hex << hr;
     return;
   }
 
   DWORD stream_index = 0;
   ScopedComPtr<IMFMediaType> type;
-  for (hr = reader->GetNativeMediaType(kFirstVideoStream, stream_index,
-                                       type.Receive());
-       SUCCEEDED(hr);
-       hr = reader->GetNativeMediaType(kFirstVideoStream, stream_index,
-                                       type.Receive())) {
+  while (SUCCEEDED(hr = reader->GetNativeMediaType(

[mcasas, 2014/08/28 16:48:27]

remove hr =  ?

[magjed_chromium, 2014/08/28 17:00:55]

Done.

+             kFirstVideoStream, stream_index, type.Receive()))) {
     UINT32 width, height;
     hr = MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width, &height);
     if (FAILED(hr)) {
       DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr;
       return;
     }
     VideoCaptureFormat capture_format;
     capture_format.frame_size.SetSize(width, height);
 
     UINT32 numerator, denominator;
@@ skipping 93 matching lines @@
     const VideoCaptureDevice::Name& device,
     VideoCaptureFormats* formats) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (use_media_foundation_)
     GetDeviceSupportedFormatsMediaFoundation(device, formats);
   else
     GetDeviceSupportedFormatsDirectShow(device, formats);
 }
 
 }  // namespace media