projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release me
[asdcplib.git]
/
src
/
asdcp-test.cpp
diff --git
a/src/asdcp-test.cpp
b/src/asdcp-test.cpp
index 384324d6ef079242cbae7f57a4a1db373662ac9a..df108c3974ce221cec0fe107ad7ee9102749d251 100755
(executable)
--- a/
src/asdcp-test.cpp
+++ b/
src/asdcp-test.cpp
@@
-1,5
+1,5
@@
/*
/*
-Copyright (c) 2003-201
2
, John Hurst
+Copyright (c) 2003-201
4
, John Hurst
All rights reserved.
Redistribution and use in source and binary forms, with or without
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@
-103,7
+103,7
@@
banner(FILE* stream = stdout)
{
fprintf(stream, "\n\
%s (asdcplib %s)\n\n\
{
fprintf(stream, "\n\
%s (asdcplib %s)\n\n\
-Copyright (c) 2003-201
2
John Hurst\n\n\
+Copyright (c) 2003-201
5
John Hurst\n\n\
asdcplib may be copied only under the terms of the license found at\n\
the top of every file in the asdcplib distribution kit.\n\n\
Specify the -h (help) option for further information about %s\n\n",
asdcplib may be copied only under the terms of the license found at\n\
the top of every file in the asdcplib distribution kit.\n\n\
Specify the -h (help) option for further information about %s\n\n",
@@
-292,6
+292,10
@@
public:
//
Rational PictureRate()
{
//
Rational PictureRate()
{
+ if ( picture_rate == 16 ) return EditRate_16;
+ if ( picture_rate == 18 ) return EditRate_18;
+ if ( picture_rate == 20 ) return EditRate_20;
+ if ( picture_rate == 22 ) return EditRate_22;
if ( picture_rate == 23 ) return EditRate_23_98;
if ( picture_rate == 24 ) return EditRate_24;
if ( picture_rate == 25 ) return EditRate_25;
if ( picture_rate == 23 ) return EditRate_23_98;
if ( picture_rate == 24 ) return EditRate_24;
if ( picture_rate == 25 ) return EditRate_25;
@@
-302,12
+306,19
@@
public:
if ( picture_rate == 96 ) return EditRate_96;
if ( picture_rate == 100 ) return EditRate_100;
if ( picture_rate == 120 ) return EditRate_120;
if ( picture_rate == 96 ) return EditRate_96;
if ( picture_rate == 100 ) return EditRate_100;
if ( picture_rate == 120 ) return EditRate_120;
+ if ( picture_rate == 192 ) return EditRate_192;
+ if ( picture_rate == 200 ) return EditRate_200;
+ if ( picture_rate == 240 ) return EditRate_240;
return EditRate_24;
}
//
const char* szPictureRate()
{
return EditRate_24;
}
//
const char* szPictureRate()
{
+ if ( picture_rate == 16 ) return "16";
+ if ( picture_rate == 18 ) return "18.182";
+ if ( picture_rate == 20 ) return "20";
+ if ( picture_rate == 22 ) return "21.818";
if ( picture_rate == 23 ) return "23.976";
if ( picture_rate == 24 ) return "24";
if ( picture_rate == 25 ) return "25";
if ( picture_rate == 23 ) return "23.976";
if ( picture_rate == 24 ) return "24";
if ( picture_rate == 25 ) return "25";
@@
-318,6
+329,9
@@
public:
if ( picture_rate == 96 ) return "96";
if ( picture_rate == 100 ) return "100";
if ( picture_rate == 120 ) return "120";
if ( picture_rate == 96 ) return "96";
if ( picture_rate == 100 ) return "100";
if ( picture_rate == 120 ) return "120";
+ if ( picture_rate == 192 ) return "192";
+ if ( picture_rate == 200 ) return "200";
+ if ( picture_rate == 240 ) return "240";
return "24";
}
return "24";
}
@@
-371,7
+385,7
@@
public:
case 'b':
TEST_EXTRA_ARG(i, 'b');
case 'b':
TEST_EXTRA_ARG(i, 'b');
- fb_size =
abs(atoi(argv[i]
));
+ fb_size =
Kumu::xabs(strtol(argv[i], 0, 10
));
if ( verbose_flag )
fprintf(stderr, "Frame Buffer size: %u bytes.\n", fb_size);
if ( verbose_flag )
fprintf(stderr, "Frame Buffer size: %u bytes.\n", fb_size);
@@
-387,7
+401,7
@@
public:
case 'd':
TEST_EXTRA_ARG(i, 'd');
duration_flag = true;
case 'd':
TEST_EXTRA_ARG(i, 'd');
duration_flag = true;
- duration =
abs(atoi(argv[i]
));
+ duration =
Kumu::xabs(strtol(argv[i], 0, 10
));
break;
case 'E': encrypt_header_flag = false; break;
break;
case 'E': encrypt_header_flag = false; break;
@@
-395,7
+409,7
@@
public:
case 'f':
TEST_EXTRA_ARG(i, 'f');
case 'f':
TEST_EXTRA_ARG(i, 'f');
- start_frame =
abs(atoi(argv[i]
));
+ start_frame =
Kumu::xabs(strtol(argv[i], 0, 10
));
break;
case 'G': mode = MMT_GOP_START; break;
break;
case 'G': mode = MMT_GOP_START; break;
@@
-444,7
+458,7
@@
public:
case 'p':
TEST_EXTRA_ARG(i, 'p');
case 'p':
TEST_EXTRA_ARG(i, 'p');
- picture_rate =
abs(atoi(argv[i]
));
+ picture_rate =
Kumu::xabs(strtol(argv[i], 0, 10
));
break;
case 'R': do_repeat = true; break;
break;
case 'R': do_repeat = true; break;
@@
-452,7
+466,7
@@
public:
case 's':
TEST_EXTRA_ARG(i, 's');
case 's':
TEST_EXTRA_ARG(i, 's');
- fb_dump_size =
abs(atoi(argv[i]
));
+ fb_dump_size =
Kumu::xabs(strtol(argv[i], 0, 10
));
break;
case 't': mode = MMT_DIGEST; break;
break;
case 't': mode = MMT_DIGEST; break;
@@
-464,7
+478,7
@@
public:
case 'w':
TEST_EXTRA_ARG(i, 'w');
case 'w':
TEST_EXTRA_ARG(i, 'w');
- number_width =
abs(atoi(argv[i]
));
+ number_width =
Kumu::xabs(strtol(argv[i], 0, 10
));
break;
case 'x':
break;
case 'x':
@@
-1794,18
+1808,18
@@
show_file_info(CommandOptions& Options)
{
const Dictionary* Dict = &DefaultCompositeDict();
PCM::MXFReader Reader;
{
const Dictionary* Dict = &DefaultCompositeDict();
PCM::MXFReader Reader;
- MXF::OP
AtomHeader OPAtom
Header(Dict);
+ MXF::OP
1aHeader
Header(Dict);
MXF::WaveAudioDescriptor *descriptor = 0;
result = Reader.OpenRead(Options.filenames[0]);
if ( ASDCP_SUCCESS(result) )
MXF::WaveAudioDescriptor *descriptor = 0;
result = Reader.OpenRead(Options.filenames[0]);
if ( ASDCP_SUCCESS(result) )
- result = Reader.OP
Atom
Header().GetMDObjectByType(Dict->ul(MDD_WaveAudioDescriptor), reinterpret_cast<MXF::InterchangeObject**>(&descriptor));
+ result = Reader.OP
1a
Header().GetMDObjectByType(Dict->ul(MDD_WaveAudioDescriptor), reinterpret_cast<MXF::InterchangeObject**>(&descriptor));
if ( ASDCP_SUCCESS(result) )
{
char buf[64];
if ( ASDCP_SUCCESS(result) )
{
char buf[64];
- fprintf(stdout, " ChannelAssignment: %s\n", descriptor->ChannelAssignment.EncodeString(buf, 64));
+ fprintf(stdout, " ChannelAssignment: %s\n", descriptor->ChannelAssignment.
const_get().
EncodeString(buf, 64));
}
}
}
}
}
}
@@
-1836,7
+1850,7
@@
show_file_info(CommandOptions& Options)
fprintf(stderr, "File is not AS-DCP: %s\n", Options.filenames[0]);
Kumu::FileReader Reader;
const Dictionary* Dict = &DefaultCompositeDict();
fprintf(stderr, "File is not AS-DCP: %s\n", Options.filenames[0]);
Kumu::FileReader Reader;
const Dictionary* Dict = &DefaultCompositeDict();
- MXF::OP
Atom
Header TestHeader(Dict);
+ MXF::OP
1a
Header TestHeader(Dict);
result = Reader.OpenRead(Options.filenames[0]);
result = Reader.OpenRead(Options.filenames[0]);