Skip to content
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

Movie import #1258

Merged
merged 20 commits into from
May 7, 2020
Merged

Movie import #1258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2109f8f
Add movie importing features
scribblemaniac Aug 31, 2019
ce079a8
Add ffprobe to CI builds
scribblemaniac Aug 31, 2019
4218c7a
Detect failed movie video import
scribblemaniac Aug 31, 2019
1bb7f1b
Add cancel to movie import and audio mixing step of movie export
scribblemaniac Aug 31, 2019
036bcd3
Add cancel to movie audio import
scribblemaniac Aug 31, 2019
e8593f1
Add progress updates and cancel to numbered image sequence import
scribblemaniac Aug 31, 2019
5aa5fdc
Added support for many new audio formats
scribblemaniac Sep 7, 2019
45aaada
Create a Movies import format that matches all supported extensions
scribblemaniac Sep 14, 2019
52c2fb9
Make ffprobe optional by default and don't include by default
scribblemaniac Sep 14, 2019
3650d8a
Merge branch 'master' into movie-import
scribblemaniac Mar 4, 2020
0dc229c
Write to disk during movie import
scribblemaniac Mar 4, 2020
d458c10
Change ffmpeg-based duration detection
scribblemaniac Mar 4, 2020
3b4aa3a
Add some checks and TODOs to the movie importer
scribblemaniac Mar 4, 2020
055e626
Delete temporary folders on closing without saving
scribblemaniac Mar 4, 2020
9804aec
Merge branch 'master' into pr-1258-changes
MrStevns May 4, 2020
5a7257b
Move MovieImport Logic into MovieImporter class and decouple UI from …
MrStevns May 6, 2020
df12488
Rename verifyFFMPEG -> verifyFFmpegExists
MrStevns May 6, 2020
ea33310
Refactor movie importer...again
scribblemaniac May 7, 2020
1dc3ade
Fix blank dialog when cancelling movie import
scribblemaniac May 7, 2020
514f130
Remove unnecessary QProgressDialog reference in Editor
scribblemaniac May 7, 2020
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
Prev Previous commit
Next Next commit
Add ffprobe to CI builds
  • Loading branch information
@scribblemaniac
scribblemaniac committed Aug 31, 2019
commit ce079a86450a8b0f50be8b381368b8093c5411f2
10 changes: 9 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ after_success:
echo "Creating AppImage...";
sed -i "/^Keywords\(\[[a-zA-Z_.@]\+\]\)\?=/d;/^Version=/cVersion=1.0" Pencil2D/usr/share/applications/pencil2d.desktop;
install -Dm755 /usr/bin/ffmpeg Pencil2D/usr/plugins/ffmpeg;
install -Dm755 /usr/bin/ffmpeg Pencil2D/usr/plugins/ffprobe;
curl -fsSLO https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage;
chmod 755 linuxdeployqt-continuous-x86_64.AppImage;
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/pulseaudio" ./linuxdeployqt-continuous-x86_64.AppImage Pencil2D/usr/share/applications/pencil2d.desktop -executable=Pencil2D/usr/plugins/ffmpeg -extra-plugins=iconengines/libqsvgicon.so -appimage;
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/lib/x86_64-linux-gnu/pulseaudio" ./linuxdeployqt-continuous-x86_64.AppImage Pencil2D/usr/share/applications/pencil2d.desktop -executable=Pencil2D/usr/plugins/ffmpeg -executable=Pencil2D/usr/plugins/ffprobe -extra-plugins=iconengines/libqsvgicon.so -appimage;
mv Pencil2D*.AppImage* "pencil2d-linux-$(date +"%Y-%m-%d").AppImage";
fi'
- 'if [ "$TRAVIS_OS_NAME" == "osx" ]; then
Expand All @@ -123,6 +124,13 @@ after_success:
gpg --verify ffmpeg.7z.sig ffmpeg.7z;
7z x ffmpeg.7z -o"Pencil2D.app/Contents/MacOS/plugins";
rm ffmpeg.7z ffmpeg.7z.sig;

echo "Copying ffprobe plugin";
wget -O ffprobe.7z https://evermeet.cx/ffmpeg/getrelease/ffprobe/7z;
wget -O ffprobe.7z.sig https://evermeet.cx/ffmpeg/getrelease/ffprobe/7z/sig;
gpg --verify ffprobe.7z.sig ffprobe.7z;
7z x ffprobe.7z -o"Pencil2D.app/Contents/MacOS/plugins";
rm ffprobe.7z ffprobe.7z.sig;

echo "Copying necessary Qt frameworks";
macdeployqt Pencil2D.app;
Expand Down
4 changes: 3 additions & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ after_build:
echo "Copying ffmpeg plugin" &
call curl.exe -o bin\plugins\ffmpeg-4.1.1-win32-static.zip "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-4.1.1-win32-static.zip" &
call 7z.exe x bin\plugins\ffmpeg-4.1.1-win32-static.zip -o"bin\plugins" &
echo "move ffmpeg.exe and delete ffmpeg leftovers" &
echo "move ffmpeg.exe and ffprobe.exe and delete leftovers" &
del bin\plugins\ffmpeg-4.1.1-win32-static.zip &
move /y bin\plugins\ffmpeg-4.1.1-win32-static\bin\ffmpeg.exe bin\plugins &
move /y bin\plugins\ffmpeg-4.1.1-win32-static\bin\ffprobe.exe bin\plugins &
rmdir /q /s bin\plugins\ffmpeg-4.1.1-win32-static &
echo "copying qt libraries" &
windeployqt bin\pencil2d.exe &
Expand All @@ -99,6 +100,7 @@ after_build:
echo "move ffmpeg.exe and delete ffmpeg leftovers" &
del bin\plugins\ffmpeg-4.1.1-win64-static.zip &
move /y bin\plugins\ffmpeg-4.1.1-win64-static\bin\ffmpeg.exe bin\plugins &
move /y bin\plugins\ffmpeg-4.1.1-win64-static\bin\ffprobe.exe bin\plugins &
rmdir /q /s bin\plugins\ffmpeg-4.1.1-win64-static &
echo "copying qt libraries" &
windeployqt bin\pencil2d.exe &
Expand Down