From: msu.koo Date: Thu, 26 Nov 2015 11:20:30 +0000 (+0900) Subject: [MM][WebRTC] Fix crash on WebRTC connection with S/W codec X-Git-Tag: submit/tizen/20201118.160233~445 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d785f7794a8edfa04ec090063711f36a67b5bc8;p=platform%2Fframework%2Fweb%2Fchromium-efl.git [MM][WebRTC] Fix crash on WebRTC connection with S/W codec Since M43, GetSupportedProfiles also reflected to VideoDecoder. This patch is to let gpu_info_collector_efl also collect decoder accelerator informations. Also let TizenVideoDecodeAccelerator report supported profiles which required by GpuVideoDecodeAccelerator. Bug: http://165.213.149.170/jira/browse/TSAM-594 Reviewed by: sm.venugopal, sns.park Change-Id: I0df6fdaaa1f7405d095f85a7617e0fe0ca6a7ebb Signed-off-by: msu.koo --- diff --git a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.cc b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.cc index e12d72b..1bfa0b5 100644 --- a/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.cc +++ b/tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.cc @@ -56,6 +56,17 @@ media::VideoDecodeAccelerator* CreateTizenVideoDecodeAccelerator() { return new TizenVideoDecodeAccelerator(); } +media::VideoDecodeAccelerator::SupportedProfiles GetSupportedTizenProfiles() { + media::VideoDecodeAccelerator::SupportedProfiles profiles; + media::VideoDecodeAccelerator::SupportedProfile profile; + profile.profile = media::H264PROFILE_MAIN; + profile.min_resolution.SetSize(0, 0); + profile.max_resolution.SetSize(1920, 1080); // FHD + profiles.push_back(profile); + + return profiles; +} + struct TizenVideoDecodeAccelerator::BitstreamBufferRef { BitstreamBufferRef( base::WeakPtr client, diff --git a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc index f297975..1b24abf 100644 --- a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc +++ b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc @@ -11,6 +11,7 @@ #include "gpu/config/scoped_restore_non_owned_egl_context.h" #if defined(TIZEN_MULTIMEDIA_SUPPORT) +#include "content/common/gpu/media/gpu_video_decode_accelerator.h" #include "content/common/gpu/media/gpu_video_encode_accelerator.h" #endif @@ -73,6 +74,8 @@ CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) { #if defined(TIZEN_MULTIMEDIA_SUPPORT) gpu_info->video_encode_accelerator_supported_profiles = content::GpuVideoEncodeAccelerator::GetSupportedProfiles(); + gpu_info->video_decode_accelerator_supported_profiles = + content::GpuVideoDecodeAccelerator::GetSupportedProfiles(); #endif return result; }