diff options
| author | jhurst <jhurst@cinecert.com> | 2005-12-20 19:16:21 +0000 |
|---|---|---|
| committer | jhurst <> | 2005-12-20 19:16:21 +0000 |
| commit | c6900386fb66832781456838804ed7e28c535d63 (patch) | |
| tree | 3c387a66aec432229d1d987b9209e819bb80c5c3 /src/asdcp-test.cpp | |
| parent | d440dbd72e7b3395c589a72e391eb33b6d2109f4 (diff) | |
pre-release commit
Diffstat (limited to 'src/asdcp-test.cpp')
| -rwxr-xr-x | src/asdcp-test.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/asdcp-test.cpp b/src/asdcp-test.cpp index c034626..12d8feb 100755 --- a/src/asdcp-test.cpp +++ b/src/asdcp-test.cpp @@ -1100,7 +1100,7 @@ class MyVideoDescriptor : public MPEG2::VideoDescriptor MPEG2::VideoDescriptorDump(*this, stream); } }; -#if 0 + class MyPictureDescriptor : public JP2K::PictureDescriptor { public: @@ -1124,7 +1124,7 @@ class MyAudioDescriptor : public PCM::AudioDescriptor PCM::AudioDescriptorDump(*this, stream); } }; -#endif + // MSVC didn't like the function template, so now it's a static class method template<class ReaderT, class DescriptorT> @@ -1181,7 +1181,6 @@ show_file_info(CommandOptions& Options) fputs("File essence type is MPEG2 video.\n", stdout); FileInfoWrapper<ASDCP::MPEG2::MXFReader, MyVideoDescriptor>::file_info(Options); } -#if 0 else if ( EssenceType == ESS_PCM_24b_48k ) { fputs("File essence type is PCM audio.\n", stdout); @@ -1192,7 +1191,6 @@ show_file_info(CommandOptions& Options) fputs("File essence type is JPEG 2000 pictures.\n", stdout); FileInfoWrapper<ASDCP::JP2K::MXFReader, MyPictureDescriptor>::file_info(Options); } -#endif else { fprintf(stderr, "File is not AS-DCP: %s\n", Options.filenames[0]); @@ -1206,17 +1204,17 @@ show_file_info(CommandOptions& Options) if ( ASDCP_SUCCESS(result) ) { + TestHeader.Partition::Dump(); + if ( MXF::Identification* ID = TestHeader.GetIdentification() ) - { - TestHeader.Dump(); - ID->Dump(); - // show OP - // show - } + ID->Dump(); else - { - fputs("File contains no Identification object.\n", stdout); - } + fputs("File contains no Identification object.\n", stdout); + + if ( MXF::SourcePackage* SP = TestHeader.GetSourcePackage() ) + SP->Dump(); + else + fputs("File contains no SourcePackage object.\n", stdout); } else { @@ -1307,6 +1305,9 @@ main(int argc, const char** argv) } else if ( Options.create_flag ) { + fprintf(stderr, "ATTENTION! This version of asdcplib does not support writing MXF files.\n"); + +#if 0 if ( Options.do_repeat && ! Options.duration_flag ) { fputs("Option -R requires -d <duration>\n", stderr); @@ -1318,7 +1319,6 @@ main(int argc, const char** argv) #ifdef SMPTE_LABELS fprintf(stderr, "ATTENTION! Writing SMPTE Universal Labels\n"); #endif -#if 0 if ( ASDCP_SUCCESS(result) ) { switch ( EssenceType ) |