Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ | 5 #ifndef CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
| 6 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ | 6 #define CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <list> | 10 #include <list> |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 bool needs_protected_surface_ = false; | 177 bool needs_protected_surface_ = false; |
| 178 | 178 |
| 179 // The surface that MediaCodec is configured to output to. It's created by | 179 // The surface that MediaCodec is configured to output to. It's created by |
| 180 // the backing strategy. | 180 // the backing strategy. |
| 181 gfx::ScopedJavaSurface surface_; | 181 gfx::ScopedJavaSurface surface_; |
| 182 | 182 |
| 183 // The MediaCrypto object is used in the MediaCodec.configure() in case of | 183 // The MediaCrypto object is used in the MediaCodec.configure() in case of |
| 184 // an encrypted stream. | 184 // an encrypted stream. |
| 185 media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto_; | 185 media::MediaDrmBridgeCdmContext::JavaObjectPtr media_crypto_; |
| 186 | 186 |
| 187 // Initial coded size. | |
|
DaleCurtis
2016/04/07 18:40:43
Add a note that this may and probably will change
liberato (no reviews please)
2016/04/07 20:46:28
Done.
| |
| 188 gfx::Size coded_size_; | |
|
Tima Vaisburd
2016/04/07 18:50:01
nit: s/coded_size_/initial_frame_size_/ ? or just
liberato (no reviews please)
2016/04/07 20:46:28
renamed to |initial_expected_coded_size_|, per dal
| |
| 189 | |
| 187 protected: | 190 protected: |
| 188 friend class base::RefCountedThreadSafe<CodecConfig>; | 191 friend class base::RefCountedThreadSafe<CodecConfig>; |
| 189 virtual ~CodecConfig(); | 192 virtual ~CodecConfig(); |
| 190 | 193 |
| 191 private: | 194 private: |
| 192 DISALLOW_COPY_AND_ASSIGN(CodecConfig); | 195 DISALLOW_COPY_AND_ASSIGN(CodecConfig); |
| 193 }; | 196 }; |
| 194 | 197 |
| 195 // Configures |media_codec_| with the given codec parameters from the client. | 198 // Configures |media_codec_| with the given codec parameters from the client. |
| 196 // This configuration will (probably) not be complete before this call | 199 // This configuration will (probably) not be complete before this call |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 380 | 383 |
| 381 // WeakPtrFactory for posting tasks back to |this|. | 384 // WeakPtrFactory for posting tasks back to |this|. |
| 382 base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_; | 385 base::WeakPtrFactory<AndroidVideoDecodeAccelerator> weak_this_factory_; |
| 383 | 386 |
| 384 friend class AndroidVideoDecodeAcceleratorTest; | 387 friend class AndroidVideoDecodeAcceleratorTest; |
| 385 }; | 388 }; |
| 386 | 389 |
| 387 } // namespace content | 390 } // namespace content |
| 388 | 391 |
| 389 #endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ | 392 #endif // CONTENT_COMMON_GPU_MEDIA_ANDROID_VIDEO_DECODE_ACCELERATOR_H_ |
| OLD | NEW |