Support configuration changes in VTVideoDecodeAccelerator.

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 76 matching lines @@
   // Methods for interacting with VideoToolbox. Run on |decoder_thread_|.
   bool ConfigureDecoder(
       const std::vector<const uint8_t*>& nalu_data_ptrs,
       const std::vector<size_t>& nalu_data_sizes);
   void DecodeTask(const media::BitstreamBuffer&);
   void FlushTask();
   void DropBitstream(int32_t bitstream_id);
 
   // Methods for interacting with |client_|. Run on |gpu_task_runner_|.
   void OutputTask(DecodedFrame frame);
-  void SizeChangedTask(gfx::Size coded_size);
   void NotifyError(Error error);
 
   // Send decoded frames up to and including |up_to_bitstream_id|, and return
   // the last sent |bitstream_id|.
   int32_t SendPictures(int32_t up_to_bitstream_id);
 
+  // Internal helpers for SendPictures().
+  int32_t ProcessDroppedFrames(

[Pawel Osciak, 2014/10/30 11:02:52]

Please document.

[sandersd (OOO until July 31), 2014/10/30 22:54:40]

Done.

+      int32_t last_sent_bitstream_id,
+      int32_t up_to_bitstream_id);
+  void ProcessSizeChange();
+
   // Since VideoToolbox has no reset feature (only flush), and the VDA API
   // allows Decode() and Flush() calls during a reset operation, it's possible
   // to have multiple pending actions at once. We handle the fully general case
   // of an arbitrary sequence of pending actions (in reality, there should
   // probably be at most one reset and one flush at a time).
   void QueueAction(Action action);
 
   // Process queued decoded frames, usually by sending them (unless there
   // is a pending ACTION_RESET or ACTION_DESTROY, in which case they are
   // dropped), completing queued actions along the way.
   void ProcessDecodedFrames();
 
   // Complete a particular action, by eg. calling NotifyFlushDone().
   // Warning: Deletes |this| if |action| is ACTION_DESTROY.
   void CompleteAction(Action action);
 
   // Complete all actions pending for a particular |bitstream_id|.
   // Warning: Do not call if there is a pending ACTION_DESTROY.
   void CompleteActions(int32_t bitstream_id);
 
   //
   // GPU thread state.
   //
   CGLContextObj cgl_context_;
   base::Callback<bool(void)> make_context_current_;
   media::VideoDecodeAccelerator::Client* client_;
   bool has_error_;  // client_->NotifyError() called.
-  gfx::Size texture_size_;
+  gfx::Size picture_size_;
   std::queue<PendingAction> pending_actions_;
   std::queue<int32_t> pending_bitstream_ids_;

[Pawel Osciak, 2014/10/30 11:02:52]

Could we please add documentation for members?

[sandersd (OOO until July 31), 2014/10/30 22:54:40]

Done.

+  std::set<int32_t> assigned_picture_ids_;
 
   // Texture IDs of pictures.
   // TODO(sandersd): A single map of structs holding picture data.

[Pawel Osciak, 2014/11/02 23:09:52]

This would still be great to have...

[sandersd (OOO until July 31), 2014/11/03 21:14:25]

Acknowledged.

   std::map<int32_t, uint32_t> texture_ids_;
 
   // Pictures ready to be rendered to.
-  std::queue<int32_t> available_picture_ids_;
+  std::vector<int32_t> available_picture_ids_;
 
   // Decoded frames ready to render.
   std::queue<DecodedFrame> decoded_frames_;
 
   // Image buffers kept alive while they are bound to pictures.
   std::map<int32_t, base::ScopedCFTypeRef<CVImageBufferRef>> picture_bindings_;
 
   //
   // Decoder thread state.
   //
   VTDecompressionOutputCallbackRecord callback_;
   base::ScopedCFTypeRef<CMFormatDescriptionRef> format_;
   base::ScopedCFTypeRef<VTDecompressionSessionRef> session_;
   media::H264Parser parser_;
-  gfx::Size coded_size_;
+
+  std::vector<uint8_t> last_sps_;
+  std::vector<uint8_t> last_spsext_;
+  std::vector<uint8_t> last_pps_;
 
   //
   // Shared state (set up and torn down on GPU thread).
   //
   scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner_;
 
   // This WeakPtrFactory does not need to be last as its pointers are bound to
   // the same thread it is destructed on (the GPU thread).
   base::WeakPtrFactory<VTVideoDecodeAccelerator> weak_this_factory_;
 
   // Declared last to ensure that all decoder thread tasks complete before any
   // state is destructed.
   base::Thread decoder_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(VTVideoDecodeAccelerator);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_MEDIA_VT_VIDEO_DECODE_ACCELERATOR_H_