Integrate VDA with WebRTC.

content/renderer/media/rtc_video_decoder_bridge.h

+// Copyright (c) 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_GPU_VIDEO_DECODER_H_
+#define CONTENT_RENDERER_MEDIA_RTC_GPU_VIDEO_DECODER_H_
+
+#include <list>
+
+#include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
+#include "base/message_loop_proxy.h"
+#include "base/synchronization/lock.h"
+#include "base/synchronization/waitable_event.h"
+#include "content/common/content_export.h"
+#include "media/base/audio_decoder_config.h"
+#include "media/base/decoder_buffer_queue.h"
+#include "media/base/demuxer_stream.h"
+#include "media/base/pipeline_status.h"
+#include "media/base/video_decoder.h"
+#include "media/base/video_decoder_config.h"
+#include "third_party/webrtc/modules/video_coding/codecs/interface/video_codec_interface.h"
+
+namespace content {
+
+class RTCDemuxerStream : public media::DemuxerStream {

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

Any reason this can't live entirely in the .cc file (with just a fwd declaration
here)?

[wuchengli, 2013/05/08 15:58:56]

Done. Moved to .cc file.
On 2013/04/26 00:42:05, Ami Fischman wrote:

+ public:
+  // media::DemuxerStream implementation.
+  virtual void Read(const ReadCB& read_cb) OVERRIDE;
+  virtual const media::AudioDecoderConfig& audio_decoder_config() OVERRIDE;
+  virtual const media::VideoDecoderConfig& video_decoder_config() OVERRIDE;
+  virtual Type type() OVERRIDE;
+  virtual void EnableBitstreamConverter() OVERRIDE;
+
+  void UpdateSize(gfx::Size size);
+  void QueueBuffer(scoped_refptr<media::DecoderBuffer> buffer);
+
+ protected:
+  friend class base::RefCountedThreadSafe<RTCDemuxerStream>;

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

DemuxerStream shouldn't be refcounted anymore so you should be able to have more
explicit ownership semantics for the stream (yay)
http://src.chromium.org/viewvc/chrome/trunk/src/media/base/demuxer_stream.h?r...

[wuchengli, 2013/05/08 15:58:56]

Removed.
On 2013/04/26 00:42:05, Ami Fischman wrote:

+
+ private:

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

Would it make sense to give this a ThreadChecker member that asserts this class
is always called on the same thread?

[wuchengli, 2013/05/08 15:58:56]

The constructor and other methods of RTCDemuxerStream are called in different
threads. I added a message loop proxy to make sure the methods are called on the
same thread.
On 2013/04/26 00:42:05, Ami Fischman wrote:

+  media::DecoderBufferQueue buffer_queue_;
+  ReadCB read_cb_;
+
+  media::AudioDecoderConfig dummy_audio_decoder_config_;
+  media::VideoDecoderConfig video_decoder_config_;
+};
+
+class CONTENT_EXPORT RTCVideoDecoderBridge

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

Could benefit from commentary saying where this fits into the world and what its
threading story is (where it is called from, where it dispatches to)

[Pawel Osciak, 2013/04/26 07:08:01]

Let's rename this to RTCVideoDecoder, we don't have the old RVD anymore
(crbug.com/177572).

[wuchengli, 2013/05/08 15:58:56]

Done. Renamed to RTCVideoDecoder.

[wuchengli, 2013/05/09 15:43:14]

Done. I added some comments.

+    : NON_EXPORTED_BASE(public webrtc::VideoDecoder),
+      public base::SupportsWeakPtr<RTCVideoDecoderBridge> {
+ public:
+  RTCVideoDecoderBridge(
+      scoped_refptr<media::VideoDecoder> video_decoder,
+      const scoped_refptr<base::MessageLoopProxy>& message_loop);
+  virtual ~RTCVideoDecoderBridge();
+
+  // webrtc::VideoDecoder implementation.
+  virtual WebRtc_Word32 InitDecode(
+      const webrtc::VideoCodec* codecSettings,
+      WebRtc_Word32 numberOfCores) OVERRIDE;
+  virtual WebRtc_Word32 Decode(
+      const webrtc::EncodedImage& inputImage,
+      bool missingFrames,
+      const webrtc::RTPFragmentationHeader* fragmentation,
+      const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
+      WebRtc_Word64 renderTimeMs = -1) OVERRIDE;
+  virtual WebRtc_Word32 RegisterDecodeCompleteCallback(
+      webrtc::DecodedImageCallback* callback) OVERRIDE;
+  virtual WebRtc_Word32 Release() OVERRIDE;
+  virtual WebRtc_Word32 Reset() OVERRIDE;
+
+ private:
+  static const base::TimeDelta kDecoderTimeOut;
+  enum Status {

[Pawel Osciak, 2013/04/26 07:08:01]

s/Status/State maybe?

[wuchengli, 2013/05/08 15:58:56]

Done.
On 2013/04/26 07:08:01, posciak wrote:

+    kNoInit,

[Pawel Osciak, 2013/04/26 07:08:01]

s/kNoInit/kUninitialized ?

[wuchengli, 2013/05/08 15:58:56]

Done.

+    kInitialized,
+    kDecoding,
+    kReseting,
+    kReleased,

[Pawel Osciak, 2013/04/26 07:08:01]

Not needed, use kNoInit/kUninitialized instead?

[wuchengli, 2013/05/08 15:58:56]

Done.

+  };
+
+  scoped_refptr<media::VideoDecoder> video_decoder_;

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

I suspect you need to rebase since this is no longer refcounted (r195212)

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

Members whose use/purpose is non-obvious should be commented.

[wuchengli, 2013/05/08 15:58:56]

Rebased.
On 2013/04/26 00:42:05, Ami Fischman wrote:

[wuchengli, 2013/05/09 15:43:14]

Comment added for member variables.

+  scoped_refptr<base::MessageLoopProxy> loop_proxy_;

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

improve name

+  webrtc::DecodedImageCallback* decode_complete_callback_;
+  media::PipelineStatus pipeline_status_;
+  base::WaitableEvent decoder_init_waiter_;
+  base::WaitableEvent decoder_reset_waiter_;
+  scoped_refptr<RTCDemuxerStream> stream_;
+  gfx::Size size_;
+  Status status_;
+  webrtc::I420VideoFrame decoded_image_;

[Pawel Osciak, 2013/04/26 07:08:01]

Does this need to be a class member?

[wuchengli, 2013/05/08 15:58:56]

Removed.
On 2013/04/26 07:08:01, posciak wrote:

+
+  base::Lock lock_;

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

This is begging for an explanation of what needs to be locked (and why
everything else doesn't need it).

+  typedef std::list<scoped_refptr<media::VideoFrame> > VideoFrameList;
+  VideoFrameList ready_video_frames_;  // protected by |lock_|
+  bool decoding_error_occured_;  // protected by |lock_|
+
+  void OnUpdateStatistics(const media::PipelineStatistics& stats);

[Ami GONE FROM CHROMIUM, 2013/04/26 00:42:05]

nit: methods go before members

[wuchengli, 2013/05/08 15:58:56]

Done.

+  void OnUpdatePipelineStatus(const media::PipelineStatus status);
+  void ResetComplete();
+  void FrameReady(
+      media::VideoDecoder::Status status,
+      const scoped_refptr<media::VideoFrame>& frame);
+  void RequestFrame();
+
+  DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoderBridge);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_RENDERER_MEDIA_RTC_GPU_VIDEO_DECODER_H_