Revert of Pass decoded picture size from VDA to client

content/renderer/media/rtc_video_decoder.h

 // Copyright 2013 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_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 
 #include <deque>
 #include <list>
 #include <map>
@@ skipping 73 matching lines @@
   virtual void NotifyFlushDone() OVERRIDE;
   virtual void NotifyResetDone() OVERRIDE;
   virtual void NotifyError(media::VideoDecodeAccelerator::Error error) OVERRIDE;
 
  private:
   class SHMBuffer;
   // Metadata of a bitstream buffer.
   struct BufferData {
     BufferData(int32 bitstream_buffer_id,
                uint32_t timestamp,
+               int width,
+               int height,
                size_t size);
     BufferData();
     ~BufferData();
     int32 bitstream_buffer_id;
     uint32_t timestamp;  // in 90KHz
+    uint32_t width;
+    uint32_t height;
     size_t size;  // buffer size
   };
 
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, IsBufferAfterReset);
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, IsFirstBufferAfterReset);
 
   RTCVideoDecoder(
       const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories);
 
   // Requests a buffer to be decoded by VDA.
@@ skipping 18 matching lines @@
   // Returns true on success.
   bool SaveToPendingBuffers_Locked(const webrtc::EncodedImage& input_image,
                                    const BufferData& buffer_data);
 
   // Gets SHM and moves pending buffers to decode buffers.
   void MovePendingBuffersToDecodeBuffers();
 
   scoped_refptr<media::VideoFrame> CreateVideoFrame(
       const media::Picture& picture,
       const media::PictureBuffer& pb,
-      uint32_t timestamp);
+      uint32_t timestamp,
+      uint32_t width,
+      uint32_t height,
+      size_t size);
 
   // Resets VDA.
   void ResetInternal();
 
   // Static method is to allow it to run even after RVD is deleted.
   static void ReleaseMailbox(
       base::WeakPtr<RTCVideoDecoder> decoder,
       const scoped_refptr<media::GpuVideoAcceleratorFactories>& factories,
       int64 picture_buffer_id,
       uint32 texture_id,
@@ skipping 14 matching lines @@
 
   // Returns a shared-memory segment to the available pool.
   void PutSHM_Locked(scoped_ptr<SHMBuffer> shm_buffer);
 
   // Allocates |number| shared memory of at least |min_size| bytes.
   void CreateSHM(int number, size_t min_size);
 
   // Stores the buffer metadata to |input_buffer_data_|.
   void RecordBufferData(const BufferData& buffer_data);
   // Gets the buffer metadata from |input_buffer_data_|.
-  void GetBufferData(int32 bitstream_buffer_id, uint32_t* timestamp);
+  void GetBufferData(int32 bitstream_buffer_id,
+                     uint32_t* timestamp,
+                     uint32_t* width,
+                     uint32_t* height,
+                     size_t* size);
 
   // Records the result of InitDecode to UMA and returns |status|.
   int32_t RecordInitDecodeUMA(int32_t status);
 
   // Assert the contract that this class is operated on the right thread.
   void DCheckGpuVideoAcceleratorFactoriesTaskRunnerIsCurrent() const;
 
   enum State {
     UNINITIALIZED,  // The decoder has not initialized.
     INITIALIZED,    // The decoder has initialized.
@@ skipping 74 matching lines @@
   // Must be destroyed, or invalidated, on |vda_loop_proxy_|
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<RTCVideoDecoder> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_