OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_PEPPER_VIDEO_ENCODER_SHIM_H_ | 5 #ifndef CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ |
6 #define CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ | 6 #define CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 #include <stdint.h> | 9 #include <stdint.h> |
10 | 10 |
| 11 #include <memory> |
11 #include <vector> | 12 #include <vector> |
12 | 13 |
13 #include "base/macros.h" | 14 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "media/video/video_encode_accelerator.h" | 16 #include "media/video/video_encode_accelerator.h" |
17 | 17 |
18 namespace base { | 18 namespace base { |
19 class SingleThreadTaskRunner; | 19 class SingleThreadTaskRunner; |
20 } | 20 } |
21 | 21 |
22 namespace gfx { | 22 namespace gfx { |
23 class Size; | 23 class Size; |
24 } | 24 } |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 | 56 |
57 void OnRequireBitstreamBuffers(unsigned int input_count, | 57 void OnRequireBitstreamBuffers(unsigned int input_count, |
58 const gfx::Size& input_coded_size, | 58 const gfx::Size& input_coded_size, |
59 size_t output_buffer_size); | 59 size_t output_buffer_size); |
60 void OnBitstreamBufferReady(scoped_refptr<media::VideoFrame> frame, | 60 void OnBitstreamBufferReady(scoped_refptr<media::VideoFrame> frame, |
61 int32_t bitstream_buffer_id, | 61 int32_t bitstream_buffer_id, |
62 size_t payload_size, | 62 size_t payload_size, |
63 bool key_frame); | 63 bool key_frame); |
64 void OnNotifyError(media::VideoEncodeAccelerator::Error error); | 64 void OnNotifyError(media::VideoEncodeAccelerator::Error error); |
65 | 65 |
66 scoped_ptr<EncoderImpl> encoder_impl_; | 66 std::unique_ptr<EncoderImpl> encoder_impl_; |
67 | 67 |
68 PepperVideoEncoderHost* host_; | 68 PepperVideoEncoderHost* host_; |
69 | 69 |
70 // Task doing the encoding. | 70 // Task doing the encoding. |
71 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; | 71 scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_; |
72 | 72 |
73 base::WeakPtrFactory<VideoEncoderShim> weak_ptr_factory_; | 73 base::WeakPtrFactory<VideoEncoderShim> weak_ptr_factory_; |
74 | 74 |
75 DISALLOW_COPY_AND_ASSIGN(VideoEncoderShim); | 75 DISALLOW_COPY_AND_ASSIGN(VideoEncoderShim); |
76 }; | 76 }; |
77 | 77 |
78 } // namespace content | 78 } // namespace content |
79 | 79 |
80 #endif // CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ | 80 #endif // CONTENT_RENDERER_PEPPER_VIDEO_ENCODER_SHIM_H_ |
OLD | NEW |