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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/gpu/ipc/common/media_param_traits_macros.h

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: change Android version probing Created 4 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 side-by-side diff with in-line comments
Download patch
« media/base/ipc/media_param_traits_macros.h ('K') | « media/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/ipc/common/media_param_traits_macros.h
diff --git a/media/gpu/ipc/common/media_param_traits_macros.h b/media/gpu/ipc/common/media_param_traits_macros.h
index 563109c9f606bacd222798729f354b8dc851c552..6b18be1075d9eecfe16726179a107296ee9b2fc1 100644
--- a/media/gpu/ipc/common/media_param_traits_macros.h
+++ b/media/gpu/ipc/common/media_param_traits_macros.h
@@ -21,7 +21,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::VideoEncodeAccelerator::Error,
IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)
IPC_STRUCT_TRAITS_MEMBER(profile)
- IPC_STRUCT_TRAITS_MEMBER(is_encrypted)
+ IPC_STRUCT_TRAITS_MEMBER(encryption_scheme)
IPC_STRUCT_TRAITS_MEMBER(cdm_id)
IPC_STRUCT_TRAITS_MEMBER(is_deferred_initialization_allowed)
IPC_STRUCT_TRAITS_MEMBER(surface_id)
« media/base/ipc/media_param_traits_macros.h ('K') | « media/gpu/fake_video_decode_accelerator.cc ('k') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698