Page History

diff --git a/partner/dpi/gstreamer/CMakeLists.txt b/partner/dpi/gstreamer/CMakeLists.txt
index 7081489..c9072d01e5ac32 100644
--- a/partner/dpi/gstreamer/CMakeLists.txt
+++ b/partner/dpi/gstreamer/CMakeLists.txt
@@ -204,710 +204,714 @@ if(FORCE_HDR_DV_MODE)
     add_definitions("-DFORCE_HDR_DV_MODE=1")
 endif()
 
-if(FP_FAKE_INITBUFFER)
+if(FP_FAKE_INITBUFFER AND NOT USE_RIALTO)
      add_definitions("-DFP_FAKE_INITBUFFER=1")
 endif()
 
diff --git a/partner/dpi/gstreamer/PlaybackGroupNative.cpp b/partner/dpi/gstreamer/PlaybackGroupNative.cpp
index 3c7d557..652f4aa 100644
--- 
+if(USE_RIALTO)
+     add_definitions("-DUSE_RIALTO=1")
+endif()
+
 if(USE_FIRST_VFRAME_CALLBACK)
      add_definitions("-DUSE_FIRST_VFRAME_CALLBACK=1")
 endif()
diff --git a/partner/dpi/gstreamer/PlaybackGroupNativeESPlayerGstGenericPort.cpp
+++ b/partner/dpi/gstreamer/PlaybackGroupNativeESPlayerGstGenericPort.cpp
@@ -34,7 +34,7 @@ extern void ApplicationManagerContentStopped(void);
 #if defined(GST_GL)
 #include "VideoSinkGStreamer.h"
 #endif
-#define VIDEO_SINK_NAME "westerossink"
+#define VIDEO_SINK_NAME "rialtomsevideosink"
 #define VIDEO_DECODER_NAME "westerossink"
 #define TOO_FAR_AHEAD_THRESHOLD_SECONDS 20
 #define UHD_WITDH   3840
@@ -304,7 +304,7 @@ PlaybackGroupNative::PlaybackGroupNative(ESManagerNative& ESManager, uint32_t pi
     Log::info(TRACE_MEDIACONTROL, "Enabling audio downmixing to stereo");
     g_object_set(mGstPipeline, "audio-filter", capsfilter, NULL);
   }
-  mVideoSink = createWesterosSink();
+  mVideoSink = nullptr;
 #if defined(GST_GL)
   mVideoSinkGst.reset(new VideoSinkGStreamer());
   g_object_set(mGstPipeline, "video-sink", mVideoSinkGst->createVideoSink(), NULL);
@@ -456,6 +456,7 @@ PlaybackGroupNative::~PlaybackGroupNative()
     if (mSource)
       gst_object_unref(mSource);
     GstServer::instance()->disconnect();
+
 #if defined(WESTEROS_SINK) && (defined(GIBBON_GRAPHICSENGINE_WAYLAND) || defined(GIBBON_EVENTLOOP_WAYLAND))
     gibbon::WaylandDisplay::instance()->disconnect();
 #endif
diff --git a/partner/dpi/gstreamer/ocdm/CMakeLists.txt b/partner/dpi/gstreamer/ocdm/CMakeLists.txt
index f9f8d78..3555d12 100644
--- a/partner/dpi/gstreamer/ocdm/CMakeLists.txt
+++ b/partner/dpi/gstreamer/ocdm/CMakeLists.txt
@@ -88,11 +88,11 @@ endif ()
 if (DPI_REFERENCE_DRM_OCDM)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${HAVE_DPI_DIRECTORY}/ocdm)
     add_library(drmocdm ${LIBRARY_TYPE} ${PLAYREADY_SOURCES})
-    target_link_libraries(drmocdm ocdm gstreamer-1.0 glib-2.0 gobject-2.0 gstaudio-1.0 gstapp-1.0 gstvideo-1.0 gstbase-1.0 WPEFrameworkProtocols WPEFrameworkDefinitions WPEFrameworkCore WPEFrameworkTracing )
+    target_link_libraries(drmocdm ocdmRialto gstreamer-1.0 glib-2.0 gobject-2.0 gstaudio-1.0 gstapp-1.0 gstvideo-1.0 gstbase-1.0 WPEFrameworkProtocols WPEFrameworkDefinitions WPEFrameworkCore WPEFrameworkTracing )
     target_include_directories(drmocdm PUBLIC ${CMAKE_CURRENT_LIST_DIR})
     target_compile_options(drmocdm PRIVATE -fvisibility=hidden)
     set_target_properties(drmocdm PROPERTIES OUTPUT_NAME "drmsystem")
