Revert of MediaRecorder: enable encode acceleration for VP8 in Android

content/renderer/media_recorder/video_track_recorder.cc

 // 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.
 
 #include "content/renderer/media_recorder/video_track_recorder.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 91 matching lines @@
   static CodecEnumerator* enumerator = new CodecEnumerator();
   return enumerator;
 }
 
 CodecEnumerator::CodecEnumerator() {
 #if defined(OS_CHROMEOS)
   // See https://crbug.com/616659.
   return;
 #endif
 
+#if defined(OS_ANDROID)
+  // See https://crbug.com/653864.
+  return;
+#endif
+
   content::RenderThreadImpl* const render_thread_impl =
       content::RenderThreadImpl::current();
   if (!render_thread_impl) {
     DVLOG(2) << "Couldn't access the render thread";
     return;
   }
 
   media::GpuVideoAcceleratorFactories* const gpu_factories =
       render_thread_impl->GetGpuFactories();
   if (!gpu_factories || !gpu_factories->IsGpuVideoAcceleratorEnabled()) {
     DVLOG(2) << "Couldn't initialize GpuVideoAcceleratorFactories";
     return;
   }
 
   const auto vea_supported_profiles =
       gpu_factories->GetVideoEncodeAcceleratorSupportedProfiles();
   for (const auto& supported_profile : vea_supported_profiles) {
     for (auto& codec_id_and_profile : kPreferredCodecIdAndVEAProfiles) {
-      const media::VideoCodecProfile codec = supported_profile.profile;
-#if defined(OS_ANDROID)
-      // TODO(mcasas): enable other codecs, https://crbug.com/653864.
-      if (codec < media::VP8PROFILE_MIN || codec > media::VP8PROFILE_MAX)
-        continue;
-#endif
-      if (codec >= codec_id_and_profile.min_profile &&
-          codec <= codec_id_and_profile.max_profile) {
-        DVLOG(2) << "Accelerated codec found: " << media::GetProfileName(codec);
-        codec_id_to_profile_.insert(
-            std::make_pair(codec_id_and_profile.codec_id, codec));
+      if (supported_profile.profile >= codec_id_and_profile.min_profile &&
+          supported_profile.profile <= codec_id_and_profile.max_profile) {
+        DVLOG(2) << "Accelerated codec found: "
+                 << media::GetProfileName(supported_profile.profile);
+        codec_id_to_profile_.insert(std::make_pair(
+            codec_id_and_profile.codec_id, supported_profile.profile));
       }
     }
   }
 }
 
 CodecId CodecEnumerator::GetPreferredCodecId() {
   if (codec_id_to_profile_.empty())
     return CodecId::VP8;
   return codec_id_to_profile_.begin()->first;
 }
@@ skipping 307 matching lines @@
   MediaStreamVideoSink::DisconnectFromTrack();
   encoder_ = nullptr;
   MediaStreamVideoSink::ConnectToTrack(
       track_,
       media::BindToCurrentLoop(base::Bind(initialize_encoder_callback_,
                                           false /*allow_vea_encoder*/)),
       false);
 }
 
 }  // namespace content