Skip to content

Commit 48a5bdc

Browse files
darbyjohnstondarbyjohnston
authored
Update feather-tk version (#47)
* Update feather-tk Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Disable AV1 by default Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Refactoring Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> * Build fixes Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com> --------- Signed-off-by: Darby Johnston <darbyjohnston@yahoo.com>
1 parent 4087e69 commit 48a5bdc

139 files changed

Lines changed: 2779 additions & 2728 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,18 @@ set(TOUCAN_PLUGINS
5757

5858
enable_testing()
5959

60-
find_package(Imath)
61-
find_package(Freetype)
6260
find_package(ZLIB)
61+
find_package(minizip)
62+
find_package(Imath)
6363
find_package(PNG)
6464
find_package(JPEG)
6565
find_package(TIFF)
6666
find_package(OpenEXR)
67-
find_package(minizip)
6867
find_package(OpenColorIO)
6968
find_package(OpenImageIO)
7069
find_package(OpenFX)
7170
find_package(OpenTimelineIO)
72-
find_package(lunasvg)
73-
find_package(dtk)
71+
find_package(feather-tk)
7472

7573
include_directories(lib)
7674
include_directories(tests)

‎bin/toucan-filmstrip/App.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@
55

66
#include <toucanRender/Util.h>
77

8-
#include <dtk/core/CmdLine.h>
9-
#include <dtk/core/Time.h>
8+
#include <feather-tk/core/CmdLine.h>
9+
#include <feather-tk/core/Time.h>
1010

1111
#include <OpenImageIO/imagebufalgo.h>
1212

1313
namespace toucan
1414
{
1515
void App::_init(
16-
const std::shared_ptr<dtk::Context>& context,
16+
const std::shared_ptr<feather_tk::Context>& context,
1717
std::vector<std::string>& argv)
1818
{
19-
std::vector<std::shared_ptr<dtk::ICmdLineArg> > args;
20-
args.push_back(dtk::CmdLineValueArg<std::string>::create(
19+
std::vector<std::shared_ptr<feather_tk::ICmdLineArg> > args;
20+
args.push_back(feather_tk::CmdLineValueArg<std::string>::create(
2121
_args.input,
2222
"input",
2323
"Input .otio file."));
24-
auto outArg = dtk::CmdLineValueArg<std::string>::create(
24+
auto outArg = feather_tk::CmdLineValueArg<std::string>::create(
2525
_args.output,
2626
"output",
2727
"Output image file.");
2828
args.push_back(outArg);
2929

30-
std::vector<std::shared_ptr<dtk::ICmdLineOption> > options;
31-
options.push_back(dtk::CmdLineFlagOption::create(
30+
std::vector<std::shared_ptr<feather_tk::ICmdLineOption> > options;
31+
options.push_back(feather_tk::CmdLineFlagOption::create(
3232
_options.verbose,
3333
std::vector<std::string>{ "-v" },
3434
"Print verbose output."));
35-
options.push_back(dtk::CmdLineFlagOption::create(
35+
options.push_back(feather_tk::CmdLineFlagOption::create(
3636
_options.help,
3737
std::vector<std::string>{ "-h" },
3838
"Print help."));
@@ -53,7 +53,7 @@ namespace toucan
5353
{}
5454

5555
std::shared_ptr<App> App::create(
56-
const std::shared_ptr<dtk::Context>&context,
56+
const std::shared_ptr<feather_tk::Context>&context,
5757
std::vector<std::string>&argv)
5858
{
5959
auto out = std::shared_ptr<App>(new App);

‎bin/toucan-filmstrip/App.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
#include <toucanRender/ImageGraph.h>
88
#include <toucanRender/TimelineWrapper.h>
99

10-
#include <dtk/core/IApp.h>
10+
#include <feather-tk/core/IApp.h>
1111

1212
#include <OpenImageIO/imagebuf.h>
1313

1414
namespace toucan
1515
{
16-
class App : public dtk::IApp
16+
class App : public feather_tk::IApp
1717
{
1818
protected:
1919
void _init(
20-
const std::shared_ptr<dtk::Context>&,
20+
const std::shared_ptr<feather_tk::Context>&,
2121
std::vector<std::string>&);
2222

2323
App();
@@ -26,7 +26,7 @@ namespace toucan
2626
~App();
2727

2828
static std::shared_ptr<App> create(
29-
const std::shared_ptr<dtk::Context>&,
29+
const std::shared_ptr<feather_tk::Context>&,
3030
std::vector<std::string>&);
3131

3232
void run() override;

‎bin/toucan-filmstrip/main.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
#include "App.h"
55

6-
#include <dtk/core/Context.h>
7-
#include <dtk/core/Init.h>
6+
#include <feather-tk/core/Context.h>
87

98
#include <iostream>
109

@@ -20,8 +19,7 @@ int main(int argc, char** argv)
2019
}
2120
try
2221
{
23-
auto context = dtk::Context::create();
24-
dtk::coreInit(context);
22+
auto context = feather_tk::Context::create();
2523
auto app = App::create(context, args);
2624
app->run();
2725
out = app->getExit();

‎bin/toucan-render/App.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <toucanRender/Read.h>
88
#include <toucanRender/Util.h>
99

10-
#include <dtk/core/CmdLine.h>
11-
#include <dtk/core/Time.h>
10+
#include <feather-tk/core/CmdLine.h>
11+
#include <feather-tk/core/Time.h>
1212

1313
#include <OpenImageIO/imagebufalgo.h>
1414

@@ -45,21 +45,21 @@ namespace toucan
4545
}
4646

4747
void App::_init(
48-
const std::shared_ptr<dtk::Context>& context,
48+
const std::shared_ptr<feather_tk::Context>& context,
4949
std::vector<std::string>& argv)
5050
{
51-
std::vector<std::shared_ptr<dtk::ICmdLineArg> > args;
52-
args.push_back(dtk::CmdLineValueArg<std::string>::create(
51+
std::vector<std::shared_ptr<feather_tk::ICmdLineArg> > args;
52+
args.push_back(feather_tk::CmdLineValueArg<std::string>::create(
5353
_args.input,
5454
"input",
5555
"Input .otio file."));
56-
auto outArg = dtk::CmdLineValueArg<std::string>::create(
56+
auto outArg = feather_tk::CmdLineValueArg<std::string>::create(
5757
_args.output,
5858
"output",
5959
"Output image or movie file. Use a dash ('-') to write raw frames or y4m to stdout.");
6060
args.push_back(outArg);
6161

62-
std::vector<std::shared_ptr<dtk::ICmdLineOption> > options;
62+
std::vector<std::shared_ptr<feather_tk::ICmdLineOption> > options;
6363
std::vector<std::string> rawList;
6464
for (const auto& spec : rawSpecs)
6565
{
@@ -70,41 +70,41 @@ namespace toucan
7070
{
7171
y4mList.push_back(spec.first);
7272
}
73-
options.push_back(dtk::CmdLineValueOption<std::string>::create(
73+
options.push_back(feather_tk::CmdLineValueOption<std::string>::create(
7474
_options.videoCodec,
7575
std::vector<std::string>{ "-vcodec" },
7676
"Set the video codec.",
7777
_options.videoCodec,
78-
dtk::join(ffmpeg::getVideoCodecStrings(), ", ")));
79-
options.push_back(dtk::CmdLineFlagOption::create(
78+
feather_tk::join(ffmpeg::getVideoCodecStrings(), ", ")));
79+
options.push_back(feather_tk::CmdLineFlagOption::create(
8080
_options.printStart,
8181
std::vector<std::string>{ "-print_start" },
8282
"Print the timeline start time and exit."));
83-
options.push_back(dtk::CmdLineFlagOption::create(
83+
options.push_back(feather_tk::CmdLineFlagOption::create(
8484
_options.printDuration,
8585
std::vector<std::string>{ "-print_duration" },
8686
"Print the timeline duration and exit."));
87-
options.push_back(dtk::CmdLineFlagOption::create(
87+
options.push_back(feather_tk::CmdLineFlagOption::create(
8888
_options.printRate,
8989
std::vector<std::string>{ "-print_rate" },
9090
"Print the timeline frame rate and exit."));
91-
options.push_back(dtk::CmdLineFlagOption::create(
91+
options.push_back(feather_tk::CmdLineFlagOption::create(
9292
_options.printSize,
9393
std::vector<std::string>{ "-print_size" },
9494
"Print the timeline image size."));
95-
options.push_back(dtk::CmdLineValueOption<std::string>::create(
95+
options.push_back(feather_tk::CmdLineValueOption<std::string>::create(
9696
_options.raw,
9797
std::vector<std::string>{ "-raw" },
9898
"Raw pixel format to send to stdout.",
9999
_options.raw,
100-
dtk::join(rawList, ", ")));
101-
options.push_back(dtk::CmdLineValueOption<std::string>::create(
100+
feather_tk::join(rawList, ", ")));
101+
options.push_back(feather_tk::CmdLineValueOption<std::string>::create(
102102
_options.y4m,
103103
std::vector<std::string>{ "-y4m" },
104104
"y4m format to send to stdout.",
105105
_options.y4m,
106-
dtk::join(y4mList, ", ")));
107-
options.push_back(dtk::CmdLineFlagOption::create(
106+
feather_tk::join(y4mList, ", ")));
107+
options.push_back(feather_tk::CmdLineFlagOption::create(
108108
_options.verbose,
109109
std::vector<std::string>{ "-v" },
110110
"Print verbose output."));
@@ -144,7 +144,7 @@ namespace toucan
144144
}
145145

146146
std::shared_ptr<App> App::create(
147-
const std::shared_ptr<dtk::Context>& context,
147+
const std::shared_ptr<feather_tk::Context>& context,
148148
std::vector<std::string>& argv)
149149
{
150150
auto out = std::shared_ptr<App>(new App);
@@ -320,7 +320,7 @@ namespace toucan
320320

321321
{
322322
const OTIO_NS::TimeRange timeRange = _timelineWrapper->getTimeRange();
323-
const auto r = dtk::toRational(timeRange.duration().rate());
323+
const auto r = feather_tk::toRational(timeRange.duration().rate());
324324
std::stringstream ss;
325325
ss << " F" << r.first << ":" << r.second;
326326
s = ss.str();

‎bin/toucan-render/App.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <toucanRender/ImageGraph.h>
88
#include <toucanRender/TimelineWrapper.h>
99

10-
#include <dtk/core/IApp.h>
10+
#include <feather-tk/core/IApp.h>
1111

1212
#include <OpenImageIO/imagebuf.h>
1313

@@ -19,11 +19,11 @@ extern "C"
1919

2020
namespace toucan
2121
{
22-
class App : public dtk::IApp
22+
class App : public feather_tk::IApp
2323
{
2424
protected:
2525
void _init(
26-
const std::shared_ptr<dtk::Context>&,
26+
const std::shared_ptr<feather_tk::Context>&,
2727
std::vector<std::string>&);
2828

2929
App();
@@ -32,7 +32,7 @@ namespace toucan
3232
~App();
3333

3434
static std::shared_ptr<App> create(
35-
const std::shared_ptr<dtk::Context>&,
35+
const std::shared_ptr<feather_tk::Context>&,
3636
std::vector<std::string>&);
3737

3838
void run() override;

‎bin/toucan-render/main.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
#include "App.h"
55

6-
#include <dtk/core/Context.h>
7-
#include <dtk/core/Init.h>
6+
#include <feather-tk/core/Context.h>
87

98
#include <iostream>
109

@@ -20,8 +19,7 @@ int main(int argc, char** argv)
2019
}
2120
try
2221
{
23-
auto context = dtk::Context::create();
24-
dtk::coreInit(context);
22+
auto context = feather_tk::Context::create();
2523
auto app = App::create(context, args);
2624
app->run();
2725
out = app->getExit();

‎bin/toucan-view/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33

44
#include "toucanView/App.h"
55

6-
#include <dtk/core/Context.h>
6+
#include <feather-tk/core/Context.h>
77

88
#include <iostream>
99

10-
DTK_MAIN()
10+
FEATHER_TK_MAIN()
1111
{
1212
try
1313
{
14-
auto context = dtk::Context::create();
15-
auto args = dtk::convert(argc, argv);
14+
auto context = feather_tk::Context::create();
15+
auto args = feather_tk::convert(argc, argv);
1616
auto app = toucan::App::create(context, args);
1717
if (app->getExit() != 0)
1818
return app->getExit();

‎cmake/SuperBuild/BuildFFmpeg.cmake‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,4 +418,5 @@ ExternalProject_Add(
418418
CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env PKG_CONFIG_PATH=${CMAKE_INSTALL_PREFIX}/lib/pkgconfig ${FFmpeg_CONFIGURE}
419419
BUILD_COMMAND ${FFmpeg_BUILD}
420420
INSTALL_COMMAND ${FFmpeg_INSTALL}
421-
BUILD_IN_SOURCE 1)
421+
BUILD_IN_SOURCE ON
422+
DOWNLOAD_EXTRACT_TIMESTAMP ON)

‎cmake/SuperBuild/BuildOpenTimelineIO.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include(ExternalProject)
22

33
set(OpenTimelineIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git")
4-
set(OpenTimelineIO_GIT_TAG "v0.17.0")
4+
set(OpenTimelineIO_GIT_TAG "7c58de1a19d7cdb16f08019bd504105bec4a5aa5")
55

66
set(OpenTimelineIO_ARGS
77
${toucan_EXTERNAL_PROJECT_ARGS}

0 commit comments

Comments
 (0)