Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Options for start and end paused #669

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Options for start and end paused #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f17683
Added function start-paused
bholmes451 Mar 13, 2017
13d6db7
Merge branch 'master' of https://github.com/bholmes451/omxplayer into…
dronus Dec 9, 2018
8af810c
Added --end-paused option to pause on last frame
Dec 9, 2018
5cead73
removed three obsolete commented out lines
dronus Dec 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ Usage: omxplayer [OPTIONS] [FILE]
--user-agent 'ua' Send specified User-Agent as part of HTTP requests
--lavfdopts 'opts' Options passed to libavformat, e.g. 'probesize:250000,...'
--avdict 'opts' Options passed to demuxer, e.g., 'rtsp_transport:tcp,...'
--start-paused Immediately pause the video after loading, will wait for dbus or key command to play
--end-paused Pause the video on the last frame indefinitely

For example:

Expand Down
30 changes: 27 additions & 3 deletions omxplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ bool m_has_audio = false;
bool m_has_subtitle = false;
bool m_gen_log = false;
bool m_loop = false;
bool m_start_paused = false;
bool m_end_paused = false;

enum{ERROR=-1,SUCCESS,ONEBYTE};

Expand Down Expand Up @@ -569,6 +571,8 @@ int main(int argc, char *argv[])
const int http_user_agent_opt = 0x301;
const int lavfdopts_opt = 0x400;
const int avdict_opt = 0x401;
const int start_paused = 0x214;
const int end_paused = 0x215;

struct option longopts[] = {
{ "info", no_argument, NULL, 'i' },
Expand Down Expand Up @@ -618,6 +622,8 @@ int main(int argc, char *argv[])
{ "key-config", required_argument, NULL, key_config_opt },
{ "no-osd", no_argument, NULL, no_osd_opt },
{ "no-keys", no_argument, NULL, no_keys_opt },
{ "start-paused", no_argument, NULL, start_paused },
{ "end-paused", no_argument, NULL, end_paused },
{ "orientation", required_argument, NULL, orientation_opt },
{ "fps", required_argument, NULL, fps_opt },
{ "live", no_argument, NULL, live_opt },
Expand Down Expand Up @@ -765,6 +771,12 @@ int main(int argc, char *argv[])
case no_keys_opt:
m_no_keys = true;
break;
case start_paused:
m_start_paused = true;
break;
case end_paused:
m_end_paused = true;
break;
case font_opt:
m_font_path = optarg;
m_asked_for_font = true;
Expand Down Expand Up @@ -1736,8 +1748,19 @@ int main(int argc, char *argv[])
{
if (m_av_clock->OMXIsPaused())
{
CLog::Log(LOGDEBUG, "Resume %.2f,%.2f (%d,%d,%d,%d) EOF:%d PKT:%p\n", audio_fifo, video_fifo, audio_fifo_low, video_fifo_low, audio_fifo_high, video_fifo_high, m_omx_reader.IsEof(), m_omx_pkt);
m_av_clock->OMXResume();
if (!m_start_paused)
{
CLog::Log(LOGDEBUG, "Resume %.2f,%.2f (%d,%d,%d,%d) EOF:%d PKT:%p\n", audio_fifo, video_fifo, audio_fifo_low, video_fifo_low, audio_fifo_high, video_fifo_high, m_omx_reader.IsEof(), m_omx_pkt);
m_av_clock->OMXResume();
}
else
{
CLog::Log(LOGDEBUG, "start-paused(%d)\n", m_start_paused);
m_av_clock->OMXResume();
m_Pause=true;
m_start_paused=false;
m_av_clock->OMXPause();
Comment on lines +1759 to +1762
Copy link

@DazB DazB Jun 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my own experiments, I've found that only m_Pause=true; is needed, and the player will see that variable has changed and pause once it loops around.

A previous edit of this comment that suggested m_av_clock->OMXResume(); and m_av_clock->OMXPause(); may cause unwanted effects seems to have been related to something else, so I have edited this comment.

However I still think that this suggestion is cleaner and less likely to cause issues.

Suggested change
m_av_clock->OMXResume();
m_Pause=true;
m_start_paused=false;
m_av_clock->OMXPause();
m_Pause=true;
m_start_paused=false;

Copy link

@zasnicoff zasnicoff Jun 29, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DazB Could you update your prepare-native-raspbian.sh script? Having trouble here trying to compile... It appears that some packages should be replaced: libva1 -> libva2; git-core -> git; libssl1.0-dev -> libssl-dev

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @zasnicoff. That's also an issue with omxplayer, and not to do with any changes I've made. I too had those issues when first compiling. I probably should update my own fork of prepare-native-raspbian.sh to remedy this, but since it only happens when first compiling I didn't get round to it. Appreciate the heads up.

}
}
}
else if (m_Pause || audio_fifo_low || video_fifo_low)
Expand Down Expand Up @@ -1791,7 +1814,8 @@ int main(int argc, char *argv[])
continue;
}

break;
if (!m_end_paused)
break;
}

if(m_has_video && m_omx_pkt && m_omx_reader.IsActive(OMXSTREAM_VIDEO, m_omx_pkt->stream_index))
Expand Down