Revert of Audio and video decoders for MediaCodecPlayer

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
deleted file mode 100644
index 23a045c47c4432966b321ac1e9ef956af54e41f9..0000000000000000000000000000000000000000
--- a/media/base/android/media_codec_video_decoder.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// 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;
-
-  // For parameters see media_codec_decoder.h
-  // update_current_time_cb: callback that reports current playback time.
-  //                         Called for released output frame,
-  // video_size_changed_cb: reports the new video size,
-  // codec_created_cb: reports that video codec has been created. A controller
-  //                   class might use it to release more resources so that this
-  //                   decoder can use them.
-  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 SetTimeCallback& update_current_time_cb,
-      const VideoSizeChangedCallback& video_size_changed_cb,
-      const base::Closure& codec_created_cb);
-  ~MediaCodecVideoDecoder() override;
-
-  const char* class_name() const override;
-
-  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,
-                           base::TimeDelta pts,
-                           bool render,
-                           bool eos_encountered);
-
-  // Data.
-
-  // Configuration received from demuxer
-  DemuxerConfigs configs_;
-
-  // Video surface that we render to.
-  gfx::ScopedJavaSurface surface_;
-
-  // Reports current playback time to the callee.
-  SetTimeCallback update_current_time_cb_;
-
-  // 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_;
-
-  // Indices of output buffers that are posted for rendering.
-  std::set<int> delayed_buffers_;
-
-  // Associate presentation timestamps with time.
-  base::TimeTicks start_time_ticks_;
-  base::TimeDelta start_pts_;
-
-  // Mantain the 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_