Implementation of MediaCodecPlayer stage 1

media/base/android/media_codec_video_decoder.h

Index: media/base/android/media_codec_video_decoder.h
diff --git a/media/base/android/media_codec_video_decoder.h b/media/base/android/media_codec_video_decoder.h
new file mode 100644
index 0000000000000000000000000000000000000000..8e65757db26c327de9edce7cc8594841b04db76c
--- /dev/null
+++ b/media/base/android/media_codec_video_decoder.h
@@ -0,0 +1,95 @@
+// Copyright 2015 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 MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
+#define MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_
+
+#include <set>
+#include "media/base/android/media_codec_decoder.h"
+#include "ui/gfx/geometry/size.h"
+#include "ui/gl/android/scoped_java_surface.h"
+
+namespace media {
+
+// Video decoder for MediaCodecPlayer
+class MediaCodecVideoDecoder : public MediaCodecDecoder {
+ public:
+  // Typedefs for the notification callbacks
+  typedef base::Callback<void (const gfx::Size& video_size)>
+      VideoSizeChangedCallback;
+
+  MediaCodecVideoDecoder(
+      const scoped_refptr<base::SingleThreadTaskRunner>& media_runner,
+      const base::Closure& request_data_cb,
+      const base::Closure& starvation_cb,
+      const base::Closure& stop_done_cb,
+      const base::Closure& error_cb,
+      const VideoSizeChangedCallback& video_size_changed_cb,
+      const base::Closure& codec_created_cb);
+  ~MediaCodecVideoDecoder() override;
+
+  const char* class_name() const override { return "VideoDecoder"; }
+
+  bool HasStream() const override;
+  void SetDemuxerConfigs(const DemuxerConfigs& configs) override;
+  void ReleaseDecoderResources() override;
+
+  // Stores the video surface to use with upcoming Configure()
+  void SetPendingSurface(gfx::ScopedJavaSurface surface);
+
+  // Returns true if there is a video surface to use.
+  bool HasPendingSurface() const;
+
+ protected:
+  bool IsCodecReconfigureNeeded(const DemuxerConfigs& curr,
+                                const DemuxerConfigs& next) const override;
+  ConfigStatus ConfigureInternal() override;
+  void SynchronizePTSWithTime(base::TimeDelta current_time) override;
+  void OnOutputFormatChanged() override;
+  void Render(int buffer_index, size_t size, bool render_output,
+              base::TimeDelta pts, bool eos_encountered) override;
+
+  int NumDelayedRenderTasks() const override;
+  void ReleaseDelayedBuffers() override;
+
+ private:
+  // A helper method that releases output buffers and does
+  // post-release checks. Might be called by Render() or posted
+  // for later execution.
+  void ReleaseOutputBuffer(int buffer_index, bool render,
+                           bool eos_encountered);
+
+  // Data.
+
+  // Configuration received from demuxer
+  DemuxerConfigs configs_;
+
+  // Video surface that we render to.
+  gfx::ScopedJavaSurface surface_;
+
+  // Informs the callee that video size is changed.
+  VideoSizeChangedCallback video_size_changed_cb_;
+
+  // Informs the callee that the MediaCodec is created.
+  base::Closure codec_created_cb_;
+
+  // Current video size to be sent with |video_size_changed_cb_|.
+  gfx::Size video_size_;
+
+  // Indexes ouf output buffers that are posted for rendering.

[watk, 2015/06/05 01:00:33]

s/Indexes ouf/Indices of

[Tima Vaisburd, 2015/06/05 04:17:47]

Done.

+  std::set<int> delayed_buffers_;
+
+  // Associate presentation timestamps with time
+  base::TimeTicks start_time_ticks_;
+  base::TimeDelta start_pts_;
+
+  // Mantain last seen PTS for stand-alone EOS
+  base::TimeDelta last_seen_pts_;
+
+  DISALLOW_COPY_AND_ASSIGN(MediaCodecVideoDecoder);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_VIDEO_DECODER_H_