Skip to content

Introduce default videosink/autosink options #2

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

Open
liuming50 wants to merge 1 commit into
base: MM_04.07.00_2205_L5.15.y
Choose a base branch
from
Open

Introduce default videosink/autosink options #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions gst/playback/gstplaysink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,10 @@ gen_video_chain (GstPlaySink * playsink, gboolean raw, gboolean async)
/* if default sink from config.h is different then try it too */
if (strcmp (DEFAULT_VIDEOSINK, "autovideosink")) {
GST_DEBUG_OBJECT (playsink, "trying " DEFAULT_VIDEOSINK);
elem = gst_element_factory_make (DEFAULT_VIDEOSINK, "videosink");
if (strchr (DEFAULT_VIDEOSINK, ' ') != NULL)
elem = gst_parse_bin_from_description (DEFAULT_VIDEOSINK, TRUE, NULL);
else
elem = gst_element_factory_make (DEFAULT_VIDEOSINK, "videosink");
chain->sink = try_element (playsink, elem, TRUE);
}
}
Expand Down Expand Up @@ -2713,7 +2716,10 @@ gen_audio_chain (GstPlaySink * playsink, gboolean raw)
/* if default sink from config.h is different then try it too */
if (strcmp (DEFAULT_AUDIOSINK, "autoaudiosink")) {
GST_DEBUG_OBJECT (playsink, "trying " DEFAULT_AUDIOSINK);
elem = gst_element_factory_make (DEFAULT_AUDIOSINK, "audiosink");
if (strchr (DEFAULT_AUDIOSINK, ' ') != NULL)
elem = gst_parse_bin_from_description (DEFAULT_AUDIOSINK, TRUE, NULL);
else
elem = gst_element_factory_make (DEFAULT_AUDIOSINK, "audiosink");
chain->sink = try_element (playsink, elem, TRUE);
}
}
Expand Down
5 changes: 2 additions & 3 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,8 @@ endif
core_conf.set_quoted('GST_PACKAGE_NAME', gst_package_name)
core_conf.set_quoted('GST_PACKAGE_ORIGIN', get_option('package-origin'))

# FIXME: These should be configure options
core_conf.set_quoted('DEFAULT_VIDEOSINK', 'autovideosink')
core_conf.set_quoted('DEFAULT_AUDIOSINK', 'autoaudiosink')
core_conf.set_quoted('DEFAULT_VIDEOSINK', get_option('defaultvideosink'))
core_conf.set_quoted('DEFAULT_AUDIOSINK', get_option('defaultaudiosink'))

# Set whether the audioresampling method should be detected at runtime
core_conf.set('AUDIORESAMPLE_FORMAT_' + get_option('audioresample_format').to_upper(), true)
Expand Down
5 changes: 5 additions & 0 deletions meson_options.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ option('opengl_module_name', type : 'string', value : '',
option('gles2_module_name', type : 'string', value : '',
description : 'The file to pass to g_module_open to open the libGLESv2 library (default: libGLESv2)')

option('defaultaudiosink', type : 'string', value : 'autoaudiosink',
description : 'The default audiosink')
option('defaultvideosink', type : 'string', value : 'autovideosink',
description : 'The default videosink')

# Feature option for opengl plugin and integration library
option('gl', type : 'feature', value : 'auto', description : 'OpenGL integration library and OpenGL plugin')
option('gl-graphene', type : 'feature', value : 'auto', description : 'Use Graphene in OpenGL plugin')
Expand Down
7 changes: 7 additions & 0 deletions tools/gst-play.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ play_new (gchar ** uris, const gchar * audio_sink, const gchar * video_sink,
else
g_warning ("Couldn't create specified audio sink '%s'", audio_sink);
}

if (video_sink != NULL) {
if (strchr (video_sink, ' ') != NULL)
sink = gst_parse_bin_from_description (video_sink, TRUE, NULL);
Expand Down Expand Up @@ -1674,6 +1675,12 @@ main (int argc, char **argv)
playlist_file = NULL;
}

if (audio_sink == NULL)
audio_sink = g_strdup(DEFAULT_AUDIOSINK);

if (video_sink == NULL)
video_sink = g_strdup(DEFAULT_VIDEOSINK);

if (playlist->len == 0 && (filenames == NULL || *filenames == NULL)) {
gst_printerr (_("Usage: %s FILE1|URI1 [FILE2|URI2] [FILE3|URI3] ..."),
"gst-play-" GST_API_VERSION);
Expand Down