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

Side by Side Diff: content/renderer/media/rtc_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
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_DECODER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 24 matching lines...) Expand all
35 public: 35 public:
36 RTCVideoDecoder(base::TaskRunner* video_decoder_thread, // For video decoder 36 RTCVideoDecoder(base::TaskRunner* video_decoder_thread, // For video decoder
37 base::TaskRunner* main_thread, // For accessing VideoTracks. 37 base::TaskRunner* main_thread, // For accessing VideoTracks.
38 webrtc::VideoTrackInterface* video_track); 38 webrtc::VideoTrackInterface* video_track);
39 39
40 // media::VideoDecoder implementation. 40 // media::VideoDecoder implementation.
41 virtual void Initialize(const scoped_refptr<media::DemuxerStream>& stream, 41 virtual void Initialize(const scoped_refptr<media::DemuxerStream>& stream,
42 const media::PipelineStatusCB& status_cb, 42 const media::PipelineStatusCB& status_cb,
43 const media::StatisticsCB& statistics_cb) OVERRIDE; 43 const media::StatisticsCB& statistics_cb) OVERRIDE;
44 virtual void Read(const ReadCB& read_cb) OVERRIDE; 44 virtual void Read(const ReadCB& read_cb) OVERRIDE;
45 virtual void Reset(const base::Closure& clusure) OVERRIDE; 45 virtual void Reset(const base::Closure& closure) OVERRIDE;
46 virtual void Stop(const base::Closure& clusure) OVERRIDE; 46 virtual void Stop(const base::Closure& closure) OVERRIDE;
47 virtual const gfx::Size& natural_size() OVERRIDE;
48 virtual void PrepareForShutdownHack() OVERRIDE; 47 virtual void PrepareForShutdownHack() OVERRIDE;
49 48
50 // webrtc::VideoRendererInterface implementation 49 // webrtc::VideoRendererInterface implementation
51 virtual void SetSize(int width, int height) OVERRIDE; 50 virtual void SetSize(int width, int height) OVERRIDE;
52 virtual void RenderFrame(const cricket::VideoFrame* frame) OVERRIDE; 51 virtual void RenderFrame(const cricket::VideoFrame* frame) OVERRIDE;
53 52
54 protected: 53 protected:
55 virtual ~RTCVideoDecoder(); 54 virtual ~RTCVideoDecoder();
56 55
57 private: 56 private:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 // The video track the renderer is connected to. 88 // The video track the renderer is connected to.
90 scoped_refptr<webrtc::VideoTrackInterface> video_track_; 89 scoped_refptr<webrtc::VideoTrackInterface> video_track_;
91 90
92 // Used for accessing |read_cb_| from another thread. 91 // Used for accessing |read_cb_| from another thread.
93 base::Lock lock_; 92 base::Lock lock_;
94 93
95 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder); 94 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
96 }; 95 };
97 96
98 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 97 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698