| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/test/test_suite.h" | 6 #include "base/test/test_suite.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "media/base/media.h" | 8 #include "media/base/media.h" |
| 9 #include "media/base/media_switches.h" | 9 #include "media/base/media_switches.h" |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 | 27 |
| 28 #if defined(OS_ANDROID) | 28 #if defined(OS_ANDROID) |
| 29 // Register JNI bindings for android. | 29 // Register JNI bindings for android. |
| 30 JNIEnv* env = base::android::AttachCurrentThread(); | 30 JNIEnv* env = base::android::AttachCurrentThread(); |
| 31 media::RegisterJni(env); | 31 media::RegisterJni(env); |
| 32 #endif | 32 #endif |
| 33 | 33 |
| 34 // Run this here instead of main() to ensure an AtExitManager is already | 34 // Run this here instead of main() to ensure an AtExitManager is already |
| 35 // present. | 35 // present. |
| 36 media::InitializeMediaLibraryForTesting(); | 36 media::InitializeMediaLibraryForTesting(); |
| 37 // Enable VP9 video codec support for all media tests. | |
| 38 // TODO(tomfinegan): Remove this once the VP9 flag is removed or negated. | |
| 39 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | |
| 40 cmd_line->AppendSwitch(switches::kEnableVp9Playback); | |
| 41 // Enable VP8 alpha support for all media tests. | 37 // Enable VP8 alpha support for all media tests. |
| 42 // TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or | 38 // TODO(tomfinegan): Remove this once the VP8 alpha flag is removed or |
| 43 // negated. | 39 // negated. |
| 40 CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
| 44 cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback); | 41 cmd_line->AppendSwitch(switches::kEnableVp8AlphaPlayback); |
| 45 } | 42 } |
| 46 | 43 |
| 47 int main(int argc, char** argv) { | 44 int main(int argc, char** argv) { |
| 48 return TestSuiteNoAtExit(argc, argv).Run(); | 45 return TestSuiteNoAtExit(argc, argv).Run(); |
| 49 } | 46 } |
| OLD | NEW |