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

Side by Side Diff: content/renderer/media/rtc_video_decoder.h

Issue 2019333004: Revert of Plumb decoded video pixel format from GPU process to renderer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
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 CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 int64_t renderTimeMs = -1) override; 75 int64_t renderTimeMs = -1) override;
76 // Called on WebRTC DecodingThread. 76 // Called on WebRTC DecodingThread.
77 int32_t RegisterDecodeCompleteCallback( 77 int32_t RegisterDecodeCompleteCallback(
78 webrtc::DecodedImageCallback* callback) override; 78 webrtc::DecodedImageCallback* callback) override;
79 // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while 79 // Called on Chrome_libJingle_WorkerThread. The child thread is blocked while
80 // this runs. 80 // this runs.
81 int32_t Release() override; 81 int32_t Release() override;
82 82
83 // VideoDecodeAccelerator::Client implementation. 83 // VideoDecodeAccelerator::Client implementation.
84 void ProvidePictureBuffers(uint32_t count, 84 void ProvidePictureBuffers(uint32_t count,
85 media::VideoPixelFormat format,
86 uint32_t textures_per_buffer, 85 uint32_t textures_per_buffer,
87 const gfx::Size& size, 86 const gfx::Size& size,
88 uint32_t texture_target) override; 87 uint32_t texture_target) override;
89 void DismissPictureBuffer(int32_t id) override; 88 void DismissPictureBuffer(int32_t id) override;
90 void PictureReady(const media::Picture& picture) override; 89 void PictureReady(const media::Picture& picture) override;
91 void NotifyEndOfBitstreamBuffer(int32_t id) override; 90 void NotifyEndOfBitstreamBuffer(int32_t id) override;
92 void NotifyFlushDone() override; 91 void NotifyFlushDone() override;
93 void NotifyResetDone() override; 92 void NotifyResetDone() override;
94 void NotifyError(media::VideoDecodeAccelerator::Error error) override; 93 void NotifyError(media::VideoDecodeAccelerator::Error error) override;
95 94
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 const webrtc::VideoCodecType video_codec_type_; 226 const webrtc::VideoCodecType video_codec_type_;
228 227
229 // The size of the incoming video frames. 228 // The size of the incoming video frames.
230 gfx::Size frame_size_; 229 gfx::Size frame_size_;
231 230
232 media::GpuVideoAcceleratorFactories* const factories_; 231 media::GpuVideoAcceleratorFactories* const factories_;
233 232
234 // The texture target used for decoded pictures. 233 // The texture target used for decoded pictures.
235 uint32_t decoder_texture_target_; 234 uint32_t decoder_texture_target_;
236 235
237 // The format of the decoded pictures.
238 media::VideoPixelFormat pixel_format_;
239
240 // Metadata of the buffers that have been sent for decode. 236 // Metadata of the buffers that have been sent for decode.
241 std::list<BufferData> input_buffer_data_; 237 std::list<BufferData> input_buffer_data_;
242 238
243 // A map from bitstream buffer IDs to bitstream buffers that are being 239 // A map from bitstream buffer IDs to bitstream buffers that are being
244 // processed by VDA. The map owns SHM buffers. 240 // processed by VDA. The map owns SHM buffers.
245 std::map<int32_t, base::SharedMemory*> bitstream_buffers_in_decoder_; 241 std::map<int32_t, base::SharedMemory*> bitstream_buffers_in_decoder_;
246 242
247 // A map from picture buffer IDs to texture-backed picture buffers. 243 // A map from picture buffer IDs to texture-backed picture buffers.
248 std::map<int32_t, media::PictureBuffer> assigned_picture_buffers_; 244 std::map<int32_t, media::PictureBuffer> assigned_picture_buffers_;
249 245
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 // Must be destroyed, or invalidated, on |vda_loop_proxy_| 296 // Must be destroyed, or invalidated, on |vda_loop_proxy_|
301 // NOTE: Weak pointers must be invalidated before all other member variables. 297 // NOTE: Weak pointers must be invalidated before all other member variables.
302 base::WeakPtrFactory<RTCVideoDecoder> weak_factory_; 298 base::WeakPtrFactory<RTCVideoDecoder> weak_factory_;
303 299
304 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder); 300 DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
305 }; 301 };
306 302
307 } // namespace content 303 } // namespace content
308 304
309 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ 305 #endif // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « chrome/gpu/arc_gpu_video_decode_accelerator.cc ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698