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

Side by Side Diff: content/common/gpu/media/dxva_video_decode_accelerator.h

Issue 630853003: Replace OVERRIDE and FINAL with override and final in content/common/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 (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 CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 5 #ifndef CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
7 7
8 #include <d3d9.h> 8 #include <d3d9.h>
9 // Work around bug in this header by disabling the relevant warning for it. 9 // Work around bug in this header by disabling the relevant warning for it.
10 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4 10 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 kFlushing, // upon flush request received. 46 kFlushing, // upon flush request received.
47 }; 47 };
48 48
49 // Does not take ownership of |client| which must outlive |*this|. 49 // Does not take ownership of |client| which must outlive |*this|.
50 explicit DXVAVideoDecodeAccelerator( 50 explicit DXVAVideoDecodeAccelerator(
51 const base::Callback<bool(void)>& make_context_current); 51 const base::Callback<bool(void)>& make_context_current);
52 virtual ~DXVAVideoDecodeAccelerator(); 52 virtual ~DXVAVideoDecodeAccelerator();
53 53
54 // media::VideoDecodeAccelerator implementation. 54 // media::VideoDecodeAccelerator implementation.
55 virtual bool Initialize(media::VideoCodecProfile profile, 55 virtual bool Initialize(media::VideoCodecProfile profile,
56 Client* client) OVERRIDE; 56 Client* client) override;
57 virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) OVERRIDE; 57 virtual void Decode(const media::BitstreamBuffer& bitstream_buffer) override;
58 virtual void AssignPictureBuffers( 58 virtual void AssignPictureBuffers(
59 const std::vector<media::PictureBuffer>& buffers) OVERRIDE; 59 const std::vector<media::PictureBuffer>& buffers) override;
60 virtual void ReusePictureBuffer(int32 picture_buffer_id) OVERRIDE; 60 virtual void ReusePictureBuffer(int32 picture_buffer_id) override;
61 virtual void Flush() OVERRIDE; 61 virtual void Flush() override;
62 virtual void Reset() OVERRIDE; 62 virtual void Reset() override;
63 virtual void Destroy() OVERRIDE; 63 virtual void Destroy() override;
64 virtual bool CanDecodeOnIOThread() OVERRIDE; 64 virtual bool CanDecodeOnIOThread() override;
65 65
66 private: 66 private:
67 typedef void* EGLConfig; 67 typedef void* EGLConfig;
68 typedef void* EGLSurface; 68 typedef void* EGLSurface;
69 // Creates and initializes an instance of the D3D device and the 69 // Creates and initializes an instance of the D3D device and the
70 // corresponding device manager. The device manager instance is eventually 70 // corresponding device manager. The device manager instance is eventually
71 // passed to the IMFTransform interface implemented by the h.264 decoder. 71 // passed to the IMFTransform interface implemented by the h.264 decoder.
72 bool CreateD3DDevManager(); 72 bool CreateD3DDevManager();
73 73
74 // Creates, initializes and sets the media types for the h.264 decoder. 74 // Creates, initializes and sets the media types for the h.264 decoder.
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 // Callback to set the correct gl context. 219 // Callback to set the correct gl context.
220 base::Callback<bool(void)> make_context_current_; 220 base::Callback<bool(void)> make_context_current_;
221 221
222 // WeakPtrFactory for posting tasks back to |this|. 222 // WeakPtrFactory for posting tasks back to |this|.
223 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_; 223 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;
224 }; 224 };
225 225
226 } // namespace content 226 } // namespace content
227 227
228 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 228 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW
« no previous file with comments | « content/common/gpu/media/android_video_encode_accelerator.h ('k') | content/common/gpu/media/exynos_v4l2_video_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698