Fix/Disable ffmpeg Media Tests on Android

media/base/test_helpers.cc

 // Copyright (c) 2012 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 "media/base/test_helpers.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_util.h"
 #include "ui/gfx/geometry/rect.h"
 
 using ::testing::_;
 using ::testing::StrictMock;
 
 namespace media {
 
+namespace {
+#if defined(OS_ANDROID)
+VideoCodec kDefaultCodec = kCodecH264;
+#else
+VideoCodec kDefaultCodec = kCodecVP8;
+#endif
+}  // anonymous namespace
+
 // Utility mock for testing methods expecting Closures and PipelineStatusCBs.
 class MockCallback : public base::RefCountedThreadSafe<MockCallback> {
  public:
   MockCallback();
   MOCK_METHOD0(Run, void());
   MOCK_METHOD1(RunWithBool, void(bool));
   MOCK_METHOD1(RunWithStatus, void(PipelineStatus));
 
  protected:
   friend class base::RefCountedThreadSafe<MockCallback>;
@@ skipping 102 matching lines @@
 
 static const gfx::Size kNormalSize(320, 240);
 static const gfx::Size kLargeSize(640, 480);
 
 // static
 VideoDecoderConfig TestVideoConfig::Invalid() {
   return GetTestConfig(kUnknownVideoCodec, kNormalSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::Normal() {

[watk, 2017/05/09 22:08:23]

Instead of this kDefaultCodec, I think it would be better if these had a codec
parameter which is defaulted to vp8.

-  return GetTestConfig(kCodecVP8, kNormalSize, false);
+  return GetTestConfig(kDefaultCodec, kNormalSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::NormalH264() {
   return GetTestConfig(kCodecH264, kNormalSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::NormalEncrypted() {
-  return GetTestConfig(kCodecVP8, kNormalSize, true);
+  return GetTestConfig(kDefaultCodec, kNormalSize, true);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::Large() {
-  return GetTestConfig(kCodecVP8, kLargeSize, false);
+  return GetTestConfig(kDefaultCodec, kLargeSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::LargeEncrypted() {
-  return GetTestConfig(kCodecVP8, kLargeSize, true);
+  return GetTestConfig(kDefaultCodec, kLargeSize, true);
 }
 
 // static
 gfx::Size TestVideoConfig::NormalCodedSize() {
   return kNormalSize;
 }
 
 // static
 gfx::Size TestVideoConfig::LargeCodedSize() {
   return kLargeSize;
@@ skipping 95 matching lines @@
   int width = 0;
   int height = 0;
   bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) &&
                  pickle.ReadInt(&height);
   return (success && header == kFakeVideoBufferHeader &&
           width == config.coded_size().width() &&
           height == config.coded_size().height());
 }
 
 }  // namespace media