content/renderer/media/mock_media_stream_video_source.h - Issue 2970823003: Rename MediaStreamVideoSource:GetCurrentFormatImpl() to GetCurrentFormat()

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: content/renderer/media/mock_media_stream_video_source.h

Issue 2970823003: Rename MediaStreamVideoSource:GetCurrentFormatImpl() to GetCurrentFormat() (Closed)

Patch Set: Created 3 years, 5 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

« content/renderer/media/media_stream_video_capturer_source.h ('K') | « content/renderer/media/media_stream_video_source.cc ('k') | content/renderer/media/mock_media_stream_video_source.cc » ('j') | content/renderer/media/mock_media_stream_video_source.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_	5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_

6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_	6 #define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_

7	7

8 #include "content/renderer/media/media_stream_video_source.h"	8 #include "content/renderer/media/media_stream_video_source.h"

9	9

10 #include "base/macros.h"	10 #include "base/macros.h"

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 }	50 }

51	51

52 // Implements MediaStreamVideoSource.	52 // Implements MediaStreamVideoSource.

53 void RequestRefreshFrame() override;	53 void RequestRefreshFrame() override;

54	54

55 protected:	55 protected:

56 // Implements MediaStreamVideoSource.	56 // Implements MediaStreamVideoSource.

57 void StartSourceImpl(	57 void StartSourceImpl(

58 const VideoCaptureDeliverFrameCB& frame_callback) override;	58 const VideoCaptureDeliverFrameCB& frame_callback) override;

59 void StopSourceImpl() override;	59 void StopSourceImpl() override;

60 base::Optional<media::VideoCaptureFormat> GetCurrentFormatImpl()	60 base::Optional<media::VideoCaptureFormat> GetCurrentFormat() const override;
	hbos_chromium 2017/07/04 14:34:30 public? public? Guido Urdaneta 2017/07/05 15:28:25 No need. Show quoted text On 2017/07/04 14:34:30, hbos_chromium wrote: > public? No need.
61 const override;

62	61

63 private:	62 private:

64 media::VideoCaptureFormat format_;	63 media::VideoCaptureFormat format_;

65 bool respond_to_request_refresh_frame_;	64 bool respond_to_request_refresh_frame_;

66 int max_requested_height_;	65 int max_requested_height_;

67 int max_requested_width_;	66 int max_requested_width_;

68 double max_requested_frame_rate_;	67 double max_requested_frame_rate_;

69 bool attempted_to_start_;	68 bool attempted_to_start_;

70 VideoCaptureDeviceFormatsCB formats_callback_;	69 VideoCaptureDeviceFormatsCB formats_callback_;

71 VideoCaptureDeliverFrameCB frame_callback_;	70 VideoCaptureDeliverFrameCB frame_callback_;

72	71

73 DISALLOW_COPY_AND_ASSIGN(MockMediaStreamVideoSource);	72 DISALLOW_COPY_AND_ASSIGN(MockMediaStreamVideoSource);

74 };	73 };

75	74

76 } // namespace content	75 } // namespace content

77	76

78 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_	77 #endif // CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_VIDEO_SOURCE_H_

OLD	NEW