Merge 55596 - Fix av sync for webm files with altref video frames. Altref fra...

media/filters/ffmpeg_video_decode_engine_unittest.cc

 // Copyright (c) 2010 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/scoped_ptr.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_ffmpeg.h"
 #include "media/base/mock_task.h"
 #include "media/filters/ffmpeg_video_decode_engine.h"
 #include "media/filters/ffmpeg_video_decoder.h"
@@ skipping 187 matching lines @@
   // Expect a bunch of avcodec calls.
   EXPECT_CALL(mock_ffmpeg_, AVInitPacket(_));
   EXPECT_CALL(mock_ffmpeg_,
               AVCodecDecodeVideo2(&codec_context_, &yuv_frame_, _, _))
       .WillOnce(DoAll(SetArgumentPointee<2>(1),  // Simulate 1 byte frame.
                       Return(0)));
 
   EXPECT_CALL(*this, OnDecodeComplete(_))
      .WillOnce(DecodeComplete(this));
   test_engine_->EmptyThisBuffer(buffer_);
-  EXPECT_EQ(kTimestamp.InMicroseconds(),
-            video_frame_->GetTimestamp().ToInternalValue());
+
+  // |video_frame_| timestamp is 0 because we set the timestamp based off
+  // the buffer timestamp.
+  EXPECT_EQ(0, video_frame_->GetTimestamp().ToInternalValue());
   EXPECT_EQ(kDuration.ToInternalValue(),
             video_frame_->GetDuration().ToInternalValue());
 }
 
 TEST_F(FFmpegVideoDecodeEngineTest, DecodeFrame_0ByteFrame) {
   Initialize();
 
   // Expect a bunch of avcodec calls.
   EXPECT_CALL(mock_ffmpeg_, AVInitPacket(_));
   EXPECT_CALL(mock_ffmpeg_,
@@ skipping 34 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