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

Unified Diff: media/cast/video_sender/video_encoder_impl.h

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/video_sender/video_encoder.h ('k') | media/cast/video_sender/video_encoder_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/video_sender/video_encoder_impl.h
diff --git a/media/cast/video_sender/video_encoder_impl.h b/media/cast/video_sender/video_encoder_impl.h
deleted file mode 100644
index 840b52ea7c69c77c94867a65dd11f269d7502caa..0000000000000000000000000000000000000000
--- a/media/cast/video_sender/video_encoder_impl.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
-#define MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "media/cast/cast_config.h"
-#include "media/cast/cast_environment.h"
-#include "media/cast/video_sender/software_video_encoder.h"
-#include "media/cast/video_sender/video_encoder.h"
-
-namespace media {
-class VideoFrame;
-
-namespace cast {
-
-// This object is called external from the main cast thread and internally from
-// the video encoder thread.
-class VideoEncoderImpl : public VideoEncoder {
- public:
- struct CodecDynamicConfig {
- bool key_frame_requested;
- uint32 latest_frame_id_to_reference;
- int bit_rate;
- };
-
- typedef base::Callback<void(scoped_ptr<transport::EncodedFrame>)>
- FrameEncodedCallback;
-
- VideoEncoderImpl(scoped_refptr<CastEnvironment> cast_environment,
- const VideoSenderConfig& video_config,
- int max_unacked_frames);
-
- virtual ~VideoEncoderImpl();
-
- // Called from the main cast thread. This function post the encode task to the
- // video encoder thread;
- // The video_frame must be valid until the closure callback is called.
- // The closure callback is called from the video encoder thread as soon as
- // the encoder is done with the frame; it does not mean that the encoded frame
- // has been sent out.
- // Once the encoded frame is ready the frame_encoded_callback is called.
- virtual bool EncodeVideoFrame(
- const scoped_refptr<media::VideoFrame>& video_frame,
- const base::TimeTicks& capture_time,
- const FrameEncodedCallback& frame_encoded_callback) OVERRIDE;
-
- // The following functions are called from the main cast thread.
- virtual void SetBitRate(int new_bit_rate) OVERRIDE;
- virtual void GenerateKeyFrame() OVERRIDE;
- virtual void LatestFrameIdToReference(uint32 frame_id) OVERRIDE;
-
- private:
- scoped_refptr<CastEnvironment> cast_environment_;
- CodecDynamicConfig dynamic_config_;
-
- // This member belongs to the video encoder thread. It must not be
- // dereferenced on the main thread. We manage the lifetime of this member
- // manually because it needs to be initialize, used and destroyed on the
- // video encoder thread and video encoder thread can out-live the main thread.
- scoped_ptr<SoftwareVideoEncoder> encoder_;
-
- DISALLOW_COPY_AND_ASSIGN(VideoEncoderImpl);
-};
-
-} // namespace cast
-} // namespace media
-
-#endif // MEDIA_CAST_VIDEO_SENDER_VIDEO_ENCODER_IMPL_H_
« no previous file with comments | « media/cast/video_sender/video_encoder.h ('k') | media/cast/video_sender/video_encoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698