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

Side by Side Diff: media/video/video_decode_accelerator.h

Issue 2507463004: Fix broken SurfaceView usage on < M devices. (Closed)
Patch Set: Created 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 5 #ifndef MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 6 #define MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 // Whether the stream is encrypted. 134 // Whether the stream is encrypted.
135 bool is_encrypted = false; 135 bool is_encrypted = false;
136 136
137 // The CDM that the VDA should use to decode encrypted streams. Must be 137 // The CDM that the VDA should use to decode encrypted streams. Must be
138 // set to a valid ID if |is_encrypted|. 138 // set to a valid ID if |is_encrypted|.
139 int cdm_id = CdmContext::kInvalidCdmId; 139 int cdm_id = CdmContext::kInvalidCdmId;
140 140
141 // Whether the client supports deferred initialization. 141 // Whether the client supports deferred initialization.
142 bool is_deferred_initialization_allowed = false; 142 bool is_deferred_initialization_allowed = false;
143 143
144 // An optional graphics surface that the VDA should render to. For setting
145 // an output SurfaceView on Android. It's only valid when not equal to
146 // |kNoSurfaceID|.
147 int surface_id = SurfaceManager::kNoSurfaceID;
148
144 // Coded size of the video frame hint, subject to change. 149 // Coded size of the video frame hint, subject to change.
145 gfx::Size initial_expected_coded_size = gfx::Size(320, 240); 150 gfx::Size initial_expected_coded_size = gfx::Size(320, 240);
146 151
147 OutputMode output_mode = OutputMode::ALLOCATE; 152 OutputMode output_mode = OutputMode::ALLOCATE;
148 153
149 // The list of picture buffer formats that the client knows how to use. An 154 // The list of picture buffer formats that the client knows how to use. An
150 // empty list means any format is supported. 155 // empty list means any format is supported.
151 std::vector<VideoPixelFormat> supported_output_formats; 156 std::vector<VideoPixelFormat> supported_output_formats;
152 157
153 // The H264 SPS and PPS configuration data. Not all clients populate these 158 // The H264 SPS and PPS configuration data. Not all clients populate these
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to 353 // std::unique_ptr<VideoDecodeAccelerator> uses "Destroy()" instead of trying to
349 // use the destructor. 354 // use the destructor.
350 template <> 355 template <>
351 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> { 356 struct MEDIA_EXPORT default_delete<media::VideoDecodeAccelerator> {
352 void operator()(media::VideoDecodeAccelerator* vda) const; 357 void operator()(media::VideoDecodeAccelerator* vda) const;
353 }; 358 };
354 359
355 } // namespace std 360 } // namespace std
356 361
357 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_ 362 #endif // MEDIA_VIDEO_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698