-
+    target_compile_options(drmocdm PUBLIC -DPLAYREADY -DPLAYREADY4_0 -DDRM_BUILD_PROFILE=900 -DDRM_SUPPORT_ASSEMBLY=0 -DDRM_SUPPORT_DATASTORE_PREALLOC=1 -DDRM_SUPPORT_ECCPROFILING=0 -DDRM_SUPPORT_FORCE_ALIGN=1 -DDRM_SUPPORT_INLINEDWORDCPY=0 -DDRM_SUPPORT_FILE_LOCKING=1 -DDRM_SUPPORT_MULTI_THREADING=0 -DDRM_SUPPORT_NATIVE_64BIT_TYPES=1 -DDRM_SUPPORT_PRECOMPUTE_GTABLE=1 -DDRM_SUPPORT_SECUREOEMHAL=0 -DDRM_SUPPORT_SECUREOEMHAL_PLAY_ONLY=0 -DDRM_SUPPORT_TRACING=1 -DDRM_SUPPORT_TOOLS_NET_IO=0 -DDRM_COMPILE_FOR_NORMAL_WORLD=0 -DDRM_COMPILE_FOR_SECURE_WORLD=1)
     set_target_properties(drmocdm PROPERTIES ADDITIONAL_CLEAN_FILES ${HAVE_DPI_DIRECTORY}/ocdm)
 
     if (DPI_REFERENCE_DRM_DO_PLUGIN)

