Skip to content

Commit

Permalink
add filesize and encode to mp4
Browse files Browse the repository at this point in the history
mediafie: add filesize in text. change encode to mp4
main: set version to 0.5.2.3
primayprocess.txt: improve
  • Loading branch information
ewoudwijma committed Nov 5, 2020
1 parent e3582dd commit 2292df7
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 25 deletions.
2 changes: 1 addition & 1 deletion MediaSidekick.pro.user
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.13.2, 2020-10-08T17:15:41. -->
<!-- Written by QtCreator 4.13.2, 2020-10-31T20:54:48. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
Expand Down
8 changes: 4 additions & 4 deletions agmediafilerectitem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,12 @@ void AGMediaFileRectItem::setTextItem(QTime time, QTime totalTime)
subLogItem->setHtml(tr("<p>%1<span style=\"color:red\";>%2</span></p><p><small><i>%3</i></small></p><p><small><i>%4</i></small></p><p><small><i>%5</i></small></p>").arg(
fileInfo.fileName(), newString,
QTime::fromMSecsSinceStartOfDay(position).toString() + " / " + QTime::fromMSecsSinceStartOfDay(duration).toString() + createDateString,
ffmpegPropertyMap["Width"].value + " * " + ffmpegPropertyMap["Height"].value + " @ " + ffmpegPropertyMap["VideoFrameRate"].value + "fps",
ffmpegPropertyMap["Width"].value + " * " + ffmpegPropertyMap["Height"].value + " @ " + ffmpegPropertyMap["VideoFrameRate"].value + "fps (" + exiftoolPropertyMap["FileSize"].value + ")",
lastOutputString));
}
else if (AGlobal().audioExtensions.contains(fileInfo.suffix(), Qt::CaseInsensitive))
{
QString audioParams = exiftoolPropertyMap["AudioBitrate"].value + " / " + exiftoolPropertyMap["SampleRate"].value + " / " + exiftoolPropertyMap["ChannelMode"].value + " / " + exiftoolPropertyMap["AudioChannels"].value;
QString audioParams = exiftoolPropertyMap["AudioBitrate"].value + " / " + exiftoolPropertyMap["SampleRate"].value + " / " + exiftoolPropertyMap["ChannelMode"].value + " / " + exiftoolPropertyMap["AudioChannels"].value + " (" + exiftoolPropertyMap["FileSize"].value + ")";
subLogItem->setHtml(tr("<p>%1<span style=\"color:red\";>%2</span></p><p><small><i>%3</i></small></p><p><small><i>%4</i></small></p><p><small><i>%5</i></small></p>").arg(
fileInfo.fileName(), newString,
QTime::fromMSecsSinceStartOfDay(position).toString() + " / " + QTime::fromMSecsSinceStartOfDay(duration).toString(),
Expand Down Expand Up @@ -830,13 +830,13 @@ void AGMediaFileRectItem::onItemRightClicked(QPoint pos)
"<li><b>Example</b>: e.g. lossless trim of ReelSteady Go files results in files with incorrect length and incorrect keyframes. Use Trim Encode in this case!</li>"
"</ul>").arg(fileContextMenu->actions().last()->text()));

fileContextMenu->addAction(new QAction("Encode", fileContextMenu));
fileContextMenu->addAction(new QAction("Encode to MP4", fileContextMenu));
fileContextMenu->actions().last()->setIcon(QIcon(QPixmap::fromImage(QImage(":/Spinner.gif"))));
connect(fileContextMenu->actions().last(), &QAction::triggered, [=]()
{
initPlayer(false);

QString targetFileName = fileInfo.completeBaseName() + "EN." + fileInfo.suffix();
QString targetFileName = fileInfo.completeBaseName() + "EN.mp4";// + fileInfo.suffix();

QStringList ffmpegFiles;
QStringList ffmpegClips;
Expand Down
2 changes: 1 addition & 1 deletion main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ int main(int argc, char *argv[])

a.setOrganizationDomain("mediasidekick.org");
a.setApplicationName("Media Sidekick");
a.setApplicationVersion("0.5.2.2");
a.setApplicationVersion("0.5.2.3");

QSettings::setDefaultFormat(QSettings::IniFormat);
//C:\Users\<user>\AppData\Roaming\mediasidekick.org
Expand Down
48 changes: 29 additions & 19 deletions primaryprocess.txt
Original file line number Diff line number Diff line change
@@ -1,34 +1,44 @@
Primary process
- (delete ini file)
- Install MSK
- Start MSK
- Select folder
- Zoom in / out
- Install MSK (mediasidekick.org -> github releases)
- Start MSK (start, scroll to M)
- Full screen
- Select folder (schakenbosch)
- resize window
- Select video
- Play video
- Increase / decrease volume
- Increase / decrease speed
- Slider (shift-left-mouse)
- Stop
- Slider (drag)
- (Stop)
- Add clip
- change in
- change out
- Add another 2 clips
- Undo / Redo
- Add rating
- Add keywords
- stop clips
- Save
- Enter filter
- Download from youtube
- Add clips matching length
- Zoom in / out (to see created exports)

- toggle views, go to Timeline view
- Open export window
- Set transition Time
- Download from youtube
- Add clips matching length
- Show scales
- Zoom out (to see created exports)
- Export set watermark
- Set transition Time
- Export lossless and play
- Export set watermark
- Export encode and play
- Export shotcut and play
- Export shotcut and play (open app)
- Export premiere and play


*********

Video
- (Increase / decrease volume)
- (Increase / decrease speed)
Clips
- Undo / Redo
- Add rating
- Add keywords
- Enter filter

App
- Show scales

0 comments on commit 2292df7

Please sign in to comment.