[M94 Migration][DA] Inject seek after changing playback rate.

Ref: https://review.tizen.org/gerrit/#/c/230143/

Change-Id: I7f5fed5a099d278dd6dcadf70718c3cc90f568b6
Signed-off-by: Hrithik Mohan <h.puchakayal@samsung.com>

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
index 17169b7e119f2f77e712fdb68899502627acdee3..8e4d57ff417ba7db07e3770157e08003211386b4 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
+++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.cc
@@ -660,6 +660,8 @@ MediaSourcePlayerCapi::MediaSourcePlayerCapi(
       seeking_data_pushed_(true),
       first_pts_seeking_(base::TimeDelta()),
       first_data_type_(DemuxerStream::UNKNOWN),
+#endif
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
       time_to_report_(base::TimeDelta()),
 #endif
       is_demuxer_state_reported_(false),
@@ -821,7 +823,7 @@ void MediaSourcePlayerCapi::SetRate(double rate) {
 
   if (need_play)
     Play();
-#if defined(OS_TIZEN_TV_PRODUCT)
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
   else
     Seek(cached_current_time_);
 #endif
@@ -900,7 +902,7 @@ void MediaSourcePlayerCapi::SeekInternal() {
     return;
   }
 
-#if defined(OS_TIZEN_TV_PRODUCT)
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
   cached_current_time_ = seek_offset_;
   time_to_report_ = seek_offset_;
 #else
@@ -994,7 +996,7 @@ void MediaSourcePlayerCapi::SetVolume(double volume) {
 
 base::TimeDelta MediaSourcePlayerCapi::GetCurrentTime() {
   base::TimeDelta position;
-#if defined(OS_TIZEN_TV_PRODUCT)
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
   if (seek_state_ == MEDIA_SEEK_PLAYER) {
     position = time_to_report_;
   } else {
@@ -1004,7 +1006,7 @@ base::TimeDelta MediaSourcePlayerCapi::GetCurrentTime() {
       LOG(ERROR) << "player_get_play_position failed. Error #" << err;
       return base::TimeDelta();
     }
-#if defined(OS_TIZEN_TV_PRODUCT)
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
   }
   cached_current_time_ = position;
 #endif

diff --git a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
index 07f142d7ef18c4a91418d046b4db3425848dfef8..578caec8bef2ecaeca6737d2fb09ab5b5281382c 100644 (file)
--- a/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
+++ b/tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
@@ -409,18 +409,21 @@ class MEDIA_EXPORT MediaSourcePlayerCapi : public MediaPlayerEfl,
   bool seeking_data_pushed_;
   base::TimeDelta first_pts_seeking_;
   DemuxerStream::Type first_data_type_;
-  base::TimeDelta time_to_report_;
   player_media_stream_audio_extra_info_s audio_extra_info_;
   player_media_stream_video_extra_info_s video_extra_info_;
   std::vector<uint8_t> video_codec_extra_data_;
   std::vector<uint8_t> audio_codec_extra_data_;
   std::string hdr_info_;
   player_drm_type_e drm_type_;
-  base::TimeDelta cached_current_time_;
   bool flushing_{false};
   bool need_report_conflict_position_{false};
   int64_t conflict_position_{0};
 #endif
+
+#if defined(OS_TIZEN_TV_PRODUCT) || defined(OS_TIZEN_DA_PRODUCT)
+  base::TimeDelta cached_current_time_;
+  base::TimeDelta time_to_report_;
+#endif
   bool is_demuxer_state_reported_;
   // Set to true only with encrypted stream after OnDemuxerWaitingForCdm and
   // before reporting meta data in OnDemuxerConfigsAvailable. Indicates that