ffmpeg chromium glue

media/video/ffmpeg_video_decode_engine_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/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_task.h"
 #include "media/base/pipeline.h"
@@ skipping 68 matching lines @@
     test_engine_.reset();
   }
 
   void Initialize() {
     EXPECT_CALL(mock_ffmpeg_, AVCodecAllocContext())
         .WillOnce(Return(&codec_context_));
     EXPECT_CALL(mock_ffmpeg_, AVCodecFindDecoder(CODEC_ID_H264))
         .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_))
         .WillOnce(Return(0));
     EXPECT_CALL(mock_ffmpeg_, AVFree(&yuv_frame_))
         .Times(1);
     EXPECT_CALL(mock_ffmpeg_, AVFree(&codec_context_))
         .Times(1);
 
     EXPECT_CALL(*this, OnInitializeComplete(_))
@@ skipping 81 matching lines @@
       .Times(1);
   EXPECT_CALL(mock_ffmpeg_, AVFree(&codec_context_))
       .Times(1);
 
   EXPECT_CALL(*this, OnInitializeComplete(_))
      .WillOnce(SaveInitializeResult(this));
   test_engine_->Initialize(MessageLoop::current(), this, NULL, config_);
   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())
       .WillOnce(Return(&codec_context_));
   EXPECT_CALL(mock_ffmpeg_, AVCodecFindDecoder(CODEC_ID_H264))
       .WillOnce(Return(&codec_));
   EXPECT_CALL(mock_ffmpeg_, AVCodecAllocFrame())
       .WillOnce(Return(&yuv_frame_));
   EXPECT_CALL(mock_ffmpeg_, AVCodecThreadInit(&codec_context_, 2))
       .WillOnce(Return(-1));
   EXPECT_CALL(mock_ffmpeg_, AVCodecClose(&codec_context_))
       .WillOnce(Return(0));
   EXPECT_CALL(mock_ffmpeg_, AVFree(&yuv_frame_))
       .Times(1);
   EXPECT_CALL(mock_ffmpeg_, AVFree(&codec_context_))
       .Times(1);
 
   EXPECT_CALL(*this, OnInitializeComplete(_))
      .WillOnce(SaveInitializeResult(this));
   test_engine_->Initialize(MessageLoop::current(), this, NULL, config_);
   EXPECT_FALSE(info_.success);
 }
+*/
 
 TEST_F(FFmpegVideoDecodeEngineTest, Initialize_OpenDecoderFails) {
   // Test avcodec_open() failing.
   EXPECT_CALL(mock_ffmpeg_, AVCodecAllocContext())
       .WillOnce(Return(&codec_context_));
   EXPECT_CALL(mock_ffmpeg_, AVCodecFindDecoder(CODEC_ID_H264))
       .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_))
       .WillOnce(Return(0));
   EXPECT_CALL(mock_ffmpeg_, AVFree(&yuv_frame_))
       .Times(1);
   EXPECT_CALL(mock_ffmpeg_, AVFree(&codec_context_))
       .Times(1);
 
   EXPECT_CALL(*this, OnInitializeComplete(_))
@@ skipping 99 matching lines @@
   EXPECT_EQ(VideoFrame::YV16, test_engine_->GetSurfaceFormat());
   codec_context_.pix_fmt = PIX_FMT_YUVJ422P;
   EXPECT_EQ(VideoFrame::YV16, test_engine_->GetSurfaceFormat());
 
   // Invalid value.
   codec_context_.pix_fmt = PIX_FMT_NONE;
   EXPECT_EQ(VideoFrame::INVALID, test_engine_->GetSurfaceFormat());
 }
 
 }  // namespace media