Skip to content

Commit

Permalink
Formatted code.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggarra13
ggarra13 committed Apr 27, 2024
1 parent 89d64bc commit 9ce8bff
Show file tree
Hide file tree
Showing 62 changed files with 350 additions and 413 deletions.
16 changes: 6 additions & 10 deletions docs/release_template.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
mrv2 v1.1.2
mrv2 v1.1.4
========

mrv2 is an open source professional player and review tool for vfx, animation and computer graphics for Windows, Linux and macOS.

mrv2 updates Python to 3.11.9 to be in sync with VFX 2024 platform. It fixes
a JPEG incompatibility on Linux, improves the speed of drawing the timeline,
fixes some precision issues with annotations on the timeline and fixes the
refreshing of the cache to re-load frames as they are being rendered which had
gotten broken.
mrv2 is a major update on performance. Video playback performance has been sped up by about 120%, avoiding dropped frames. OpenColorIO or OpenEXRs with out-of-bounds values no longer clamp. Panning, zooming and annotations have also been improved in their performance.

Main Web page:
https://mrv2.sourceforge.io
Expand All @@ -19,16 +15,16 @@ Source code and build instructions:
https://www.github.com/ggarra13/mrv2

Binaries:
https://github.com/ggarra13/mrv2/releases/tag/v1.1.2
https://sourceforge.net/projects/mrv2/files/v1.1.2/
https://github.com/ggarra13/mrv2/releases/tag/v1.1.4
https://sourceforge.net/projects/mrv2/files/v1.1.4/

#player #movie #flipbook #usd #openusd #opentimelineio #mrv2 #mrViewer #mrViewer2 #vp9 #av1 #h264 #mp4 #mov #avi #webm #prores #prores4444 #cfhd #cineform #gopro #vpx #vfx #vr #animation #games #filmmaking #opensource #environmentmaps #stereo #windows #macos #linux


-------------------------------------------------------------------------------


mrv2 v1.1.3
mrv2 v1.1.4

mrv2, an open source professional player and review tool for vfx, animation and computer graphics for Windows, Linux and macOS has a new version.

Expand All @@ -39,4 +35,4 @@ Source:
https://github.com/ggarra13/mrv2/

