media/video/mock_video_decode_accelerator.h - Issue 317083003: Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/video/mock_video_decode_accelerator.h

Issue 317083003: Merge VideoDecodeAcceleratorImpl with VideoDecodeAccelerator (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add logging include Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/content_common.gypi ('k') | media/video/video_decode_accelerator.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_	5 #ifndef MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_

6 #define MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_	6 #define MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_

7	7

8 #include "video_decode_accelerator.h"	8 #include "video_decode_accelerator.h"

9	9

10 #include <vector>	10 #include <vector>

(...skipping 14 matching lines...) Expand all Loading...
25 virtual ~MockVideoDecodeAccelerator();	25 virtual ~MockVideoDecodeAccelerator();

26	26

27 MOCK_METHOD2(Initialize, bool(VideoCodecProfile profile, Client* client));	27 MOCK_METHOD2(Initialize, bool(VideoCodecProfile profile, Client* client));

28 MOCK_METHOD1(Decode, void(const BitstreamBuffer& bitstream_buffer));	28 MOCK_METHOD1(Decode, void(const BitstreamBuffer& bitstream_buffer));

29 MOCK_METHOD1(AssignPictureBuffers,	29 MOCK_METHOD1(AssignPictureBuffers,

30 void(const std::vector<PictureBuffer>& buffers));	30 void(const std::vector<PictureBuffer>& buffers));

31 MOCK_METHOD1(ReusePictureBuffer, void(int32 picture_buffer_id));	31 MOCK_METHOD1(ReusePictureBuffer, void(int32 picture_buffer_id));

32 MOCK_METHOD0(Flush, void());	32 MOCK_METHOD0(Flush, void());

33 MOCK_METHOD0(Reset, void());	33 MOCK_METHOD0(Reset, void());

34 MOCK_METHOD0(Destroy, void());	34 MOCK_METHOD0(Destroy, void());

	35 MOCK_METHOD0(CanDecodeOnIOThread, bool());

35	36

36 private:	37 private:

37 void DeleteThis();	38 void DeleteThis();

38 DISALLOW_COPY_AND_ASSIGN(MockVideoDecodeAccelerator);	39 DISALLOW_COPY_AND_ASSIGN(MockVideoDecodeAccelerator);

39 };	40 };

40	41

41 } // namespace media	42 } // namespace media

42	43

43 #endif // MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_	44 #endif // MEDIA_VIDEO_MOCK_VIDEO_DECODE_ACCELERATOR_H_

OLD	NEW