From 712f1acaf22f225a5eaef28b3dff9aecb7bc5cc8 Mon Sep 17 00:00:00 2001 From: henryhsu Date: Fri, 9 Jan 2015 03:25:45 -0800 Subject: Support multiple video decoders and encoders Some platforms have multiple video decoders and encoders. For decode and encoder, return the first succeed initialized VDA and VEA from all possible platforms. GetSupportedProfile return all possible profiles from all encoders. This cl is submitted again because crrev.com/826663002 was reverted in crrev.com/832383004. BUG=445016 TEST=Tested on squawks. For decoder, make sure V4L2 initialization failed and VAAPI successed. For encoder, test on extension. TBR=piman@chromium.org,posciak@chromium.org Review URL: https://codereview.chromium.org/842123002 Cr-Commit-Position: refs/heads/master@{#310754} --- content/content_common.gypi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'content/content_common.gypi') diff --git a/content/content_common.gypi b/content/content_common.gypi index 87f3015..408bcf0 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -805,7 +805,12 @@ }, ], }], - ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or use_v4l2_codec==1)', { + ['chromeos==1 and use_v4l2_codec==1', { + 'defines': [ + 'USE_V4L2_CODEC', + ], + }], + ['chromeos==1 and (target_arch=="arm" or (use_ozone==1 and use_v4l2_codec==1))', { 'dependencies': [ '../media/media.gyp:media', ], -- cgit v1.1