morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

update for uxplay 1.51 rearranged rpi options

Browse Source
This commit is contained in:
fduncanh
2022-04-24 21:13:30 -04:00
parent f373fb2edc
commit 8179a602c4
7 changed files with 1070 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
uxplay.cpp
View File

@@ -44,7 +44,7 @@
#include "renderers/video_renderer.h"
#include "renderers/audio_renderer.h"
#define VERSION "1.50"
#define VERSION "1.51"
#define DEFAULT_NAME "UxPlay"
#define DEFAULT_DEBUG_LOG false
@@ -323,9 +323,10 @@ static void print_info (char *name) {
printf(" some choices: ximagesink,xvimagesink,vaapisink,glimagesink,\n");
printf(" gtksink,waylandsink,osximagesink,kmssink,fpsdisplaysink etc.\n");
printf("-vs 0 Streamed audio only, with no video display window\n");
printf("-rpi Raspberry Pi \"Lite\" GPU video with KMS frame buffer.\n");
printf("-rpigl Raspberry Pi GPU video with OpenGL.\n");
printf("-rpiwl Raspberry Pi GPU video with Wayland compositor.\n");
printf("-v4l2 Use Video4Linux2 for GPU hardware h264 decoding\n");
printf("-rpi Same as \"-v4l2\" (for RPi=Raspberry Pi).\n");
printf("-rpifb Same as \"-v4l2 -vs kmssink\" for RPi using framebuffer.\n");
printf("-rpiwl Same as \"-v4l2 -vs waylandsink\" for RPi using Wayland.\n");
printf("-avdec Force software h264 video decoding with libav decoder\n");
printf("-as ... Choose the GStreamer audiosink; default \"autoaudiosink\"\n");
printf(" choices: pulsesink,alsasink,osssink,oss4sink,osxaudiosink\n");
@@ -584,13 +585,18 @@ int main (int argc, char *argv[]) {
video_decoder = "avdec_h264";
video_converter.erase();
video_converter = "videoconvert";
} else if (arg == "-rpigl") {
} else if (arg == "-v4l2" || arg == "rpi") {
video_decoder.erase();
video_decoder = "v4l2h264dec";
video_converter.erase();
video_converter = "v4l2convert";
} else if (arg == "-rpifb") {
video_decoder.erase();
video_decoder = "v4l2h264dec";
video_converter.erase();
video_converter = "v4l2convert";
videosink.erase();
videosink = "glimagesink";
videosink = "kmssink";
} else if (arg == "-rpiwl" ) {
video_decoder.erase();
video_decoder = "v4l2h264dec";
@@ -696,7 +702,7 @@ int main (int argc, char *argv[]) {
}
if (use_video) {
video_renderer_init(render_logger, server_name.c_str(), videoflip, video_parser.c_str(),
video_renderer_init(render_logger, server_name.c_str(), videoflip, video_parser.c_str(),
video_decoder.c_str(), video_converter.c_str(), videosink.c_str());
video_renderer_start();
}