Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Side by Side Diff: content/renderer/media/rtc_video_capturer.h

Issue 23587018: Replace media::VideoCapture::VideoFrameBuffer with media::VideoFrame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn
Patch Set: a1e0098f Reset timestamps on Stop(). Created 7 years, 3 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RTC_VIDEO_CAPTURER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 23 matching lines...) Expand all
34 const cricket::VideoFormat& capture_format) OVERRIDE; 34 const cricket::VideoFormat& capture_format) OVERRIDE;
35 virtual void Stop() OVERRIDE; 35 virtual void Stop() OVERRIDE;
36 virtual bool IsRunning() OVERRIDE; 36 virtual bool IsRunning() OVERRIDE;
37 virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE; 37 virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) OVERRIDE;
38 virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired, 38 virtual bool GetBestCaptureFormat(const cricket::VideoFormat& desired,
39 cricket::VideoFormat* best_format) OVERRIDE; 39 cricket::VideoFormat* best_format) OVERRIDE;
40 virtual bool IsScreencast() const OVERRIDE; 40 virtual bool IsScreencast() const OVERRIDE;
41 41
42 private: 42 private:
43 // Frame captured callback method. 43 // Frame captured callback method.
44 virtual void OnFrameCaptured( 44 virtual void OnFrameCaptured(const scoped_refptr<media::VideoFrame>& frame);
45 const media::VideoCapture::VideoFrameBuffer& frame);
46 45
47 // State change callback, must be called on same thread as Start is called. 46 // State change callback, must be called on same thread as Start is called.
48 void OnStateChange(RtcVideoCaptureDelegate::CaptureState state); 47 void OnStateChange(RtcVideoCaptureDelegate::CaptureState state);
49 48
50 const bool is_screencast_; 49 const bool is_screencast_;
51 scoped_refptr<RtcVideoCaptureDelegate> delegate_; 50 scoped_refptr<RtcVideoCaptureDelegate> delegate_;
52 VideoCaptureState state_; 51 VideoCaptureState state_;
53 base::Time start_time_; 52 bool first_frame_timestamp_valid_;
Ami GONE FROM CHROMIUM 2013/09/12 22:40:41 FWIW, media/base/buffers.h:kNoTimestamp() is a thi
sheu 2013/09/13 00:15:19 That actually makes more sense. Done.
53 base::TimeDelta first_frame_timestamp_;
54 54
55 DISALLOW_COPY_AND_ASSIGN(RtcVideoCapturer); 55 DISALLOW_COPY_AND_ASSIGN(RtcVideoCapturer);
56 }; 56 };
57 57
58 } // namespace content 58 } // namespace content
59 59
60 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURER_H_ 60 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_CAPTURER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698