Index: media/cast/video_receiver/codecs/vp8/vp8_decoder.h |
diff --git a/media/cast/video_receiver/codecs/vp8/vp8_decoder.h b/media/cast/video_receiver/codecs/vp8/vp8_decoder.h |
index c8d930bb2a5d3091dac8e5410345095c0b730d87..511ad37ec961ae9e80a19d33c63b3726dd906b96 100644 |
--- a/media/cast/video_receiver/codecs/vp8/vp8_decoder.h |
+++ b/media/cast/video_receiver/codecs/vp8/vp8_decoder.h |
@@ -8,6 +8,8 @@ |
#include "base/memory/scoped_ptr.h" |
#include "base/threading/non_thread_safe.h" |
#include "media/cast/cast_config.h" |
+#include "media/cast/cast_environment.h" |
+#include "media/cast/cast_receiver.h" |
#include "third_party/libvpx/source/libvpx/vpx/vpx_decoder.h" |
typedef struct vpx_codec_ctx vpx_dec_ctx_t; |
@@ -19,18 +21,24 @@ namespace cast { |
// thread. |
class Vp8Decoder : public base::NonThreadSafe { |
public: |
- explicit Vp8Decoder(int number_of_cores); |
+ Vp8Decoder(int number_of_cores, |
+ scoped_refptr<CastEnvironment> cast_environment); |
~Vp8Decoder(); |
- // Decode encoded image (as a part of a video stream). |
- bool Decode(const EncodedVideoFrame& input_image, |
- I420VideoFrame* decoded_frame); |
+ // Decode frame - The decoded frame will be passed via the callback. |
+ // Will return false in case of error, and then it's up to the caller to |
+ // release the memory. |
+ // Ownership of the encoded_frame does not pass to the Vp8Decoder. |
+ bool Decode(const EncodedVideoFrame* encoded_frame, |
+ const base::TimeTicks render_time, |
+ const VideoFrameDecodedCallback& frame_decoded_cb); |
private: |
// Initialize the decoder. |
void InitDecode(int number_of_cores); |
scoped_ptr<vpx_dec_ctx_t> decoder_; |
+ scoped_refptr<CastEnvironment> cast_environment_; |
}; |
} // namespace cast |