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

Unified Diff: content/common/gpu/media/gpu_video_decode_accelerator.h

Issue 1438063002: media: Support SetCdm() on VideoDecodeAccelerator interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 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 side-by-side diff with in-line comments
Download patch
Index: content/common/gpu/media/gpu_video_decode_accelerator.h
diff --git a/content/common/gpu/media/gpu_video_decode_accelerator.h b/content/common/gpu/media/gpu_video_decode_accelerator.h
index 2b2c3b7f0ba19460f382ac84046b156183e3dc86..ad1e142fc8b2c2238131d7fa7a0263f2ea97de73 100644
--- a/content/common/gpu/media/gpu_video_decode_accelerator.h
+++ b/content/common/gpu/media/gpu_video_decode_accelerator.h
@@ -38,19 +38,25 @@ class GpuVideoDecodeAccelerator
GpuCommandBufferStub* stub,
const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner);
+ // Static query for supported profiles. This query calls the appropriate
+ // platform-specific version. The returned supported profiles vector will
+ // not contain duplicates.
+ static gpu::VideoDecodeAcceleratorSupportedProfiles GetSupportedProfiles();
+
// IPC::Listener implementation.
bool OnMessageReceived(const IPC::Message& message) override;
// media::VideoDecodeAccelerator::Client implementation.
+ void NotifyCdmAttached(bool success) override;
void ProvidePictureBuffers(uint32 requested_num_of_buffers,
const gfx::Size& dimensions,
uint32 texture_target) override;
void DismissPictureBuffer(int32 picture_buffer_id) override;
void PictureReady(const media::Picture& picture) override;
- void NotifyError(media::VideoDecodeAccelerator::Error error) override;
void NotifyEndOfBitstreamBuffer(int32 bitstream_buffer_id) override;
void NotifyFlushDone() override;
void NotifyResetDone() override;
+ void NotifyError(media::VideoDecodeAccelerator::Error error) override;
// GpuCommandBufferStub::DestructionObserver implementation.
void OnWillDestroyStub() override;
@@ -65,11 +71,6 @@ class GpuVideoDecodeAccelerator
void Initialize(const media::VideoCodecProfile profile,
IPC::Message* init_done_msg);
- // Static query for supported profiles. This query calls the appropriate
- // platform-specific version. The returned supported profiles vector will
- // not contain duplicates.
- static gpu::VideoDecodeAcceleratorSupportedProfiles GetSupportedProfiles();
-
private:
typedef scoped_ptr<media::VideoDecodeAccelerator>(
GpuVideoDecodeAccelerator::*CreateVDAFp)();
@@ -88,6 +89,7 @@ class GpuVideoDecodeAccelerator
~GpuVideoDecodeAccelerator() override;
// Handlers for IPC messages.
+ void OnSetCdm(int cdm_id);
void OnDecode(const AcceleratedVideoDecoderMsg_Decode_Params& params);
void OnAssignPictureBuffers(const std::vector<int32>& buffer_ids,
const std::vector<uint32>& texture_ids);

Powered by Google App Engine
This is Rietveld 408576698