Remove reliance on VideoToolbox frame ordering.

content/common/gpu/media/vt_video_decode_accelerator.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 #define CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 155 matching lines @@
   };
 
   // Queue of decoded frames in presentation order.
   std::priority_queue<linked_ptr<Frame>,
                       std::vector<linked_ptr<Frame>>,
                       FrameOrder> reorder_queue_;
 
   // Size of assigned picture buffers.
   gfx::Size picture_size_;
 
-  // Queue of frames that have not yet been decoded; maintains ownership of the
-  // Frame objects while they flow through VideoToolbox.
-  std::queue<linked_ptr<Frame>> pending_frames_;
+  // Frames that have not yet been decoded, keyed by bitstream ID; maintains
+  // ownership of Frame objects while they flow through VideoToolbox.
+  std::map<int32_t, linked_ptr<Frame>> pending_frames_;
 
   // Set of assigned bitstream IDs, so that Destroy() can release them all.
   std::set<int32_t> assigned_bitstream_ids_;
 
   // All picture buffers assigned to us. Used to check if reused picture buffers
   // should be added back to the available list or released. (They are not
   // released immediately because we need the reuse event to free the binding.)
   std::set<int32_t> assigned_picture_ids_;
 
   // Texture IDs of assigned pictures.
@@ skipping 32 matching lines @@
   // Declared last to ensure that all weak pointers are invalidated before
   // other destructors run.
   base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_