Revert of Android: enable H264&VP8 HW accelerator for MediaRecorder

content/renderer/media_recorder/video_track_recorder.h

 // 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 CONTENT_RENDERER_MEDIA_RECORDER_VIDEO_TRACK_RECORDER_H_
 #define CONTENT_RENDERER_MEDIA_RECORDER_VIDEO_TRACK_RECORDER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_checker.h"
 #include "content/public/common/features.h"
 #include "content/public/renderer/media_stream_video_sink.h"
 #include "media/muxers/webm_muxer.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
-#if BUILDFLAG(RTC_USE_H264) || defined(OS_ANDROID)
-// H264 encoding is supported on Android using the platform encode
-// accelerator, and elsewhere using OpenH264.
-#define IS_H264_SUPPORTED
-#endif
-
 namespace base {
 class Thread;
 }  // namespace base
 
 namespace cc {
 class PaintCanvas;
 }  // namespace cc
 
 namespace media {
 class SkCanvasVideoRenderer;
 class VideoFrame;
 }  // namespace media
 
 namespace video_track_recorder {
-#if defined(OS_ANDROID)
-const int kVEAEncoderMinResolutionWidth = 176;
-const int kVEAEncoderMinResolutionHeight = 144;
-#else
 const int kVEAEncoderMinResolutionWidth = 640;
 const int kVEAEncoderMinResolutionHeight = 480;
-#endif
 }  // namespace video_track_recorder
 
 namespace content {
 
 // VideoTrackRecorder is a MediaStreamVideoSink that encodes the video frames
 // received from a Stream Video Track. This class is constructed and used on a
 // single thread, namely the main Render thread. This mirrors the other
 // MediaStreamVideo* classes that are constructed/configured on Main Render
 // thread but that pass frames on Render IO thread. It has an internal Encoder
 // with its own threading subtleties, see the implementation file.
 class CONTENT_EXPORT VideoTrackRecorder
     : NON_EXPORTED_BASE(public MediaStreamVideoSink) {
  public:
   // Do not change the order of codecs; add new ones right before LAST.
   enum class CodecId {
     VP8,
     VP9,
-#if defined(IS_H264_SUPPORTED)
+#if BUILDFLAG(RTC_USE_H264)
     H264,
 #endif
     LAST
   };
 
   using OnEncodedVideoCB =
       base::Callback<void(const media::WebmMuxer::VideoParameters& params,
                           std::unique_ptr<std::string> encoded_data,
                           std::unique_ptr<std::string> encoded_alpha,
                           base::TimeTicks capture_timestamp,
@@ skipping 124 matching lines @@
   // Used to track the paused state during the initialization process.
   bool paused_before_init_;
 
   base::WeakPtrFactory<VideoTrackRecorder> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoTrackRecorder);
 };
 
 }  // namespace content
 #endif  // CONTENT_RENDERER_MEDIA_RECORDER_VIDEO_TRACK_RECORDER_H_