fixup! [TTVD] Use PPI headers for DP/renderer

There are several entries about to be removed on new image:
 * VideoSink_SetPlaneInfo
 * videoRenderCtrl_renderFrame

We should instead use new structure and API call to get rid
of the above ones.

Bug: https://jira-eu.sec.samsung.net/browse/VDGAME-580
Change-Id: I02dffc489ce9b178324025b0b638ffa6b21fe741
Signed-off-by: Jakub Gajownik <j.gajownik2@samsung.com>

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering.h b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering.h
index 6937e7e68ac37123f1214594c85522f6c24b8cd3..3980c7461ffda2d43dc4205869903f95cad75b16 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering.h
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering.h
@@ -33,11 +33,13 @@ namespace ui {
 
 constexpr const size_t kMetaBufferSize = 4096;
 
-#if TIZEN_VERSION_AT_LEAST(8, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+using FrameInfo = VideoSink_RenderInfo;
+#elif TIZEN_VERSION_AT_LEAST(8, 0, 0)
 using FrameInfo = VideoSink_SetPlaneInfo;
 #else
 using FrameInfo = IVideoRenderer::SetPlaneInfo;
-#endif  // TIZEN_VERSION_AT_LEAST(8, 0, 0)
+#endif  // TIZEN_VERSION_AT_LEAST(9, 0, 0)
 
 class VideoRendering {
  public:

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_direct.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_direct.cc
index f88ef7483ae3072e10f239f4de6071aaa6256ae1..dd652f46beeea1524575efd1ca267d85734bdb7b 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_direct.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_direct.cc
@@ -61,7 +61,9 @@ void VideoRenderingDirect::PrepareForRenderingFrame(
   auto* video_metadata = reinterpret_cast<VideoBufMetadata*>(v4l2_info_.data());
   video_metadata->plane = render_data.plane_id;
 
-#if TIZEN_VERSION_AT_LEAST(8, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+  frame_info->dmabuf_fd = render_data.plane_id;
+#elif TIZEN_VERSION_AT_LEAST(8, 0, 0)
   frame_info->v4l2_ptr = v4l2_info_.data();
 #else
   frame_info->metadata = video_metadata;

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_software.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_software.cc
index 3aa361b099617ba201ce43f6b14f5fada25e9dbc..c42f170ef596dd0e062449301a985525622c64cf 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_software.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_rendering_software.cc
@@ -191,28 +191,40 @@ void VideoRenderingSoftware::PrepareForRenderingFrame(
       render_data.picture_size.height() / 2,
       render_data.nv12_data->uv_phys_offset);
 
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+  frame_info->display_index = current_index_;
+  frame_info->width = render_data.picture_size.width();
+  frame_info->height = render_data.picture_size.height();
+  frame_info->framerate = kDefaultFramerate;
+  frame_info->scan_type = kProgressiveScanType;
+  frame_info->color_format = VIDEOSINK_DRM_COLORFORMAT_YUV420;
+#elif TIZEN_VERSION_AT_LEAST(8, 0, 0)
   dec_info_.width = render_data.picture_size.width();
   dec_info_.height = render_data.picture_size.height();
   dec_info_.framerate = kDefaultFramerate;
   dec_info_.scantype = kProgressiveScanType;
   dec_info_.display_index = current_index_;
-
-#if TIZEN_VERSION_AT_LEAST(8, 0, 0)
   dec_info_.colorformat = VIDEORCTRL_COLORFORMAT_YUV420;
   dec_info_.stereoscopic_info = VIDEOCTRL_STEREOSCOPIC_2D;
 
   frame_info->v4l2_ptr = &dec_info_;
+  frame_info->sw_hres = render_data.picture_size.width();
+  frame_info->sw_vres = render_data.picture_size.height();
 #else
+  dec_info_.width = render_data.picture_size.width();
+  dec_info_.height = render_data.picture_size.height();
+  dec_info_.framerate = kDefaultFramerate;
+  dec_info_.scantype = kProgressiveScanType;
+  dec_info_.display_index = current_index_;
   dec_info_.colorformat = IVideoSWDec::COLORFORMAT_YUV420;
   dec_info_.stereoscopic_info = IVideoSWDec::STEREOSCOPIC_2D;
 
   // See above why it's needed. |VideoBufMetaData| does not match |v4l2_drm|.
   frame_info->metadata =
       reinterpret_cast<IVideoRenderer::VideoBufMetaData*>(&dec_info_);
-#endif
-
   frame_info->sw_hres = render_data.picture_size.width();
   frame_info->sw_vres = render_data.picture_size.height();
+#endif
 }
 
 }  // namespace ui

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_surface.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_surface.cc
index 96bd22031c804d15e6672145576dcd086336788a..ed46d582fc20793d3dca1651186836834a9b0f2a 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/video_surface.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/video_surface.cc
@@ -543,7 +543,12 @@ bool VideoSurface::RenderPlane(const gfx::OverlayRenderData& render_data,
 
   FrameInfo frame_info{};
   renderer->PrepareForRenderingFrame(&frame_info, render_data);
+
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+  return videoRenderCtrl_frameRender(video_sink_.get(), &frame_info) == 0;
+#else
   return videoRenderCtrl_renderFrame(video_sink_.get(), &frame_info) == 0;
+#endif  // TIZEN_VERSION_AT_LEAST(9, 0, 0)
 }
 
 bool VideoSurface::SetPreResolution(const avoc_tpt_resolution_s& data) {