From 23aa769387d536e11641b7c29c8addd7d862e633 Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Thu, 8 Aug 2024 21:39:30 +0200 Subject: [PATCH] DEFCONFIG: enable all important FFMPEG options - quick correction for https://github.com/MiyooCFW/buildroot/pull/117 - also disable nonfree dependencies (openssl & libfdk-aac) --- board/miyoo/main/apps/ffmpeg/ffplay_launch.sh | 2 +- board/miyoo/main/apps/ffmpeg/video_record.sh | 7 ++++++- configs/miyoo_musl_defconfig | 12 +++++------- configs/miyoo_musl_static_defconfig | 12 +++++------- configs/miyoo_uclibc_defconfig | 12 +++++------- configs/miyoo_uclibc_static_defconfig | 12 +++++------- 6 files changed, 27 insertions(+), 30 deletions(-) diff --git a/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh b/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh index 19f7e835..5b77b971 100755 --- a/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh +++ b/board/miyoo/main/apps/ffmpeg/ffplay_launch.sh @@ -17,5 +17,5 @@ else echo -en "Invalid video/audio format!" # We're using SDL terminal to display above echo msg ## because all stdout is parsed to /dev/null from gmenu2x and it's child ps - st -k -e "/bin/sh" "-c" "echo -e \"\n\n\n\n\n\n\t\t\tInvalid video or audio format!\nExiting...\"; read -t 5" + st -k -e "/bin/sh" "-c" "echo -e \"\n\n\n\n\n\n\t\t\tInvalid video or audio format!\n\t\t\tExiting...\"; read -t 5" fi diff --git a/board/miyoo/main/apps/ffmpeg/video_record.sh b/board/miyoo/main/apps/ffmpeg/video_record.sh index 650338bb..d0b950e5 100755 --- a/board/miyoo/main/apps/ffmpeg/video_record.sh +++ b/board/miyoo/main/apps/ffmpeg/video_record.sh @@ -14,5 +14,10 @@ else ffmpeg -f fbdev -r 10 -i /dev/fb0 -vf "format=yuv420p"\ -c:v libx264 -preset ultrafast -framerate 10 "${OUTPUTDIR}/video_$(date +%Y%m%d%H%M%S).mp4" -nostdin -loglevel warning & # Wait a few seconds before actual screen record, the X264 encoder needs resources before it will stabilize video ouput - st_exec_func "echo -e \"\n\n\n\n\n\n\t\t\tStarting VIDEO record...\n\t\t\tWait a few seconds to start.\"; read -t 10" + st_exec_func "echo -e \"\n\n\n\n\n\n\t\t\tStarting VIDEO record...\n\t\t\tWait a few seconds to start.\"; read -t 10;\ + if pgrep ffmpeg >/dev/null; then\ + echo -e \"\n\n\t\t\tRecording VIDEO in background...\";\ + else\ + echo -e \"\n\n\t\t\tFailed to launch ffmpeg for record...\";\ + fi; read -t 2" fi diff --git a/configs/miyoo_musl_defconfig b/configs/miyoo_musl_defconfig index 75a92d60..1f473707 100644 --- a/configs/miyoo_musl_defconfig +++ b/configs/miyoo_musl_defconfig @@ -40,19 +40,17 @@ BR2_PACKAGE_ESPEAK=y BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA=y BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y -BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le png vorbis zlib" -BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo opus png vorbis h264 hevc vc1" -BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi ffm h264 hevc mp3 mp4 mpeg1video mpeg2video mpegts ogg rtp" -BR2_PACKAGE_FFMPEG_DEMUXERS="avi flac matroska mov mp3 mpegps mpegts mpegvideo ogg" -BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo vc1" +BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls libx264 libx264rgb mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le pcm_s16le_planar png rawvideo vorbis wavpack zlib" +BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo png h264 hevc vc1 opus pcm_s16be pcm_s16le pcm_s16le_planar rawvideo vorbis wavpack yuv4 zlib" +BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi flac ffm h264 hevc matroska ogg opus mov mp3 mp4 mpeg1video mpeg2video mpegts m4v pcm_s16be pcm_s16le rawvideo rtp wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_DEMUXERS="avi h264 flac matroska mov mp3 mpegps mpegts mpegvideo ogg pcm_s16be pcm_s16le rawvideo wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo opus vc1 vorbis" BR2_PACKAGE_FFMPEG_BSFS="" BR2_PACKAGE_FFMPEG_PROTOCOLS="file" -BR2_PACKAGE_FFMPEG_FILTERS="" BR2_PACKAGE_FFMPEG_EXTRACONF="--enable-small" BR2_PACKAGE_MPG123=y BR2_PACKAGE_VORBIS_TOOLS=y diff --git a/configs/miyoo_musl_static_defconfig b/configs/miyoo_musl_static_defconfig index 1bdb6114..de336730 100644 --- a/configs/miyoo_musl_static_defconfig +++ b/configs/miyoo_musl_static_defconfig @@ -24,19 +24,17 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y -BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le png vorbis zlib" -BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo opus png vorbis h264 hevc vc1" -BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi ffm h264 hevc mp3 mp4 mpeg1video mpeg2video mpegts ogg rtp" -BR2_PACKAGE_FFMPEG_DEMUXERS="avi flac matroska mov mp3 mpegps mpegts mpegvideo ogg" -BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo vc1" +BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls libx264 libx264rgb mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le pcm_s16le_planar png rawvideo vorbis wavpack zlib" +BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo png h264 hevc vc1 opus pcm_s16be pcm_s16le pcm_s16le_planar rawvideo vorbis wavpack yuv4 zlib" +BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi flac ffm h264 hevc matroska ogg opus mov mp3 mp4 mpeg1video mpeg2video mpegts m4v pcm_s16be pcm_s16le rawvideo rtp wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_DEMUXERS="avi h264 flac matroska mov mp3 mpegps mpegts mpegvideo ogg pcm_s16be pcm_s16le rawvideo wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo opus vc1 vorbis" BR2_PACKAGE_FFMPEG_BSFS="" BR2_PACKAGE_FFMPEG_PROTOCOLS="file" -BR2_PACKAGE_FFMPEG_FILTERS="" BR2_PACKAGE_FFMPEG_EXTRACONF="--enable-small" BR2_PACKAGE_FLITE=y BR2_PACKAGE_FLUIDLITE=y diff --git a/configs/miyoo_uclibc_defconfig b/configs/miyoo_uclibc_defconfig index 2180ce21..b906978b 100644 --- a/configs/miyoo_uclibc_defconfig +++ b/configs/miyoo_uclibc_defconfig @@ -40,19 +40,17 @@ BR2_PACKAGE_ESPEAK=y BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA=y BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y -BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le png vorbis zlib" -BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo opus png vorbis h264 hevc vc1" -BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi ffm h264 hevc mp3 mp4 mpeg1video mpeg2video mpegts ogg rtp" -BR2_PACKAGE_FFMPEG_DEMUXERS="avi flac matroska mov mp3 mpegps mpegts mpegvideo ogg" -BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo vc1" +BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls libx264 libx264rgb mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le pcm_s16le_planar png rawvideo vorbis wavpack zlib" +BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo png h264 hevc vc1 opus pcm_s16be pcm_s16le pcm_s16le_planar rawvideo vorbis wavpack yuv4 zlib" +BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi flac ffm h264 hevc matroska ogg opus mov mp3 mp4 mpeg1video mpeg2video mpegts m4v pcm_s16be pcm_s16le rawvideo rtp wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_DEMUXERS="avi h264 flac matroska mov mp3 mpegps mpegts mpegvideo ogg pcm_s16be pcm_s16le rawvideo wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo opus vc1 vorbis" BR2_PACKAGE_FFMPEG_BSFS="" BR2_PACKAGE_FFMPEG_PROTOCOLS="file" -BR2_PACKAGE_FFMPEG_FILTERS="" BR2_PACKAGE_FFMPEG_EXTRACONF="--enable-small" BR2_PACKAGE_MPG123=y BR2_PACKAGE_VORBIS_TOOLS=y diff --git a/configs/miyoo_uclibc_static_defconfig b/configs/miyoo_uclibc_static_defconfig index ab879289..92e98402 100644 --- a/configs/miyoo_uclibc_static_defconfig +++ b/configs/miyoo_uclibc_static_defconfig @@ -24,19 +24,17 @@ BR2_PACKAGE_ALSA_UTILS_APLAY=y BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y BR2_PACKAGE_FFMPEG=y BR2_PACKAGE_FFMPEG_GPL=y -BR2_PACKAGE_FFMPEG_NONFREE=y BR2_PACKAGE_FFMPEG_FFPLAY=y BR2_PACKAGE_FFMPEG_FFPROBE=y BR2_PACKAGE_FFMPEG_AVRESAMPLE=y BR2_PACKAGE_FFMPEG_POSTPROC=y -BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le png vorbis zlib" -BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo opus png vorbis h264 hevc vc1" -BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi ffm h264 hevc mp3 mp4 mpeg1video mpeg2video mpegts ogg rtp" -BR2_PACKAGE_FFMPEG_DEMUXERS="avi flac matroska mov mp3 mpegps mpegts mpegvideo ogg" -BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo vc1" +BR2_PACKAGE_FFMPEG_ENCODERS="ac3 jpegls libx264 libx264rgb mpeg1video mpeg2video mpeg4 pcm_s16be pcm_s16le pcm_s16le_planar png rawvideo vorbis wavpack zlib" +BR2_PACKAGE_FFMPEG_DECODERS="ac3 flac jpegls mp2 mp3 mpeg1video mpeg2video mpeg4 mpegvideo png h264 hevc vc1 opus pcm_s16be pcm_s16le pcm_s16le_planar rawvideo vorbis wavpack yuv4 zlib" +BR2_PACKAGE_FFMPEG_MUXERS="ac3 avi flac ffm h264 hevc matroska ogg opus mov mp3 mp4 mpeg1video mpeg2video mpegts m4v pcm_s16be pcm_s16le rawvideo rtp wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_DEMUXERS="avi h264 flac matroska mov mp3 mpegps mpegts mpegvideo ogg pcm_s16be pcm_s16le rawvideo wav yuv4mpegpipe" +BR2_PACKAGE_FFMPEG_PARSERS="aac flac ac3 h264 hevc mpegaudio mpeg4video mpegvideo opus vc1 vorbis" BR2_PACKAGE_FFMPEG_BSFS="" BR2_PACKAGE_FFMPEG_PROTOCOLS="file" -BR2_PACKAGE_FFMPEG_FILTERS="" BR2_PACKAGE_FFMPEG_EXTRACONF="--enable-small" BR2_PACKAGE_FLUIDLITE=y BR2_PACKAGE_MPG123=y