Binaries:
https://github.com/ggarra13/mrv2/releases/tag/v1.1.3
https://github.com/ggarra13/mrv2/releases/tag/v1.1.4
239 changes: 117 additions & 122 deletions mrv2/lib/mrvApp/mrvApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,136 +281,131 @@ namespace mrv
Preferences::debug, {"-debug", "-d"},
_("Debug verbosity.")),
#endif
app::CmdLineValueOption<std::string>::create(
p.options.audioFileName, {"-audio", "-a"},
_("Audio file name.")),
app::CmdLineValueOption<std::string>::create(
p.options.compareFileName, {"-compare", "-b"},
_("A/B comparison \"B\" file name.")),
app::CmdLineValueOption<timeline::CompareMode>::create(
p.options.compareOptions.mode, {"-compareMode", "-c"},
_("A/B comparison mode."),
string::Format("{0}").arg(
p.options.compareOptions.mode),
string::join(timeline::getCompareModeLabels(), ", ")),
app::CmdLineValueOption<math::Vector2f>::create(
p.options.compareOptions.wipeCenter,
{"-wipeCenter", "-wc"},
_("A/B comparison wipe center."),
string::Format("{0}").arg(
p.options.compareOptions.wipeCenter)),
app::CmdLineValueOption<float>::create(
p.options.compareOptions.wipeRotation,
{"-wipeRotation", "-wr"},
_("A/B comparison wipe rotation."),
string::Format("{0}").arg(
p.options.compareOptions.wipeRotation)),
app::CmdLineFlagOption::create(
p.options.otioEditMode, {"-editMode", "-e"},
_("OpenTimelineIO Edit mode.")),
app::CmdLineValueOption<double>::create(
p.options.speed, {"-speed"}, _("Playback speed.")),
app::CmdLineValueOption<timeline::Playback>::create(
p.options.playback, {"-playback", "-p"},
_("Playback mode."),
string::Format("{0}").arg(timeline::Playback::Stop),
string::join(timeline::getPlaybackLabels(), ", ")),
app::CmdLineValueOption<timeline::Loop>::create(
p.options.loop, {"-loop"}, _("Playback loop mode."),
string::Format("{0}").arg(timeline::Loop::Loop),
string::join(timeline::getLoopLabels(), ", ")),
app::CmdLineValueOption<otime::RationalTime>::create(
p.options.seek, {"-seek"},
_("Seek to the given time.")),
app::CmdLineValueOption<otime::TimeRange>::create(
p.options.inOutRange, {"-inOutRange"},
_("Set the in/out points range.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.input,
{"-ocioInput", "-ics", "-oi"},
_("OpenColorIO input color space.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.display, {"-ocioDisplay", "-od"},
_("OpenColorIO display name.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.view, {"-ocioView", "-ov"},
_("OpenColorIO view name.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.look, {"-ocioLook", "-ol"},
_("OpenColorIO look name.")),
app::CmdLineValueOption<std::string>::create(
p.options.lutOptions.fileName, {"-lut"},
_("LUT file name.")),
app::CmdLineValueOption<timeline::LUTOrder>::create(
p.options.lutOptions.order, {"-lutOrder"},
_("LUT operation order."),
string::Format("{0}").arg(p.options.lutOptions.order),
string::join(timeline::getLUTOrderLabels(), ", ")),
app::CmdLineValueOption<std::string>::create(
p.options.audioFileName, {"-audio", "-a"},
_("Audio file name.")),
app::CmdLineValueOption<std::string>::create(
p.options.compareFileName, {"-compare", "-b"},
_("A/B comparison \"B\" file name.")),
app::CmdLineValueOption<timeline::CompareMode>::create(
p.options.compareOptions.mode, {"-compareMode", "-c"},
_("A/B comparison mode."),
string::Format("{0}").arg(p.options.compareOptions.mode),
string::join(timeline::getCompareModeLabels(), ", ")),
app::CmdLineValueOption<math::Vector2f>::create(
p.options.compareOptions.wipeCenter, {"-wipeCenter", "-wc"},
_("A/B comparison wipe center."),
string::Format("{0}").arg(
p.options.compareOptions.wipeCenter)),
app::CmdLineValueOption<float>::create(
p.options.compareOptions.wipeRotation,
{"-wipeRotation", "-wr"},
_("A/B comparison wipe rotation."),
string::Format("{0}").arg(
p.options.compareOptions.wipeRotation)),
app::CmdLineFlagOption::create(
p.options.otioEditMode, {"-editMode", "-e"},
_("OpenTimelineIO Edit mode.")),
app::CmdLineValueOption<double>::create(
p.options.speed, {"-speed"}, _("Playback speed.")),
app::CmdLineValueOption<timeline::Playback>::create(
p.options.playback, {"-playback", "-p"},
_("Playback mode."),
string::Format("{0}").arg(timeline::Playback::Stop),
string::join(timeline::getPlaybackLabels(), ", ")),
app::CmdLineValueOption<timeline::Loop>::create(
p.options.loop, {"-loop"}, _("Playback loop mode."),
string::Format("{0}").arg(timeline::Loop::Loop),
string::join(timeline::getLoopLabels(), ", ")),
app::CmdLineValueOption<otime::RationalTime>::create(
p.options.seek, {"-seek"}, _("Seek to the given time.")),
app::CmdLineValueOption<otime::TimeRange>::create(
p.options.inOutRange, {"-inOutRange"},
_("Set the in/out points range.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.input, {"-ocioInput", "-ics", "-oi"},
_("OpenColorIO input color space.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.display, {"-ocioDisplay", "-od"},
_("OpenColorIO display name.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.view, {"-ocioView", "-ov"},
_("OpenColorIO view name.")),
app::CmdLineValueOption<std::string>::create(
p.options.ocioOptions.look, {"-ocioLook", "-ol"},
_("OpenColorIO look name.")),
app::CmdLineValueOption<std::string>::create(
p.options.lutOptions.fileName, {"-lut"},
_("LUT file name.")),
app::CmdLineValueOption<timeline::LUTOrder>::create(
p.options.lutOptions.order, {"-lutOrder"},
_("LUT operation order."),
string::Format("{0}").arg(p.options.lutOptions.order),
string::join(timeline::getLUTOrderLabels(), ", ")),
#ifdef MRV2_PYBIND11
app::CmdLineValueOption<std::string>::create(
p.options.pythonScript, {"-pythonScript", "-ps"},
_("Python Script to run and exit.")),
app::CmdLineValueOption<std::string>::create(
p.options.pythonScript, {"-pythonScript", "-ps"},
_("Python Script to run and exit.")),
#endif
app::CmdLineFlagOption::create(
p.options.resetSettings, {"-resetSettings"},
_("Reset settings to defaults.")),
app::CmdLineFlagOption::create(
p.options.resetHotkeys, {"-resetHotkeys"},
_("Reset hotkeys to defaults.")),
app::CmdLineFlagOption::create(
p.options.resetSettings, {"-resetSettings"},
_("Reset settings to defaults.")),
app::CmdLineFlagOption::create(
p.options.resetHotkeys, {"-resetHotkeys"},
_("Reset hotkeys to defaults.")),
#if defined(TLRENDER_USD)
app::CmdLineValueOption<int>::create(
p.options.usdRenderWidth, {"-usdRenderWidth"},
"USD render width.",
string::Format("{0}").arg(p.options.usdRenderWidth)),
app::CmdLineValueOption<float>::create(
p.options.usdComplexity, {"-usdComplexity"},
"USD render complexity setting.",
string::Format("{0}").arg(p.options.usdComplexity)),
app::CmdLineValueOption<usd::DrawMode>::create(
p.options.usdDrawMode, {"-usdDrawMode"},
"USD render draw mode.",
string::Format("{0}").arg(p.options.usdDrawMode),
string::join(usd::getDrawModeLabels(), ", ")),
app::CmdLineValueOption<bool>::create(
p.options.usdEnableLighting, {"-usdEnableLighting"},
"USD render enable lighting setting.",
string::Format("{0}").arg(p.options.usdEnableLighting)),
app::CmdLineValueOption<bool>::create(
p.options.usdEnableLighting, {"-usdSRGB"},
"USD render SRGB setting.",
string::Format("{0}").arg(p.options.usdSRGB)),
app::CmdLineValueOption<size_t>::create(
p.options.usdStageCache, {"-usdStageCache"},
"USD stage cache size.",
string::Format("{0}").arg(p.options.usdStageCache)),
app::CmdLineValueOption<size_t>::create(
p.options.usdDiskCache, {"-usdDiskCache"},
"USD disk cache size in gigabytes. A size of zero "
"disables the cache.",
string::Format("{0}").arg(p.options.usdDiskCache)),
app::CmdLineValueOption<int>::create(
p.options.usdRenderWidth, {"-usdRenderWidth"},
"USD render width.",
string::Format("{0}").arg(p.options.usdRenderWidth)),
app::CmdLineValueOption<float>::create(
p.options.usdComplexity, {"-usdComplexity"},
"USD render complexity setting.",
string::Format("{0}").arg(p.options.usdComplexity)),
app::CmdLineValueOption<usd::DrawMode>::create(
p.options.usdDrawMode, {"-usdDrawMode"},
"USD render draw mode.",
string::Format("{0}").arg(p.options.usdDrawMode),
string::join(usd::getDrawModeLabels(), ", ")),
app::CmdLineValueOption<bool>::create(
p.options.usdEnableLighting, {"-usdEnableLighting"},
"USD render enable lighting setting.",
string::Format("{0}").arg(p.options.usdEnableLighting)),
app::CmdLineValueOption<bool>::create(
p.options.usdEnableLighting, {"-usdSRGB"},
"USD render SRGB setting.",
string::Format("{0}").arg(p.options.usdSRGB)),
app::CmdLineValueOption<size_t>::create(
p.options.usdStageCache, {"-usdStageCache"},
"USD stage cache size.",
string::Format("{0}").arg(p.options.usdStageCache)),
app::CmdLineValueOption<size_t>::create(
p.options.usdDiskCache, {"-usdDiskCache"},
"USD disk cache size in gigabytes. A size of zero "
"disables the cache.",
string::Format("{0}").arg(p.options.usdDiskCache)),
#endif // TLRENDER_USD

#ifdef MRV2_NETWORK
app::CmdLineFlagOption::create(
p.options.server, {"-server"},
_("Start a server. Use -port to specify a port "
"number.")),
app::CmdLineValueOption<std::string>::create(
p.options.client, {"-client"},
_("Connect to a server at <value>. Use -port to "
"specify a port number.")),
app::CmdLineValueOption<unsigned>::create(
p.options.port, {"-port"},
_("Port number for the server to listen to or for the "
"client to connect to."),
string::Format("{0}").arg(p.options.port)),
app::CmdLineFlagOption::create(
p.options.server, {"-server"},
_("Start a server. Use -port to specify a port "
"number.")),
app::CmdLineValueOption<std::string>::create(
p.options.client, {"-client"},
_("Connect to a server at <value>. Use -port to "
"specify a port number.")),
app::CmdLineValueOption<unsigned>::create(
p.options.port, {"-port"},
_("Port number for the server to listen to or for the "
"client to connect to."),
string::Format("{0}").arg(p.options.port)),
#endif

app::CmdLineFlagOption::create(
p.options.displayVersion,
{"-version", "--version", "-v", "--v"},
_("Return the version and exit."))
});
app::CmdLineFlagOption::create(
p.options.displayVersion,
{"-version", "--version", "-v", "--v"},
_("Return the version and exit."))});

const int exitCode = getExit();
if (exitCode != 0)
Expand Down
11 changes: 5 additions & 6 deletions mrv2/lib/mrvApp/mrvFilesModel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ namespace mrv
std::shared_ptr<observer::Value<Stereo3DOptions> > stereo3DOptions;

std::shared_ptr<observer::Value<FilesPanelOptions> > filesPanelOptions;


};

void FilesModel::_init(const std::shared_ptr<system::Context>& context)
Expand Down Expand Up @@ -520,7 +518,7 @@ namespace mrv
{
return _p->compareOptions->get();
}

std::shared_ptr<observer::IValue<timeline::CompareOptions> >
FilesModel::observeCompareOptions() const
{
Expand Down Expand Up @@ -580,7 +578,8 @@ namespace mrv
return _p->compareTime->get();
}

std::shared_ptr<observer::IValue<timeline::CompareTimeMode> > FilesModel::observeCompareTime() const
std::shared_ptr<observer::IValue<timeline::CompareTimeMode> >
FilesModel::observeCompareTime() const
{
return _p->compareTime;
}
Expand All @@ -590,7 +589,7 @@ namespace mrv
TLRENDER_P();
p.compareTime->setIfChanged(value);
}

std::shared_ptr<observer::IValue<Stereo3DOptions> >
FilesModel::observeStereo3DOptions() const
{
Expand All @@ -606,7 +605,7 @@ namespace mrv
p.layers->setIfChanged(_getLayers());
}
}

int FilesModel::_index(const std::shared_ptr<FilesModelItem>& item) const
{
TLRENDER_P();
Expand Down
Loading

0 comments on commit 9ce8bff

Please sign in to comment.