content/renderer/media/media_stream_video_source.h - Issue 391703002: Implement ConstraintNotSatisfiedError for getusermedia

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

Unified Diff: content/renderer/media/media_stream_video_source.h

Issue 391703002: Implement ConstraintNotSatisfiedError for getusermedia (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add bug id and reviewer Created 6 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 side-by-side diff with in-line comments

Download patch

« content/renderer/media/media_stream_video_capturer_source.cc ('K') | « content/renderer/media/media_stream_video_capturer_source.cc ('k') | content/renderer/media/media_stream_video_source.cc » ('j') | content/renderer/media/media_stream_video_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_video_source.h

diff --git a/content/renderer/media/media_stream_video_source.h b/content/renderer/media/media_stream_video_source.h

index 45d2b03082db635b30a1e0d697ef56b3f16d4d91..06463583108b89b456790ab32a883a5eb99b998a 100644

--- a/content/renderer/media/media_stream_video_source.h

+++ b/content/renderer/media/media_stream_video_source.h

@@ -108,7 +108,7 @@ class CONTENT_EXPORT MediaStreamVideoSource

virtual void StartSourceImpl(

const media::VideoCaptureParams& params,

const VideoCaptureDeliverFrameCB& frame_callback) = 0;

- void OnStartDone(bool success);

+ void OnStartDone(content::MediaStreamRequestResult result);

no longer working on chromium 2014/07/28 19:55:08 nit, you don't need content::

jiajia.qin 2014/07/30 05:18:07 Done.

// An implementation must immediately stop capture video frames and must not

// call OnSupportedFormats after this method has been called. After this

@@ -141,10 +141,13 @@ class CONTENT_EXPORT MediaStreamVideoSource

// in the context of the callback. If gUM fail, the implementation will

// simply drop the references to the blink source and track which will lead

// to that this object is deleted.

- void FinalizeAddTrack();

+ void FinalizeAddTrack(content::MediaStreamRequestResult result);

no longer working on chromium 2014/07/28 19:55:08 ditto

jiajia.qin 2014/07/30 05:18:07 Done.

State state_;

+ // constraintName_ is used to record the name of constraint

+ // that causes ConstraintNotSatisfiedError

+ blink::WebString constraintName_;

no longer working on chromium 2014/07/28 19:55:08 how about changing the name to unsatisfied_constra

jiajia.qin 2014/07/30 05:18:08 Done.

media::VideoCaptureFormat current_format_;

struct RequestedConstraints {