ffmpeg chromium glue

media/video/ffmpeg_video_decode_engine_unittest.cc

Index: media/video/ffmpeg_video_decode_engine_unittest.cc
===================================================================
--- media/video/ffmpeg_video_decode_engine_unittest.cc	(revision 90887)
+++ media/video/ffmpeg_video_decode_engine_unittest.cc	(working copy)
@@ -86,8 +86,8 @@
         .WillOnce(Return(&codec_));
     EXPECT_CALL(mock_ffmpeg_, AVCodecAllocFrame())
         .WillOnce(Return(&yuv_frame_));
-    EXPECT_CALL(mock_ffmpeg_, AVCodecThreadInit(&codec_context_, 2))
-        .WillOnce(Return(0));
+//    EXPECT_CALL(mock_ffmpeg_, AVCodecThreadInit(&codec_context_, 2))
+//        .WillOnce(Return(0));

[scherkus (not reviewing), 2011/06/29 17:00:36]

you can remove

[ilja, 2011/06/29 21:40:05]

Done.

     EXPECT_CALL(mock_ffmpeg_, AVCodecOpen(&codec_context_, &codec_))
         .WillOnce(Return(0));
     EXPECT_CALL(mock_ffmpeg_, AVCodecClose(&codec_context_))
@@ -189,7 +189,10 @@
   EXPECT_FALSE(info_.success);
 }
 
-// Note There are 2 threads for FFmpeg-mt.
+/*
+TODO(ihf): remove this as test is obsolete
+           (InitThread can't fail anymore as is deprecated)

[scherkus (not reviewing), 2011/06/29 17:00:36]

just nuke the test :)

[ilja, 2011/06/29 21:40:05]

Done.

+// Note There are 2 threads for FFmpeg
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_InitThreadFails) {
   // Test avcodec_thread_init() failing.
   EXPECT_CALL(mock_ffmpeg_, AVCodecAllocContext())
@@ -212,6 +215,7 @@
   test_engine_->Initialize(MessageLoop::current(), this, NULL, config_);
   EXPECT_FALSE(info_.success);
 }
+*/
 
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) {
   // Test avcodec_open() failing.
@@ -221,8 +225,8 @@
       .WillOnce(Return(&codec_));
   EXPECT_CALL(mock_ffmpeg_, AVCodecAllocFrame())
       .WillOnce(Return(&yuv_frame_));
-  EXPECT_CALL(mock_ffmpeg_, AVCodecThreadInit(&codec_context_, 2))
-      .WillOnce(Return(0));
+//  EXPECT_CALL(mock_ffmpeg_, AVCodecThreadInit(&codec_context_, 2))
+//      .WillOnce(Return(0));

[scherkus (not reviewing), 2011/06/29 17:00:36]

ditto

[ilja, 2011/06/29 21:40:05]

Done.

   EXPECT_CALL(mock_ffmpeg_, AVCodecOpen(&codec_context_, &codec_))
       .WillOnce(Return(-1));
   EXPECT_CALL(mock_ffmpeg_, AVCodecClose(&codec_context_))