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

Side by Side Diff: content/common/gpu/client/gpu_video_encode_accelerator_host.h

Issue 668633002: Duplicate VideoEncodeAccelerator::SupportedProfile in gpu_info.h. (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 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_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_ 5 #ifndef CONTENT_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_
6 #define CONTENT_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_ 6 #define CONTENT_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/containers/hash_tables.h" 10 #include "base/containers/hash_tables.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // |this| is guaranteed not to outlive |channel| and |impl|. (See comments 42 // |this| is guaranteed not to outlive |channel| and |impl|. (See comments
43 // for |channel_| and |impl_|.) 43 // for |channel_| and |impl_|.)
44 GpuVideoEncodeAcceleratorHost(GpuChannelHost* channel, 44 GpuVideoEncodeAcceleratorHost(GpuChannelHost* channel,
45 CommandBufferProxyImpl* impl); 45 CommandBufferProxyImpl* impl);
46 46
47 // IPC::Listener implementation. 47 // IPC::Listener implementation.
48 virtual bool OnMessageReceived(const IPC::Message& message) override; 48 virtual bool OnMessageReceived(const IPC::Message& message) override;
49 virtual void OnChannelError() override; 49 virtual void OnChannelError() override;
50 50
51 // media::VideoEncodeAccelerator implementation. 51 // media::VideoEncodeAccelerator implementation.
52 virtual std::vector<SupportedProfile> GetSupportedProfiles() override; 52 virtual std::vector<gpu::VideoEncodeAcceleratorSupportedProfile>
53 GetSupportedProfiles() override;
53 virtual bool Initialize(media::VideoFrame::Format input_format, 54 virtual bool Initialize(media::VideoFrame::Format input_format,
54 const gfx::Size& input_visible_size, 55 const gfx::Size& input_visible_size,
55 media::VideoCodecProfile output_profile, 56 media::VideoCodecProfile output_profile,
56 uint32 initial_bitrate, 57 uint32 initial_bitrate,
57 Client* client) override; 58 Client* client) override;
58 virtual void Encode(const scoped_refptr<media::VideoFrame>& frame, 59 virtual void Encode(const scoped_refptr<media::VideoFrame>& frame,
59 bool force_keyframe) override; 60 bool force_keyframe) override;
60 virtual void UseOutputBitstreamBuffer( 61 virtual void UseOutputBitstreamBuffer(
61 const media::BitstreamBuffer& buffer) override; 62 const media::BitstreamBuffer& buffer) override;
62 virtual void RequestEncodingParametersChange(uint32 bitrate, 63 virtual void RequestEncodingParametersChange(uint32 bitrate,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 113
113 // WeakPtr factory for posting tasks back to itself. 114 // WeakPtr factory for posting tasks back to itself.
114 base::WeakPtrFactory<GpuVideoEncodeAcceleratorHost> weak_this_factory_; 115 base::WeakPtrFactory<GpuVideoEncodeAcceleratorHost> weak_this_factory_;
115 116
116 DISALLOW_COPY_AND_ASSIGN(GpuVideoEncodeAcceleratorHost); 117 DISALLOW_COPY_AND_ASSIGN(GpuVideoEncodeAcceleratorHost);
117 }; 118 };
118 119
119 } // namespace content 120 } // namespace content
120 121
121 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_ 122 #endif // CONTENT_COMMON_GPU_CLIENT_GPU_VIDEO_ENCODE_ACCELERATOR_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698