[VD][RISCV][PDNCF] Fixed compile conflicts of ppi-video-control between ARM and RISC-V

1.Caused by: https://review.tizen.org/gerrit/#/c/platform/framework/web/chromium-efl/+/317059/
2.New feature of ppi-video-control  is not enabled on RISC-V branch. There is not file ppi-video-dp-control.h

Change-Id: Ic82428a9968642c734ee60e416dba0856d49e7a9
Signed-off-by: huochangjun <changjun.huo@samsung.com>

diff --git a/media/filters/tizen/omx/omx_facade_video.cc b/media/filters/tizen/omx/omx_facade_video.cc
index 59c3e969392ce86e3de991919ac669e5debc21d5..ca473422d0b84b015ed925dd2c623a499306e42d 100644 (file)
--- a/media/filters/tizen/omx/omx_facade_video.cc
+++ b/media/filters/tizen/omx/omx_facade_video.cc
@@ -13,7 +13,7 @@
 #include "media/filters/tizen/omx/omx_utils.h"
 #include "media/filters/tizen/video_utils.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-renderer.h>
 #else
 #include <ivideo-renderer.hpp>
@@ -65,7 +65,7 @@ OMX_VIDEO_N_DEC_INFO DecodingModeToOmxNDecoding(DecodingMode mode) {
 #if defined(TIZEN_TV_UPSTREAM_MULTIMEDIA_OMX)
 void ConvertVideoDataOmx(const OMX_BUFFERHEADERTYPE* output_buf_hdr,
                          OmxFacadeVideo::OutputData* output_data) {
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
   using VideoBufMetadata = ppi_renderer_video_buf_meta_data_s;
 #else
   using VideoBufMetadata = IVideoRenderer::VideoBufMetaData;

diff --git a/media/filters/tizen/omx/omx_facade_video_test.cc b/media/filters/tizen/omx/omx_facade_video_test.cc
index 2fcdf1167b36cbdc51fd2ba404b2bc50faabe9a2..1035bd0d6b94fd5c630c88424be683880907623e 100644 (file)
--- a/media/filters/tizen/omx/omx_facade_video_test.cc
+++ b/media/filters/tizen/omx/omx_facade_video_test.cc
@@ -14,7 +14,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-renderer.h>
 #else
 #include <ivideo-renderer.hpp>
@@ -139,7 +139,7 @@ class OmxFacadeVideoTest : public testing::Test {
       base::test::TaskEnvironment::MainThreadType::IO};
 
   OMX_BUFFERHEADERTYPE buffer_;
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
   ppi_renderer_video_buf_meta_data_s decoded_spec_;
 #else
   IVideoRenderer::VideoBufMetaData decoded_spec_;

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_impl.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_impl.cc
index 806fcaf18b0c17fd83aa3009268afe1d11fe5f01..90c4c2251d40a5168fc5f9f510b5e84a30857646 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_impl.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_impl.cc
@@ -20,7 +20,7 @@
 #include "ui/ozone/platform/efl/video_rendering_software.h"
 #include "ui/ozone/platform/efl/video_surface.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-dp-control.h>
 #else
 #include <ivideo-dp-control.hpp>
@@ -611,7 +611,7 @@ void OutputSurfaceImpl::OnInputSourceChanged() {
 }
 
 std::pair<bool, bool> OutputSurfaceImpl::IsPlaneVisible() {
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
   ppi_video_control_plane_type_e plane;
   switch (plane_) {
     case OutputSurface::Plane::kMain:

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 6d82ede1471a6ea5652b2864e1babe94594585c3..f88ef7483ae3072e10f239f4de6071aaa6256ae1 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
@@ -9,7 +9,7 @@
 #include "build/tizen_version.h"
 #include "media/base/tizen/logger/media_logger.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-renderer.h>
 #else
 #include <ivideo-renderer.hpp>
@@ -52,7 +52,7 @@ gfx::TbmBOType VideoRenderingDirect::PreparePlane(
 void VideoRenderingDirect::PrepareForRenderingFrame(
     FrameInfo* frame_info,
     const gfx::OverlayRenderData& render_data) {
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
   using VideoBufMetadata = ppi_renderer_video_buf_meta_data_s;
 #else
   using VideoBufMetadata = IVideoRenderer::VideoBufMetaData;

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 523839b00ff76d112b1374a85873fa2ee93f0784..3aa361b099617ba201ce43f6b14f5fada25e9dbc 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
@@ -12,7 +12,7 @@
 #include "ui/gfx/tbm_utils.h"
 #include "ui/gfx/tizen_gpu_buffer.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-dp-control.h>
 #else
 #include <ivideo-dp-control.hpp>
@@ -24,7 +24,7 @@ namespace {
 constexpr const size_t kDefaultFramerate = 60 * 100;
 constexpr const uint32_t kProgressiveScanType = 1;
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 ppi_video_control_scaler_index_e PlaneToScalerIndex(
     OutputSurface::Plane plane) {
   switch (plane) {
@@ -73,7 +73,7 @@ size_t PlaneToIndex(OutputSurface::Plane plane) {
 
 VideoRenderingSoftware::VideoRenderingSoftware(OutputSurface::Plane plane)
     : VideoRendering(plane) {
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
   ppi_video_dp_control_get_frame_buffer_prop(
       PPI_VID_CTRL_Y_FB_BYTEPERLINE, PlaneToScalerIndex(plane_),
       PPI_VID_CTRL_COLOR_FORMAT_YUV420, &fb_bytes_per_line_);

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 4171616dd45aeae73613722e2542bee882b9e5f1..96bd22031c804d15e6672145576dcd086336788a 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
@@ -20,7 +20,7 @@
 #include "tizen_src/chromium_impl/ui/gfx/tbm_utils.h"
 #include "ui/ozone/platform/efl/efl_window.h"
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 #include <ppi-video-dp-control.h>
 #else
 #include <ivideo-dp-control.hpp>
@@ -47,7 +47,7 @@ struct VideoTransformation {
   int flip;
 };
 
-#if TIZEN_VERSION_AT_LEAST(9, 0, 0)
+#if TIZEN_VERSION_AT_LEAST(9, 0, 0) && !BUILDFLAG(IS_RISCV64_TV)
 constexpr const int kFlipOff = PPI_VID_CTRL_FLIP_OFF;
 constexpr const int kFlipV = PPI_VID_CTRL_FLIP_V;
 constexpr const int kFlipH = PPI_VID_CTRL_FLIP_H;