Skip to content

Commit 964036b

Browse files
committed
Update
Signed-off-by: Abraham Arce <[email protected]>
1 parent 6723a80 commit 964036b

File tree

3 files changed

+37
-1
lines changed

3 files changed

+37
-1
lines changed

Hochob/Services/Memories/Memories.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ then
4141
cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg
4242

4343
if [ "$LOCAL_VIDEO" = "on" ]; then
44-
Ffmpeg.sh $FSWEBCAM_DIRECTORY
44+
FfmpegImageVideo.sh $FSWEBCAM_DIRECTORY
4545
cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME
4646
cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4
4747
fi
+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/bin/sh
2+
3+
set -x
4+
5+
# =============================================================================
6+
# Variables
7+
# =============================================================================
8+
9+
#. ~/CodeLabs/Hochob/Main.sh
10+
11+
export FFMPEG_PID=$$
12+
export FFMPEG_BINARY=ffmpeg
13+
export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy"
14+
15+
LOCAL_AUDIO=$1
16+
LOCAL_DIRECTORY="$2"
17+
18+
# =============================================================================
19+
# Functions
20+
# =============================================================================
21+
22+
# None
23+
24+
# =============================================================================
25+
# Main
26+
# =============================================================================
27+
28+
if [ $# -eq 2 ]
29+
then
30+
$FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO
31+
else
32+
echo "Invalid number of arguments, see Documentation"
33+
exit 1
34+
fi
35+
36+
# End of File

0 commit comments

Comments
 (0)