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

Side by Side Diff: media/cast/video_receiver/codecs/vp8/vp8_decoder.h

Issue 59753007: Passing frame decoded callback to the codec (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits and reverting callback change Created 7 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_ 5 #ifndef MEDIA_CAST_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_
6 #define MEDIA_CAST_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_ 6 #define MEDIA_CAST_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/threading/non_thread_safe.h" 9 #include "base/threading/non_thread_safe.h"
10 #include "media/cast/cast_config.h" 10 #include "media/cast/cast_config.h"
11 #include "media/cast/cast_environment.h"
12 #include "media/cast/cast_receiver.h"
11 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" 13 #include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h"
12 14
13 typedef struct vpx_codec_ctx vpx_dec_ctx_t; 15 typedef struct vpx_codec_ctx vpx_dec_ctx_t;
14 16
15 namespace media { 17 namespace media {
16 namespace cast { 18 namespace cast {
17 19
18 // This class is not thread safe; it's only called from the cast video decoder 20 // This class is not thread safe; it's only called from the cast video decoder
19 // thread. 21 // thread.
20 class Vp8Decoder : public base::NonThreadSafe { 22 class Vp8Decoder : public base::NonThreadSafe {
21 public: 23 public:
22 explicit Vp8Decoder(int number_of_cores); 24 Vp8Decoder(int number_of_cores,
25 scoped_refptr<CastEnvironment> cast_environment);
23 ~Vp8Decoder(); 26 ~Vp8Decoder();
24 27
25 // Decode encoded image (as a part of a video stream). 28 // Decode frame - The decoded frame will be passed via the callback.
26 bool Decode(const EncodedVideoFrame& input_image, 29 // Will return false in case of error, and then it's up to the caller to
27 I420VideoFrame* decoded_frame); 30 // release the memory.
31 // Ownership of the encoded_frame does not pass to the Vp8Decoder.
32 bool Decode(const EncodedVideoFrame* encoded_frame,
33 const base::TimeTicks render_time,
34 const VideoFrameDecodedCallback& frame_decoded_cb);
28 35
29 private: 36 private:
30 // Initialize the decoder. 37 // Initialize the decoder.
31 void InitDecode(int number_of_cores); 38 void InitDecode(int number_of_cores);
32 39
33 scoped_ptr<vpx_dec_ctx_t> decoder_; 40 scoped_ptr<vpx_dec_ctx_t> decoder_;
41 scoped_refptr<CastEnvironment> cast_environment_;
34 }; 42 };
35 43
36 } // namespace cast 44 } // namespace cast
37 } // namespace media 45 } // namespace media
38 46
39 #endif // MEDIA_CAST_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_ 47 #endif // MEDIA_CAST_RTP_RECEVIER_CODECS_VP8_VP8_DECODER_H_
OLDNEW
« no previous file with comments | « media/cast/test/encode_decode_test.cc ('k') | media/cast/video_receiver/codecs/vp8/vp8_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698