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"
@@ skipping 129 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() {
-  return GetTestConfig(kCodecVP8, kNormalSize, false);
+VideoDecoderConfig TestVideoConfig::Normal(VideoCodec codec) {
+  return GetTestConfig(codec, kNormalSize, false);
 }
 
 // static
 VideoDecoderConfig TestVideoConfig::NormalH264() {
   return GetTestConfig(kCodecH264, kNormalSize, false);
 }
 
 // static
-VideoDecoderConfig TestVideoConfig::NormalEncrypted() {
-  return GetTestConfig(kCodecVP8, kNormalSize, true);
+VideoDecoderConfig TestVideoConfig::NormalEncrypted(VideoCodec codec) {
+  return GetTestConfig(codec, kNormalSize, true);
 }
 
 // static
-VideoDecoderConfig TestVideoConfig::Large() {
-  return GetTestConfig(kCodecVP8, kLargeSize, false);
+VideoDecoderConfig TestVideoConfig::Large(VideoCodec codec) {
+  return GetTestConfig(codec, kLargeSize, false);
 }
 
 // static
-VideoDecoderConfig TestVideoConfig::LargeEncrypted() {
-  return GetTestConfig(kCodecVP8, kLargeSize, true);
+VideoDecoderConfig TestVideoConfig::LargeEncrypted(VideoCodec codec) {
+  return GetTestConfig(codec, 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