index d66b1bc..a95882c 100644
--- a/partner/dpi/gstreamer/ESPlayerGstGenericPort.cpp
+++ b/partner/dpi/gstreamer/ESPlayerGstGenericPort.cpp
@@ -569,9 +569,16 @@ void ESPlayerGstGenericPort::ProcessFrame() {
             // Lock mutex to ensure state change does not happen until seamless audio switch is completed
            mPlaybackGroup->AudioSwitchMutexLock();
 
+          #ifdef USE_RIALTO
+          Log::warn(TRACE_MEDIAPLAYBACK, "Using performAudioTrackCodecChannelSwitch for Rialto");
+          if (performAudioTrackCodecChannelSwitchRialto(&(mPlaybackGroup->mGstUtilsPlaybackGroup), pSampleAttr, pAudioAttr,
+                                                        pstatus, &delay, &mAudioChangeTargetPts, &mCurrentDispPts, &_audio_change_stage, &mAppsrcCaps,
+                                                        &mAudioAAC, netflix::device::sConfiguration->svpEnabled, mSrc, &retVal) == true)
+          #else
           if (rdk_gstreamer_utils::performAudioTrackCodecChannelSwitch(&(mPlaybackGroup->mGstUtilsPlaybackGroup), pSampleAttr, pAudioAttr,
                                                                        pstatus, &delay, &mAudioChangeTargetPts, &mCurrentDispPts, &_audio_change_stage, &mAppsrcCaps,
                                                                        &mAudioAAC, netflix::device::sConfiguration->svpEnabled, mSrc, &retVal) == true)
+          #endif
           {
             if (!retVal)
             {
@@ -1363,3 +1370,73 @@ void ESPlayerGstGenericPort::firstSampleAvailable()
     Signal(AVAIL_FIRST_SAMPLE);
     pinch();
 }
+
+bool ESPlayerGstGenericPort::performAudioTrackCodecChannelSwitchRialto(
+  rdk_gstreamer_utils::rdkGstreamerUtilsPlaybackGrp *pgstUtilsPlaybackGroup, const void *pSampleAttr, rdk_gstreamer_utils::AudioAttributes *pAudioAttr,
+  uint32_t *pStatus, unsigned int *pui32Delay, llong *pAudioChangeTargetPts, const llong *currentDispPts,
+  unsigned int *audio_change_stage, GstCaps **appsrcCaps, bool *audioaac, bool svpenabled, GstElement *aSrc, bool *ret)
+{
+    Log::warn(TRACE_MEDIAPLAYBACK," performAudioTrackCodecChannelSwitchRialto()");
+    if (*pStatus != 0 || pSampleAttr == nullptr || pAudioAttr == nullptr ) {
+        Log::warn(TRACE_MEDIAPLAYBACK, "performAudioTrackCodecChannelSwitchRialto() No audio data ready yet");
+        *pui32Delay = 100; //delay of 100ms
+        return false;
+    }
+
+    Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): Audio change current disp pts %lld\n",
+              *currentDispPts);
+
+    gint64 currentPts = GST_CLOCK_TIME_NONE;
+
+    // Rialto Server's pipeline should be in PAUSED state here. Query position before switching it to READY
+    GstQuery* query = gst_query_new_position(GST_FORMAT_TIME);
+    if (gst_element_query(pgstUtilsPlaybackGroup->gstPipeline, query))
+        gst_query_parse_position(query, 0, &currentPts);
+    gst_query_unref(query);
+
+    GstEvent* flush_start = NULL;
+    GstEvent* flush_stop  = NULL;
+    *pAudioChangeTargetPts = *currentDispPts;
+    *audio_change_stage = AUDCHG_ALIGN;
+    *pui32Delay = 0;
+     pgstUtilsPlaybackGroup->isAudioAAC = *audioaac;
+
+    Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): Sending flush-start event to rialto sink");
+    flush_start = gst_event_new_flush_start();
+    *ret = gst_element_send_event(aSrc, flush_start);
+    if (!*ret)
+        Log::warn(TRACE_MEDIAPLAYBACK,"failed to send flush-start event");
+
+    Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): Sending flush-stop event to rialto sink");
+    flush_stop = gst_event_new_flush_stop(TRUE);
+    *ret = gst_element_send_event(aSrc, flush_stop);
+    if (!*ret)
+        Log::warn(TRACE_MEDIAPLAYBACK,"failed to send flush-stop event");
+
+    if (pgstUtilsPlaybackGroup->curAudioPlaysinkBin)
+    {
+      GstState current_state, pending;
+      Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): Switching audio sink to READY");
+      gst_element_set_state(pgstUtilsPlaybackGroup->curAudioPlaysinkBin, GST_STATE_READY);
+      gst_element_get_state(pgstUtilsPlaybackGroup->curAudioPlaysinkBin, &current_state, &pending, GST_CLOCK_TIME_NONE);
+      Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto():Current AudioPlaySinkBin State = %d", current_state);
+
+      Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): Switching audio sink to previous state");
+      gst_element_sync_state_with_parent(pgstUtilsPlaybackGroup->curAudioPlaysinkBin);
+      gst_element_get_state(pgstUtilsPlaybackGroup->curAudioPlaysinkBin, &current_state, &pending, GST_CLOCK_TIME_NONE);
+      Log::warn(TRACE_MEDIAPLAYBACK,"performAudioTrackCodecChannelSwitchRialto(): AudioPlaysinkbin State = %d Pending = %d",
+                current_state, pending);
+
+      if(GST_CLOCK_TIME_NONE != currentPts)
+      {
+        *pAudioChangeTargetPts = currentPts / (1000*1000);
+        Log::warn(TRACE_MEDIAPLAYBACK, "performAudioTrackCodecChannelSwitchRialto(): *pAudioChangeTargetPts: %lld", *pAudioChangeTargetPts);
+      }
+      else
+      {
+        Log::warn(TRACE_MEDIAPLAYBACK, "performAudioTrackCodecChannelSwitchRialto(): *pAudioChangeTargetPts use *currentDispPts: %lld", *pAudioChangeTargetPts);
+      }
+    }
+
+    return true;
+}
diff --git a/partner/dpi/gstreamer/ESPlayerGstGenericPort.h b/partner/dpi/gstreamer/ESPlayerGstGenericPort.h
index 3a725b0..bfb7ed2 100644
--- a/partner/dpi/gstreamer/ESPlayerGstGenericPort.h
+++ b/partner/dpi/gstreamer/ESPlayerGstGenericPort.h
@@ -126,6 +126,12 @@ public:
     void UnregisterCallbacksToAppSrc();
     uint32_t getMinBuffersBeforeReady();
     void ProcessAudioGap(const ISampleAttributes *pSampleAttr);
+    bool performAudioTrackCodecChannelSwitchRialto(struct rdk_gstreamer_utils::rdkGstreamerUtilsPlaybackGrp *pgstUtilsPlaybackGroup,
+                                                   const void *pSampleAttr, rdk_gstreamer_utils::AudioAttributes *pAudioAttr,
+                                                   uint32_t *pStatus, unsigned int *pui32Delay,
+                                                   llong *pAudioChangeTargetPts, const llong *pcurrentDispPts,
+                                                   unsigned int *audio_change_stage, GstCaps **appsrcCaps,
+                                                   bool *audioaac, bool svpenabled, GstElement *aSrc, bool *ret);
     std::shared_ptr<SampleWriterNative> mSampleWriter;
     MediaType mMediaType;
     unsigned int _current_data;
diff --git a/partner/dpi/gstreamer/PlaybackGroupNative.cpp b/partner/dpi/gstreamer/PlaybackGroupNative.cpp
index 3c7d557..652f4aa 100644
--- a/partner/dpi/gstreamer/PlaybackGroupNative.cpp
+++ b/partner/dpi/gstreamer/PlaybackGroupNative.cpp
@@ -34,7 +34,7 @@ extern void ApplicationManagerContentStopped(void);
 #if defined(GST_GL)
 #include "VideoSinkGStreamer.h"
 #endif
