From 3583a347c2b04f745a2bcb81be16616ca7a3d06f Mon Sep 17 00:00:00 2001 From: capta1nseal Date: Sun, 15 Sep 2024 06:56:29 +0300 Subject: [PATCH] Swap to -p full. --- convert-video.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/convert-video.sh b/convert-video.sh index 64e96cb..a311071 100755 --- a/convert-video.sh +++ b/convert-video.sh @@ -28,7 +28,15 @@ cd "${TMP_DIR}" ffmpeg -i "${INPUT}" -filter_complex "[0:a]channelsplit=channel_layout=stereo[left][right]" -map '[left]' -f s8 -ac 1 -ar 48k "${OUTPUT}/left.s8" -map '[right]' -f s8 -ac 1 -ar 48k "${OUTPUT}/right.s8" ffmpeg -i "${INPUT}" -vf fps=20 frame%04d.png +<<<<<<< HEAD ls frame*.png | parallel 'echo {}; python3 ${ORIG}/cc-pic.py -W 164 -H 81 -p cover {} ${OUTPUT}/{.}.cpi' +======= +ffmpeg -i $2.* -filter_complex "[0:a]channelsplit=channel_layout=stereo[left][right]" -map '[left]' -f s8 -ac 1 -ar 48k "${ORIG}/${NAME}/left.s8" -map '[right]' -f s8 -ac 1 -ar 48k "${ORIG}/${NAME}/right.s8" + +ffmpeg -i $2.* -vf fps=20 frame%04d.png +rm $2.* +ls frame*.png | parallel 'echo {}; python3 ${ORIG}/cc-pic.py -W 164 -H 81 -p full {} ${ORIG}/${NAME}/{.}.cpi' +>>>>>>> 544c8a9 (Swap to -p full.) rm frame*.png cd "${ORIG}" @@ -37,3 +45,8 @@ export FRAME_COUNT="$(ls ${OUTPUT}/*.cpi | wc -l)"; printf '{"frame_time": 0.05, "frame_count": %d, "video": "%s", "audio": {"l": "%s", "r": "%s"}}\n' "${FRAME_COUNT}" "${BASE_URL}/frame%04d.cpi" "${BASE_URL}/left.s8" "${BASE_URL}/right.s8" > "${OUTPUT}/info.json" +<<<<<<< HEAD +======= +#'{"frame_time": 0.05,"frame_count": ${FRAME_COUNT},"video": "${BASE_URL}/${NAME}/frame%04d.cpi","audio": {"l": "${BASE_URL}/${NAME}/left.s8", "r": "${BASE_URL}/${NAME}/right.s8"}}' > "${NAME}/${NAME}.json" +printf '{"frame_time": 0.05, "frame_count": %d, "video": "%s", "audio": {"l": "%s", "r": "%s"}}\n' "${FRAME_COUNT}" "${BASE_URL}/${NAME}/frame%04d.cpi" "${BASE_URL}/${NAME}/left.s8" "${BASE_URL}/${NAME}/right.s8" > "${NAME}/${NAME}.json" +>>>>>>> 544c8a9 (Swap to -p full.)