projects
/
asdcplib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commit fixes found in porting.
[asdcplib.git]
/
src
/
AS_DCP_MPEG2.cpp
diff --git
a/src/AS_DCP_MPEG2.cpp
b/src/AS_DCP_MPEG2.cpp
index db00c456845df73397632348b76fd1e7674a4c96..bd2709e3344eae1f6a6c6d78e4cf57fd255baf22 100755
(executable)
--- a/
src/AS_DCP_MPEG2.cpp
+++ b/
src/AS_DCP_MPEG2.cpp
@@
-1,5
+1,5
@@
/*
/*
-Copyright (c) 2004-200
6
, John Hurst
+Copyright (c) 2004-200
7
, 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
@@
-34,16
+34,20
@@
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//------------------------------------------------------------------------------------------
//------------------------------------------------------------------------------------------
+static std::string MPEG_PACKAGE_LABEL = "File Package: SMPTE 381M frame wrapping of MPEG2 video elementary stream";
+static std::string PICT_DEF_LABEL = "Picture Track";
+
//
ASDCP::Result_t
//
ASDCP::Result_t
-
ASDCP::
MD_to_MPEG2_VDesc(MXF::MPEG2VideoDescriptor* VDescObj, MPEG2::VideoDescriptor& VDesc)
+MD_to_MPEG2_VDesc(MXF::MPEG2VideoDescriptor* VDescObj, MPEG2::VideoDescriptor& VDesc)
{
ASDCP_TEST_NULL(VDescObj);
VDesc.SampleRate = VDescObj->SampleRate;
VDesc.EditRate = VDescObj->SampleRate;
VDesc.FrameRate = VDescObj->SampleRate.Numerator;
{
ASDCP_TEST_NULL(VDescObj);
VDesc.SampleRate = VDescObj->SampleRate;
VDesc.EditRate = VDescObj->SampleRate;
VDesc.FrameRate = VDescObj->SampleRate.Numerator;
- VDesc.ContainerDuration = VDescObj->ContainerDuration;
+ assert(VDescObj->ContainerDuration <= 0xFFFFFFFFL);
+ VDesc.ContainerDuration = (ui32_t) VDescObj->ContainerDuration;
VDesc.FrameLayout = VDescObj->FrameLayout;
VDesc.StoredWidth = VDescObj->StoredWidth;
VDesc.FrameLayout = VDescObj->FrameLayout;
VDesc.StoredWidth = VDescObj->StoredWidth;
@@
-65,12
+69,11
@@
ASDCP::MD_to_MPEG2_VDesc(MXF::MPEG2VideoDescriptor* VDescObj, MPEG2::VideoDescri
//
ASDCP::Result_t
//
ASDCP::Result_t
-
ASDCP::
MPEG2_VDesc_to_MD(MPEG2::VideoDescriptor& VDesc, MXF::MPEG2VideoDescriptor* VDescObj)
+MPEG2_VDesc_to_MD(MPEG2::VideoDescriptor& VDesc, MXF::MPEG2VideoDescriptor* VDescObj)
{
ASDCP_TEST_NULL(VDescObj);
VDescObj->SampleRate = VDesc.SampleRate;
{
ASDCP_TEST_NULL(VDescObj);
VDescObj->SampleRate = VDesc.SampleRate;
- VDescObj->SampleRate.Numerator = VDesc.FrameRate;
VDescObj->ContainerDuration = VDesc.ContainerDuration;
VDescObj->FrameLayout = VDesc.FrameLayout;
VDescObj->ContainerDuration = VDesc.ContainerDuration;
VDescObj->FrameLayout = VDesc.FrameLayout;
@@
-99,20
+102,20
@@
ASDCP::MPEG2::VideoDescriptorDump(const VideoDescriptor& VDesc, FILE* stream)
stream = stderr;
fprintf(stream, "\
stream = stderr;
fprintf(stream, "\
-
SampleRate: %lu/%lu
\n\
-
FrameLayout: %l
u\n\
-
StoredWidth: %l
u\n\
-
StoredHeight: %l
u\n\
-
AspectRatio: %lu/%lu
\n\
-
ComponentDepth: %l
u\n\
-
HorizontalSubsampling: %l
u\n\
-
VerticalSubsampling: %l
u\n\
-
ColorSiting: %l
u\n\
-
CodedContentType: %l
u\n\
-
LowDelay: %l
u\n\
-
BitRate: %l
u\n\
-
ProfileAndLevel: %l
u\n\
-
ContainerDuration: %l
u\n",
+
SampleRate: %d/%d
\n\
+
FrameLayout: %
u\n\
+
StoredWidth: %
u\n\
+
StoredHeight: %
u\n\
+
AspectRatio: %d/%d
\n\
+
ComponentDepth: %
u\n\
+
HorizontalSubsmpl: %
u\n\
+
VerticalSubsmpl: %
u\n\
+
ColorSiting: %
u\n\
+
CodedContentType: %
u\n\
+
LowDelay: %
u\n\
+
BitRate: %
u\n\
+
ProfileAndLevel: %
u\n\
+
ContainerDuration: %
u\n",
VDesc.SampleRate.Numerator ,VDesc.SampleRate.Denominator,
VDesc.FrameLayout,
VDesc.StoredWidth,
VDesc.SampleRate.Numerator ,VDesc.SampleRate.Denominator,
VDesc.FrameLayout,
VDesc.StoredWidth,
@@
-171,7
+174,7
@@
ASDCP::MPEG2::MXFReader::h__Reader::OpenRead(const char* filename)
result = InitMXFIndex();
if( ASDCP_SUCCESS(result) )
result = InitMXFIndex();
if( ASDCP_SUCCESS(result) )
- result = InitInfo(
m_Info
);
+ result = InitInfo();
return result;
}
return result;
}
@@
-209,7
+212,7
@@
ASDCP::MPEG2::MXFReader::h__Reader::FindFrameGOPStart(ui32_t FrameNum, ui32_t& K
if ( ASDCP_FAILURE(m_FooterPart.Lookup(FrameNum, TmpEntry)) )
{
if ( ASDCP_FAILURE(m_FooterPart.Lookup(FrameNum, TmpEntry)) )
{
- DefaultLogSink().Error("Frame value out of range: %
l
u\n", FrameNum);
+ DefaultLogSink().Error("Frame value out of range: %u\n", FrameNum);
return RESULT_RANGE;
}
return RESULT_RANGE;
}
@@
-228,7
+231,7
@@
ASDCP::MPEG2::MXFReader::h__Reader::ReadFrame(ui32_t FrameNum, FrameBuffer& Fram
if ( ! m_File.IsOpen() )
return RESULT_INIT;
if ( ! m_File.IsOpen() )
return RESULT_INIT;
- Result_t result = ReadEKLV
Packet(FrameNum, FrameBuf, MPEGEssenceUL_Data
, Ctx, HMAC);
+ Result_t result = ReadEKLV
Frame(FrameNum, FrameBuf, Dict::ul(MDD_MPEG2Essence)
, Ctx, HMAC);
if ( ASDCP_FAILURE(result) )
return result;
if ( ASDCP_FAILURE(result) )
return result;
@@
-261,7
+264,7
@@
ASDCP::MPEG2::FrameBuffer::Dump(FILE* stream, ui32_t dump_len) const
if ( stream == 0 )
stream = stderr;
if ( stream == 0 )
stream = stderr;
- fprintf(stream, "Frame: %06
lu, %c%-2hu, %7l
u bytes",
+ fprintf(stream, "Frame: %06
u, %c%-2hu, %7
u bytes",
m_FrameNumber, FrameTypeChar(m_FrameType), m_TemporalOffset, m_Size);
if ( m_GOPStart )
m_FrameNumber, FrameTypeChar(m_FrameType), m_TemporalOffset, m_Size);
if ( m_GOPStart )
@@
-270,7
+273,7
@@
ASDCP::MPEG2::FrameBuffer::Dump(FILE* stream, ui32_t dump_len) const
fputc('\n', stream);
if ( dump_len > 0 )
fputc('\n', stream);
if ( dump_len > 0 )
- hexdump(m_Data, dump_len, stream);
+
Kumu::
hexdump(m_Data, dump_len, stream);
}
}
@@
-384,10
+387,14
@@
class ASDCP::MPEG2::MXFWriter::h__Writer : public ASDCP::h__Writer
public:
VideoDescriptor m_VDesc;
ui32_t m_GOPOffset;
public:
VideoDescriptor m_VDesc;
ui32_t m_GOPOffset;
+ byte_t m_EssenceUL[SMPTE_UL_LENGTH];
ASDCP_NO_COPY_CONSTRUCT(h__Writer);
ASDCP_NO_COPY_CONSTRUCT(h__Writer);
- h__Writer() : m_GOPOffset(0) {}
+ h__Writer() : m_GOPOffset(0) {
+ memset(m_EssenceUL, 0, SMPTE_UL_LENGTH);
+ }
+
~h__Writer(){}
Result_t OpenWrite(const char*, ui32_t HeaderSize);
~h__Writer(){}
Result_t OpenWrite(const char*, ui32_t HeaderSize);
@@
-409,6
+416,7
@@
ASDCP::MPEG2::MXFWriter::h__Writer::OpenWrite(const char* filename, ui32_t Heade
if ( ASDCP_SUCCESS(result) )
{
if ( ASDCP_SUCCESS(result) )
{
+ m_HeaderSize = HeaderSize;
m_EssenceDescriptor = new MPEG2VideoDescriptor;
result = m_State.Goto_INIT();
}
m_EssenceDescriptor = new MPEG2VideoDescriptor;
result = m_State.Goto_INIT();
}
@@
-427,12
+435,16
@@
ASDCP::MPEG2::MXFWriter::h__Writer::SetSourceStream(const VideoDescriptor& VDesc
Result_t result = MPEG2_VDesc_to_MD(m_VDesc, (MPEG2VideoDescriptor*)m_EssenceDescriptor);
if ( ASDCP_SUCCESS(result) )
Result_t result = MPEG2_VDesc_to_MD(m_VDesc, (MPEG2VideoDescriptor*)m_EssenceDescriptor);
if ( ASDCP_SUCCESS(result) )
- result = WriteMXFHeader(MPEG_PACKAGE_LABEL,
-
UL(WrappingUL_Data_MPEG2_VES
),
+ result = WriteMXFHeader(MPEG_PACKAGE_LABEL,
UL(Dict::ul(MDD_MPEG2_VESWrapping)),
+
PICT_DEF_LABEL, UL(Dict::ul(MDD_PictureDataDef)
),
m_VDesc.EditRate, 24 /* TCFrameRate */);
if ( ASDCP_SUCCESS(result) )
m_VDesc.EditRate, 24 /* TCFrameRate */);
if ( ASDCP_SUCCESS(result) )
- result = m_State.Goto_READY();
+ {
+ memcpy(m_EssenceUL, Dict::ul(MDD_MPEG2Essence), SMPTE_UL_LENGTH);
+ m_EssenceUL[SMPTE_UL_LENGTH-1] = 1; // first (and only) essence container
+ result = m_State.Goto_READY();
+ }
return result;
}
return result;
}
@@
-451,10
+463,11
@@
ASDCP::MPEG2::MXFWriter::h__Writer::WriteFrame(const FrameBuffer& FrameBuf, AESE
if ( m_State.Test_READY() )
result = m_State.Goto_RUNNING(); // first time through, get the body location
if ( m_State.Test_READY() )
result = m_State.Goto_RUNNING(); // first time through, get the body location
- ui64_t ThisOffset = m_File.Tell();
+ IndexTableSegment::IndexEntry Entry;
+ Entry.StreamOffset = m_StreamOffset;
if ( ASDCP_SUCCESS(result) )
if ( ASDCP_SUCCESS(result) )
- result = WriteEKLVPacket(FrameBuf,
MPEGEssenceUL_Data
, Ctx, HMAC);
+ result = WriteEKLVPacket(FrameBuf,
m_EssenceUL
, Ctx, HMAC);
if ( ASDCP_FAILURE(result) )
return result;
if ( ASDCP_FAILURE(result) )
return result;
@@
-479,11
+492,16
@@
ASDCP::MPEG2::MXFWriter::h__Writer::WriteFrame(const FrameBuffer& FrameBuf, AESE
}
// update the index manager
}
// update the index manager
- IndexTableSegment::IndexEntry Entry;
Entry.TemporalOffset = - FrameBuf.TemporalOffset();
Entry.TemporalOffset = - FrameBuf.TemporalOffset();
- Entry.KeyFrameOffset = m_GOPOffset;
+ Entry.KeyFrameOffset =
0 -
m_GOPOffset;
Entry.Flags = Flags;
Entry.Flags = Flags;
- Entry.StreamOffset = ThisOffset - m_FooterPart.m_ECOffset;
+ /*
+ fprintf(stderr, "to: %4hd ko: %4hd c1: %4hd c2: %4hd fl: 0x%02x\n",
+ Entry.TemporalOffset, Entry.KeyFrameOffset,
+ m_GOPOffset + Entry.TemporalOffset,
+ Entry.KeyFrameOffset - Entry.TemporalOffset,
+ Entry.Flags);
+ */
m_FooterPart.PushIndexEntry(Entry);
m_FramesWritten++;
m_GOPOffset++;
m_FooterPart.PushIndexEntry(Entry);
m_FramesWritten++;
m_GOPOffset++;
@@
-526,14
+544,12
@@
ASDCP::MPEG2::MXFWriter::OpenWrite(const char* filename, const WriterInfo& Info,
const VideoDescriptor& VDesc, ui32_t HeaderSize)
{
m_Writer = new h__Writer;
const VideoDescriptor& VDesc, ui32_t HeaderSize)
{
m_Writer = new h__Writer;
+ m_Writer->m_Info = Info;
Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
if ( ASDCP_SUCCESS(result) )
Result_t result = m_Writer->OpenWrite(filename, HeaderSize);
if ( ASDCP_SUCCESS(result) )
- {
- m_Writer->m_Info = Info;
- result = m_Writer->SetSourceStream(VDesc);
- }
+ result = m_Writer->SetSourceStream(VDesc);
if ( ASDCP_FAILURE(result) )
m_Writer.release();
if ( ASDCP_FAILURE(result) )
m_Writer.release();