diff options
| author | jhurst <jhurst@cinecert.com> | 2016-11-22 17:58:19 +0000 |
|---|---|---|
| committer | jhurst <> | 2016-11-22 17:58:19 +0000 |
| commit | 8fd602770d89acb171dbd878d8737ead85aa35d3 (patch) | |
| tree | 229577c9b4389f7e05694a1f4241d0a9160dd461 /src/asdcp-wrap.cpp | |
| parent | b3e312cda7ce3e7027f5fb44ef2ffd87d713dd8d (diff) | |
o Added optional Generic Partition to IMF Aux Data prototype, used to carry global metadata
o Added support for 192, 200 and 240 fps images, includes 96, 100 and 120 fpe stereo
o Fixed raw essence detector for IMF Aux Data files
o Added missing MCA properties to MCALabelSubDescriptor (contributed by Ruppel)
o New MXF data type: LineMapPair
o Added default 0,0 VideoLineMap value when wrapping CDCI with as-02-wrap
o Added VideoLineMap property to GenericPictureEssenceDescriptor
o Added timed text unwrap support to as-02-unwrap (contributed by Ruppel)
Diffstat (limited to 'src/asdcp-wrap.cpp')
| -rwxr-xr-x | src/asdcp-wrap.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/asdcp-wrap.cpp b/src/asdcp-wrap.cpp index e8bf2f1..4312cc7 100755 --- a/src/asdcp-wrap.cpp +++ b/src/asdcp-wrap.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2015, John Hurst +Copyright (c) 2003-2016, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -266,6 +266,9 @@ 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 == 192 ) return EditRate_192; + if ( picture_rate == 200 ) return EditRate_200; + if ( picture_rate == 240 ) return EditRate_240; return EditRate_24; } @@ -286,6 +289,9 @@ public: 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"; } @@ -617,7 +623,8 @@ bool check_phfr_params(CommandOptions& Options, JP2K::PictureDescriptor& PDesc) { Rational rate = Options.PictureRate(); - if ( rate != EditRate_96 && rate != EditRate_100 && rate != EditRate_120 ) + if ( rate != EditRate_96 && rate != EditRate_100 && rate != EditRate_120 + && rate != EditRate_192 && rate != EditRate_200 && rate != EditRate_240 ) return true; if ( PDesc.StoredWidth > 2048 ) |
