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

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

Issue 8466001: Update CaptureVideoDecoder to handle DeviceInfoReceived() calls. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: buffer count Created 9 years, 1 month 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 | « no previous file | content/renderer/media/capture_video_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_CAPTURE_VIDEO_DECODER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
6 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_ 6 #define CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
7 7
8 #include <deque> 8 #include <deque>
9 9
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void InitializeOnDecoderThread( 79 void InitializeOnDecoderThread(
80 media::DemuxerStream* demuxer_stream, 80 media::DemuxerStream* demuxer_stream,
81 const base::Closure& filter_callback, 81 const base::Closure& filter_callback,
82 const media::StatisticsCallback& stat_callback); 82 const media::StatisticsCallback& stat_callback);
83 void ReadOnDecoderThread(const ReadCB& callback); 83 void ReadOnDecoderThread(const ReadCB& callback);
84 84
85 void OnStoppedOnDecoderThread(media::VideoCapture* capture); 85 void OnStoppedOnDecoderThread(media::VideoCapture* capture);
86 void OnBufferReadyOnDecoderThread( 86 void OnBufferReadyOnDecoderThread(
87 media::VideoCapture* capture, 87 media::VideoCapture* capture,
88 scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf); 88 scoped_refptr<media::VideoCapture::VideoFrameBuffer> buf);
89 void OnDeviceInfoReceivedOnDecoderThread(
90 media::VideoCapture* capture,
91 const media::VideoCaptureParams& device_info);
89 92
90 // Delivers the frame to |read_cb_| and resets the callback. 93 // Delivers the frame to |read_cb_| and resets the callback.
91 void DeliverFrame(const scoped_refptr<media::VideoFrame>& video_frame); 94 void DeliverFrame(const scoped_refptr<media::VideoFrame>& video_frame);
92 95
93 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; 96 scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
94 scoped_refptr<VideoCaptureImplManager> vc_manager_; 97 scoped_refptr<VideoCaptureImplManager> vc_manager_;
95 media::VideoCapture::VideoCaptureCapability capability_; 98 media::VideoCapture::VideoCaptureCapability capability_;
96 gfx::Size natural_size_; 99 gfx::Size natural_size_;
97 DecoderState state_; 100 DecoderState state_;
98 ReadCB read_cb_; 101 ReadCB read_cb_;
99 base::Closure pending_stop_cb_; 102 base::Closure pending_stop_cb_;
100 media::StatisticsCallback statistics_callback_; 103 media::StatisticsCallback statistics_callback_;
101 104
102 media::VideoCaptureSessionId video_stream_id_; 105 media::VideoCaptureSessionId video_stream_id_;
103 media::VideoCapture* capture_engine_; 106 media::VideoCapture* capture_engine_;
104 base::Time start_time_; 107 base::Time start_time_;
105 108
106 DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder); 109 DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder);
107 }; 110 };
108 111
109 #endif // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_ 112 #endif // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/capture_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698