Chromium changes for static linking ffmpeg

media/ffmpeg/ffmpeg_common_unittest.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "media/base/media.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 class FFmpegCommonTest : public testing::Test {
  public:
-  FFmpegCommonTest() { FFmpegGlue::InitializeFFmpeg(); }
+  FFmpegCommonTest() {
+    InitializeMediaLibrary();

[DaleCurtis, 2015/06/02 18:21:07]

Shouldn't be necessary?

[chcunningham, 2015/06/03 01:14:16]

Done.

+    FFmpegGlue::InitializeFFmpeg();
+  }
   ~FFmpegCommonTest() override{};
 };
 
 TEST_F(FFmpegCommonTest, OpusAudioDecoderConfig) {
   AVCodecContext context = {0};
   context.codec_type = AVMEDIA_TYPE_AUDIO;
   context.codec_id = AV_CODEC_ID_OPUS;
   context.channel_layout = CHANNEL_LAYOUT_STEREO;
   context.channels = 2;
   context.sample_fmt = AV_SAMPLE_FMT_FLT;
@@ skipping 56 matching lines @@
   EXPECT_EQ(2012, exploded.year);
   EXPECT_EQ(11, exploded.month);
   EXPECT_EQ(6, exploded.day_of_week);
   EXPECT_EQ(10, exploded.day_of_month);
   EXPECT_EQ(12, exploded.hour);
   EXPECT_EQ(34, exploded.minute);
   EXPECT_EQ(56, exploded.second);
   EXPECT_EQ(0, exploded.millisecond);
 }
 
-#if defined(ALLOCATOR_SHIM) && defined(GTEST_HAS_DEATH_TEST)
-TEST_F(FFmpegCommonTest, WinAllocatorShimDeathTest) {
-  scoped_ptr<char, base::FreeDeleter> ptr;
-  // INT_MAX - 128 is carefully chosen to be below the default limit for
-  // ffmpeg allocations, but above the maximum allowed limit by the allocator
-  // shim, so we can be certain the code is being hit.
-  EXPECT_DEATH(ptr.reset(static_cast<char*>(av_malloc(INT_MAX - 128))), "");
-  ASSERT_TRUE(!ptr);
-}
-#endif
-
 TEST_F(FFmpegCommonTest, UTCDateToTime_Invalid) {
   const char* invalid_date_strings[] = {
     "",
     "2012-11-10",
     "12:34:56",
     "-- ::",
     "2012-11-10 12:34:",
     "2012-11-10 12::56",
     "2012-11-10 :34:56",
     "2012-11- 12:34:56",
@@ skipping 17 matching lines @@
   for (size_t i = 0; i < arraysize(invalid_date_strings); ++i) {
     const char* date_string = invalid_date_strings[i];
     base::Time result;
     EXPECT_FALSE(FFmpegUTCDateToTime(date_string, &result))
         << "date_string '" << date_string << "'";
     EXPECT_TRUE(result.is_null());
   }
 }
 
 }  // namespace media