-#define VIDEO_SINK_NAME "westerossink"
+#define VIDEO_SINK_NAME "rialtomsevideosink"
 #define VIDEO_DECODER_NAME "westerossink"
 #define TOO_FAR_AHEAD_THRESHOLD_SECONDS 20
 #define UHD_WITDH   3840
@@ -304,7 +304,7 @@ PlaybackGroupNative::PlaybackGroupNative(ESManagerNative& ESManager, uint32_t pi
     Log::info(TRACE_MEDIACONTROL, "Enabling audio downmixing to stereo");
     g_object_set(mGstPipeline, "audio-filter", capsfilter, NULL);
   }
-  mVideoSink = createWesterosSink();
+  mVideoSink = nullptr;
 #if defined(GST_GL)
   mVideoSinkGst.reset(new VideoSinkGStreamer());
   g_object_set(mGstPipeline, "video-sink", mVideoSinkGst->createVideoSink(), NULL);
@@ -456,6 +456,7 @@ PlaybackGroupNative::~PlaybackGroupNative()
     if (mSource)
       gst_object_unref(mSource);
     GstServer::instance()->disconnect();
+
 #if defined(WESTEROS_SINK) && (defined(GIBBON_GRAPHICSENGINE_WAYLAND) || defined(GIBBON_EVENTLOOP_WAYLAND))
     gibbon::WaylandDisplay::instance()->disconnect();
 #endif
diff --git a/partner/dpi/gstreamer/ocdm/CMakeLists.txt b/partner/dpi/gstreamer/ocdm/CMakeLists.txt
index f9f8d78..3555d12 100644
--- a/partner/dpi/gstreamer/ocdm/CMakeLists.txt
+++ b/partner/dpi/gstreamer/ocdm/CMakeLists.txt
@@ -88,11 +88,11 @@ endif ()
 if (DPI_REFERENCE_DRM_OCDM)
     set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${HAVE_DPI_DIRECTORY}/ocdm)
     add_library(drmocdm ${LIBRARY_TYPE} ${PLAYREADY_SOURCES})
-    target_link_libraries(drmocdm ocdm gstreamer-1.0 glib-2.0 gobject-2.0 gstaudio-1.0 gstapp-1.0 gstvideo-1.0 gstbase-1.0 WPEFrameworkProtocols WPEFrameworkDefinitions WPEFrameworkCore WPEFrameworkTracing )
+    target_link_libraries(drmocdm ocdmRialto gstreamer-1.0 glib-2.0 gobject-2.0 gstaudio-1.0 gstapp-1.0 gstvideo-1.0 gstbase-1.0 WPEFrameworkProtocols WPEFrameworkDefinitions WPEFrameworkCore WPEFrameworkTracing )
     target_include_directories(drmocdm PUBLIC ${CMAKE_CURRENT_LIST_DIR})
     target_compile_options(drmocdm PRIVATE -fvisibility=hidden)
     set_target_properties(drmocdm PROPERTIES OUTPUT_NAME "drmsystem")
-
+    target_compile_options(drmocdm PUBLIC -DPLAYREADY -DPLAYREADY4_0 -DDRM_BUILD_PROFILE=900 -DDRM_SUPPORT_ASSEMBLY=0 -DDRM_SUPPORT_DATASTORE_PREALLOC=1 -DDRM_SUPPORT_ECCPROFILING=0 -DDRM_SUPPORT_FORCE_ALIGN=1 -DDRM_SUPPORT_INLINEDWORDCPY=0 -DDRM_SUPPORT_FILE_LOCKING=1 -DDRM_SUPPORT_MULTI_THREADING=0 -DDRM_SUPPORT_NATIVE_64BIT_TYPES=1 -DDRM_SUPPORT_PRECOMPUTE_GTABLE=1 -DDRM_SUPPORT_SECUREOEMHAL=0 -DDRM_SUPPORT_SECUREOEMHAL_PLAY_ONLY=0 -DDRM_SUPPORT_TRACING=1 -DDRM_SUPPORT_TOOLS_NET_IO=0 -DDRM_COMPILE_FOR_NORMAL_WORLD=0 -DDRM_COMPILE_FOR_SECURE_WORLD=1)
     set_target_properties(drmocdm PROPERTIES ADDITIONAL_CLEAN_FILES ${HAVE_DPI_DIRECTORY}/ocdm)
 
     if (DPI_REFERENCE_DRM_DO_PLUGIN)