Moving the validation of bitstream_buffer into VDA implementations.

content/common/gpu/media/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 "content/common/gpu/media/dxva_video_decode_accelerator_win.h"
 
 #if !defined(OS_WIN)
 #error This file should only be built on Windows.
 #endif   // !defined(OS_WIN)
 
@@ skipping 228 matching lines @@
 
   hr = buffer->SetCurrentLength(size);
   RETURN_ON_HR_FAILURE(hr, "Failed to set buffer length", NULL);
 
   hr = buffer->Unlock();
   RETURN_ON_HR_FAILURE(hr, "Failed to unlock buffer", NULL);
 
   return sample.Detach();
 }
 
-static IMFSample* CreateSampleFromInputBuffer(
-    const media::BitstreamBuffer& bitstream_buffer,
-    uint32_t stream_size,
-    DWORD alignment) {
-  base::SharedMemory shm(bitstream_buffer.handle(), true);
-  RETURN_ON_FAILURE(shm.Map(bitstream_buffer.size()),
-                    "Failed in base::SharedMemory::Map", NULL);
-
-  return CreateInputSample(reinterpret_cast<const uint8_t*>(shm.memory()),
-                           bitstream_buffer.size(),
-                           std::min<uint32_t>(bitstream_buffer.size(),
-                                              stream_size),
-                           alignment);
-}
-
 // Helper function to create a COM object instance from a DLL. The alternative
 // is to use the CoCreateInstance API which requires the COM apartment to be
 // initialized which is not the case on the GPU main thread. We want to avoid
 // initializing COM as it may have sideeffects.
 HRESULT CreateCOMObjectFromDll(HMODULE dll, const CLSID& clsid, const IID& iid,
                                void** object) {
   if (!dll || !object)
     return E_INVALIDARG;
 
   using GetClassObject = HRESULT (WINAPI*)(
@@ skipping 661 matching lines @@
       hr,
       "Failed to set MF_LOW_LATENCY attribute on converter",
       false);
   return true;
 }
 
 void DXVAVideoDecodeAccelerator::Decode(
     const media::BitstreamBuffer& bitstream_buffer) {
   DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
 
+  // SharedMemory will take over the ownership of handle.
+  base::SharedMemory shm(bitstream_buffer.handle(), true);
+
   State state = GetState();
   RETURN_AND_NOTIFY_ON_FAILURE((state == kNormal || state == kStopped ||
                                 state == kFlushing),
            "Invalid state: " << state, ILLEGAL_STATE,);
+  if (bitstream_buffer.id() < 0) {
+    RETURN_AND_NOTIFY_ON_FAILURE(
+        false, "Invalid bitstream_buffer, id: " << bitstream_buffer.id(),
+        INVALID_ARGUMENT, );
+  }
 
   base::win::ScopedComPtr<IMFSample> sample;
-  sample.Attach(CreateSampleFromInputBuffer(bitstream_buffer,
-                                            input_stream_info_.cbSize,
-                                            input_stream_info_.cbAlignment));
+  RETURN_AND_NOTIFY_ON_FAILURE(shm.Map(bitstream_buffer.size()),
+                               "Failed in base::SharedMemory::Map",
+                               PLATFORM_FAILURE, );
+
+  sample.Attach(CreateInputSample(
+      reinterpret_cast<const uint8_t*>(shm.memory()), bitstream_buffer.size(),
+      std::min<uint32_t>(bitstream_buffer.size(), input_stream_info_.cbSize),
+      input_stream_info_.cbAlignment));
   RETURN_AND_NOTIFY_ON_FAILURE(sample.get(), "Failed to create input sample",
                                PLATFORM_FAILURE, );
 
   RETURN_AND_NOTIFY_ON_HR_FAILURE(sample->SetSampleTime(bitstream_buffer.id()),
       "Failed to associate input buffer id with sample", PLATFORM_FAILURE,);
 
   decoder_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&DXVAVideoDecodeAccelerator::DecodeInternal,
                  base::Unretained(this), sample));
@@ skipping 1417 matching lines @@
       }
       RETURN_ON_HR_FAILURE(hr, "Failed to set output type", false);
       return true;
     }
     media_type.Release();
   }
   return false;
 }
 
 }  // namespace content