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

Side by Side Diff: media/cast/sender/video_encoder_impl.h

Issue 892383002: RELAND: [Cast] Software encoder support for varying video frame sizes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix for 'access to uninitialized memory' error. Created 5 years, 10 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
« no previous file with comments | « media/cast/sender/video_encoder.h ('k') | media/cast/sender/video_encoder_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 5 #ifndef MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
6 #define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 6 #define MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "media/cast/cast_config.h" 9 #include "media/cast/cast_config.h"
10 #include "media/cast/cast_environment.h" 10 #include "media/cast/cast_environment.h"
(...skipping 12 matching lines...) Expand all
23 struct CodecDynamicConfig { 23 struct CodecDynamicConfig {
24 bool key_frame_requested; 24 bool key_frame_requested;
25 uint32 latest_frame_id_to_reference; 25 uint32 latest_frame_id_to_reference;
26 int bit_rate; 26 int bit_rate;
27 }; 27 };
28 28
29 typedef base::Callback<void(scoped_ptr<EncodedFrame>)> 29 typedef base::Callback<void(scoped_ptr<EncodedFrame>)>
30 FrameEncodedCallback; 30 FrameEncodedCallback;
31 31
32 VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment, 32 VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment,
33 const VideoSenderConfig& video_config); 33 const VideoSenderConfig& video_config,
34 const CastInitializationCallback& initialization_cb);
34 35
35 ~VideoEncoderImpl() override; 36 ~VideoEncoderImpl() override;
36 37
37 // VideoEncoder implementation. 38 // VideoEncoder implementation.
39 bool CanEncodeVariedFrameSizes() const override;
38 bool EncodeVideoFrame( 40 bool EncodeVideoFrame(
39 const scoped_refptr<media::VideoFrame>& video_frame, 41 const scoped_refptr<media::VideoFrame>& video_frame,
40 const base::TimeTicks& reference_time, 42 const base::TimeTicks& reference_time,
41 const FrameEncodedCallback& frame_encoded_callback) override; 43 const FrameEncodedCallback& frame_encoded_callback) override;
42 void SetBitRate(int new_bit_rate) override; 44 void SetBitRate(int new_bit_rate) override;
43 void GenerateKeyFrame() override; 45 void GenerateKeyFrame() override;
44 void LatestFrameIdToReference(uint32 frame_id) override; 46 void LatestFrameIdToReference(uint32 frame_id) override;
45 47
46 private: 48 private:
47 scoped_refptr<CastEnvironment> cast_environment_; 49 scoped_refptr<CastEnvironment> cast_environment_;
48 CodecDynamicConfig dynamic_config_; 50 CodecDynamicConfig dynamic_config_;
49 51
50 // This member belongs to the video encoder thread. It must not be 52 // This member belongs to the video encoder thread. It must not be
51 // dereferenced on the main thread. We manage the lifetime of this member 53 // dereferenced on the main thread. We manage the lifetime of this member
52 // manually because it needs to be initialize, used and destroyed on the 54 // manually because it needs to be initialize, used and destroyed on the
53 // video encoder thread and video encoder thread can out-live the main thread. 55 // video encoder thread and video encoder thread can out-live the main thread.
54 scoped_ptr<SoftwareVideoEncoder> encoder_; 56 scoped_ptr<SoftwareVideoEncoder> encoder_;
55 57
56 DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl); 58 DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl);
57 }; 59 };
58 60
59 } // namespace cast 61 } // namespace cast
60 } // namespace media 62 } // namespace media
61 63
62 #endif // MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_ 64 #endif // MEDIA_CAST_SENDER_VIDEO_ENCODER_IMPL_H_
OLDNEW
« no previous file with comments | « media/cast/sender/video_encoder.h ('k') | media/cast/sender/video_encoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698