commit d5e2d758ca75f724d04497ee0cce2c04b496ff25
author Zhiqiang Han <zhiqiang.han@amlogic.com> Wed Jan 10 17:52:47 2024 +0800
committer gerrit autosubmit <gerrit.autosubmit@amlogic.com> Thu Jan 11 23:08:20 2024 -0700
tree ff212d05a7ff65e1900fa9b7ae40c81947e9f040
parent c43a4d28b733e8f6306c209c17335414c1a97fbd

trick: trick-pass only for SPEED [1/1]

PD#SWPL-145475

Problem:
incorrect check of trick-pass

Solution:
check trick-pass only for SPEED

Verify:
PB

Change-Id: I3c96b74e6e2c241d1926beb9539e4451d7bc6a67
Signed-off-by: Zhiqiang Han <zhiqiang.han@amlogic.com>

src/dvr_playback.c

diff --git a/src/dvr_playback.c b/src/dvr_playback.c
index b24bb14..c9217b9 100644
--- a/src/dvr_playback.c
+++ b/src/dvr_playback.c
@@ -1073,15 +1073,18 @@
       }
     }
 
-    if (player->cmd.cur_cmd == DVR_PLAYBACK_CMD_SEEK ||
-      player->cmd.cur_cmd == DVR_PLAYBACK_CMD_FF ||
-      player->cmd.cur_cmd == DVR_PLAYBACK_CMD_FB ||
-      player->speed > FF_SPEED ||player->speed <= FB_SPEED ||
-      (player->state == DVR_PLAYBACK_STATE_PAUSE) ||
-      (player->play_flag&DVR_PLAYBACK_STARTED_PAUSEDLIVE) == DVR_PLAYBACK_STARTED_PAUSEDLIVE)
+    #define __IS_SPEED() \
+      (player->cmd.cur_cmd == DVR_PLAYBACK_CMD_FF \
+      || player->cmd.cur_cmd == DVR_PLAYBACK_CMD_FB \
+      || player->speed > FF_SPEED ||player->speed <= FB_SPEED)
+
+    if (player->cmd.cur_cmd == DVR_PLAYBACK_CMD_SEEK
+      || __IS_SPEED()
+      || player->state == DVR_PLAYBACK_STATE_PAUSE
+      || (player->play_flag&DVR_PLAYBACK_STARTED_PAUSEDLIVE) == DVR_PLAYBACK_STARTED_PAUSEDLIVE)
     {
       trick_stat = _dvr_playback_get_trick_stat((DVR_PlaybackHandle_t)player);
-      if (trick_stat > 0 || (trick_stat <= 0 && _dvr_time_getClock() > player->next_fffb_time)) {
+      if (trick_stat > 0 || (__IS_SPEED() && _dvr_time_getClock() > player->next_fffb_time)) {
         DVR_PB_INFO("trick stat[%d], cur cmd[%d]last cmd[%d]flag[0x%x], now[%u]>next_fffb_time[%u]",
                      trick_stat, player->cmd.cur_cmd, player->cmd.last_cmd, player->play_flag, _dvr_time_getClock(), player->next_fffb_time);
         if (player->cmd.cur_cmd == DVR_PLAYBACK_CMD_SEEK || (player->play_flag&DVR_PLAYBACK_STARTED_PAUSEDLIVE) == DVR_PLAYBACK_STARTED_PAUSEDLIVE) {