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

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

Issue 10824141: Remove VideoDecoder::natural_size() & added VideoFrame::natural_size(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix copyright year. Created 8 years, 4 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 | « 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) 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_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 "base/time.h" 8 #include "base/time.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "media/base/pipeline_status.h" 10 #include "media/base/pipeline_status.h"
(...skipping 21 matching lines...) Expand all
32 VideoCaptureImplManager* vc_manager, 32 VideoCaptureImplManager* vc_manager,
33 const media::VideoCaptureCapability& capability); 33 const media::VideoCaptureCapability& capability);
34 34
35 // media::VideoDecoder implementation. 35 // media::VideoDecoder implementation.
36 virtual void Initialize(const scoped_refptr<media::DemuxerStream>& stream, 36 virtual void Initialize(const scoped_refptr<media::DemuxerStream>& stream,
37 const media::PipelineStatusCB& status_cb, 37 const media::PipelineStatusCB& status_cb,
38 const media::StatisticsCB& statistics_cb) OVERRIDE; 38 const media::StatisticsCB& statistics_cb) OVERRIDE;
39 virtual void Read(const ReadCB& read_cb) OVERRIDE; 39 virtual void Read(const ReadCB& read_cb) OVERRIDE;
40 virtual void Reset(const base::Closure& closure) OVERRIDE; 40 virtual void Reset(const base::Closure& closure) OVERRIDE;
41 virtual void Stop(const base::Closure& closure) OVERRIDE; 41 virtual void Stop(const base::Closure& closure) OVERRIDE;
42 virtual const gfx::Size& natural_size() OVERRIDE;
43 virtual void PrepareForShutdownHack() OVERRIDE; 42 virtual void PrepareForShutdownHack() OVERRIDE;
44 43
45 // VideoCapture::EventHandler implementation. 44 // VideoCapture::EventHandler implementation.
46 virtual void OnStarted(media::VideoCapture* capture) OVERRIDE; 45 virtual void OnStarted(media::VideoCapture* capture) OVERRIDE;
47 virtual void OnStopped(media::VideoCapture* capture) OVERRIDE; 46 virtual void OnStopped(media::VideoCapture* capture) OVERRIDE;
48 virtual void OnPaused(media::VideoCapture* capture) OVERRIDE; 47 virtual void OnPaused(media::VideoCapture* capture) OVERRIDE;
49 virtual void OnError(media::VideoCapture* capture, int error_code) OVERRIDE; 48 virtual void OnError(media::VideoCapture* capture, int error_code) OVERRIDE;
50 virtual void OnRemoved(media::VideoCapture* capture) OVERRIDE; 49 virtual void OnRemoved(media::VideoCapture* capture) OVERRIDE;
51 virtual void OnBufferReady( 50 virtual void OnBufferReady(
52 media::VideoCapture* capture, 51 media::VideoCapture* capture,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 101
103 media::VideoCaptureSessionId video_stream_id_; 102 media::VideoCaptureSessionId video_stream_id_;
104 media::VideoCapture* capture_engine_; 103 media::VideoCapture* capture_engine_;
105 base::Time last_frame_timestamp_; 104 base::Time last_frame_timestamp_;
106 base::Time start_time_; 105 base::Time start_time_;
107 106
108 DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder); 107 DISALLOW_COPY_AND_ASSIGN(CaptureVideoDecoder);
109 }; 108 };
110 109
111 #endif // CONTENT_RENDERER_MEDIA_CAPTURE_VIDEO_DECODER_H_ 110 #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