Merge 21611 - Implemented proper pausethenseek behaviour for the media pipeli...

media/filters/ffmpeg_video_decoder.h

 // Copyright (c) 2009 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.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <queue>
 
 #include "media/base/factory.h"
@@ skipping 21 matching lines @@
   virtual void OnSeek(base::TimeDelta time);
 
   virtual void OnDecode(Buffer* buffer);
 
  private:
   friend class FilterFactoryImpl0<FFmpegVideoDecoder>;
   friend class DecoderPrivateMock;
   friend class FFmpegVideoDecoderTest;
   FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_0ByteFrame);
   FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_DecodeError);
-  FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_DiscontinuousBuffer);
   FRIEND_TEST(FFmpegVideoDecoderTest, DecodeFrame_Normal);
   FRIEND_TEST(FFmpegVideoDecoderTest, FindPtsAndDuration);
   FRIEND_TEST(FFmpegVideoDecoderTest, GetSurfaceFormat);
   FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_EnqueueVideoFrameError);
   FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_FinishEnqueuesEmptyFrames);
   FRIEND_TEST(FFmpegVideoDecoderTest, OnDecode_TestStateTransition);
+  FRIEND_TEST(FFmpegVideoDecoderTest, OnSeek);
   FRIEND_TEST(FFmpegVideoDecoderTest, TimeQueue_Ordering);
 
   // FFmpeg outputs packets in decode timestamp (dts) order, which may not
   // always be in presentation timestamp (pts) order.  Therefore, when Process
   // is called we cannot assume that the pts of the input |buffer| passed to the
   // OnDecode() method is necessarily the pts of video frame.  For example:
   //
   // Process()    Timestamp     Timestamp
   //  Call #      Buffer In     Buffer Out
   //    1             1             1
@@ skipping 75 matching lines @@
   DecoderState state_;
 
   AVCodecContext* codec_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_