Add : more DV format support by MP4Splitter.

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4112 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 311 insertions, 309 deletions

diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
index 2f7c1f718..cd90cdf5f 100644
--- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4Atom.h
@@ -299,7 +299,6 @@ const AP4_Atom::Type AP4_ATOM_TYPE_AVDJ = AP4_ATOM_TYPE('A','V','D','J');
 const AP4_Atom::Type AP4_ATOM_TYPE_DMB1 = AP4_ATOM_TYPE('d','m','b','1');

 //

 const AP4_Atom::Type AP4_ATOM_TYPE_RPZA = AP4_ATOM_TYPE('r','p','z','a');

-const AP4_Atom::Type AP4_ATOM_TYPE_DVC  = AP4_ATOM_TYPE('d','v','c',' ');

 const AP4_Atom::Type AP4_ATOM_TYPE_DIV3 = AP4_ATOM_TYPE('D','I','V','3');

 const AP4_Atom::Type AP4_ATOM_TYPE_DIVX = AP4_ATOM_TYPE('d','i','v','x');

 const AP4_Atom::Type AP4_ATOM_TYPE_8BPS = AP4_ATOM_TYPE('8','B','P','S');

@@ -313,6 +312,11 @@ const AP4_Atom::Type AP4_ATOM_TYPE_YV12 = AP4_ATOM_TYPE('y','v','1','2');
 const AP4_Atom::Type AP4_ATOM_TYPE_PASP = AP4_ATOM_TYPE('p','a','s','p');

 

 const AP4_Atom::Type AP4_ATOM_TYPE_NMOS = AP4_ATOM_TYPE('n','m','o','s');

+

+const AP4_Atom::Type AP4_ATOM_TYPE_DVC  = AP4_ATOM_TYPE('d','v','c',' ');

+const AP4_Atom::Type AP4_ATOM_TYPE_DV5P = AP4_ATOM_TYPE('d','v','5','p');

+const AP4_Atom::Type AP4_ATOM_TYPE_DVCP = AP4_ATOM_TYPE('d','v','c','p');

+const AP4_Atom::Type AP4_ATOM_TYPE_DVPP = AP4_ATOM_TYPE('d','v','p','p');

 /*----------------------------------------------------------------------

 |       AP4_AtomListInspector

 +---------------------------------------------------------------------*/

diff --git a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
index 8c56571f9..d9af587aa 100644
--- a/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
+++ b/src/filters/parser/MP4Splitter/AP4/Core/Ap4AtomFactory.cpp
@@ -177,317 +177,315 @@ AP4_AtomFactory::CreateAtomFromStream(AP4_ByteStream& stream,
     

     // create the atom

     switch (type) {

-      case AP4_ATOM_TYPE_MOOV:

-        atom = DNew AP4_MoovAtom(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_MVHD:

-        atom = DNew AP4_MvhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_TRAK:

-        atom = DNew AP4_TrakAtom(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_HDLR:

-        atom = DNew AP4_HdlrAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_DREF:

-        atom = DNew AP4_DrefAtom(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_URL:

-        atom = DNew AP4_UrlAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_TKHD:

-        atom = DNew AP4_TkhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_MDHD:

-        atom = DNew AP4_MdhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_STSD:

-        atom = DNew AP4_StsdAtom(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_STSC:

-        atom = DNew AP4_StscAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_STCO:

-        atom = DNew AP4_StcoAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_CO64:

-        atom = DNew AP4_Co64Atom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_STSZ:

-        atom = DNew AP4_StszAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_STTS:

-        atom = DNew AP4_SttsAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_CTTS:

-        atom = DNew AP4_CttsAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_STSS:

-        atom = DNew AP4_StssAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_MP4S:

-        atom = DNew AP4_Mp4sSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_MP4A:

-		atom = parent && parent->GetType() == AP4_ATOM_TYPE_STSD 

-			? (AP4_Atom*)DNew AP4_Mp4aSampleEntry(size, stream, *this)

-			: (AP4_Atom*)DNew AP4_UnknownAtom(type, size, false, stream);

-        break;

-

-      case AP4_ATOM_TYPE_MP4V:

-        atom = DNew AP4_Mp4vSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_AVC1:

-        atom = DNew AP4_Avc1SampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_ENCA:

-        atom = DNew AP4_EncaSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_ENCV:

-        atom = DNew AP4_EncvSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_ESDS:

-        atom = DNew AP4_EsdsAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_VMHD:

-        atom = DNew AP4_VmhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_SMHD:

-        atom = DNew AP4_SmhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_NMHD:

-        atom = DNew AP4_NmhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_HMHD:

-        atom = DNew AP4_HmhdAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_FRMA:

-        atom = DNew AP4_FrmaAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_SCHM:

-          atom = DNew AP4_SchmAtom(size, stream);

-          break;

-

-      case AP4_ATOM_TYPE_FTYP:

-        atom = DNew AP4_FtypAtom(size, stream);

-        break;

-          

-      case AP4_ATOM_TYPE_RTP:

-        if (m_Context == AP4_ATOM_TYPE_HNTI) {

-            atom = DNew AP4_RtpAtom(size, stream);

-        } else {

-            atom = DNew AP4_RtpHintSampleEntry(size, stream, *this);

-        }

-        break;

-      

-      case AP4_ATOM_TYPE_TIMS:

-        atom = DNew AP4_TimsAtom(size, stream);

-        break;

- 

-      case AP4_ATOM_TYPE_SDP:

-        atom = DNew AP4_SdpAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_IKMS:

-        atom = DNew AP4_IkmsAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_ISFM:

-        atom = DNew AP4_IsfmAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_HINT:

-        atom = DNew AP4_TrefTypeAtom(type, size, stream);

-        break;

-

-      // container atoms

-      case AP4_ATOM_TYPE_TREF:

-      case AP4_ATOM_TYPE_HNTI:

-      case AP4_ATOM_TYPE_STBL:

-      case AP4_ATOM_TYPE_MDIA:

-      case AP4_ATOM_TYPE_DINF:

-      case AP4_ATOM_TYPE_MINF:

-      case AP4_ATOM_TYPE_SCHI:

-      case AP4_ATOM_TYPE_SINF:

-      case AP4_ATOM_TYPE_UDTA:

-      case AP4_ATOM_TYPE_ILST:

-	  case AP4_ATOM_TYPE_NAM:

-	  case AP4_ATOM_TYPE_ART:

-      case AP4_ATOM_TYPE_WRT:

-      case AP4_ATOM_TYPE_ALB:

-      case AP4_ATOM_TYPE_DAY:

-      case AP4_ATOM_TYPE_TOO:

-      case AP4_ATOM_TYPE_CMT:

-      case AP4_ATOM_TYPE_GEN:

-	  case AP4_ATOM_TYPE_TRKN:

-	  case AP4_ATOM_TYPE_EDTS:

-	  case AP4_ATOM_TYPE_WAVE: 

-	  case AP4_ATOM_TYPE_CMOV: {

-          AP4_UI32 context = m_Context;

-          m_Context = type; // set the context for the children

-          atom = DNew AP4_ContainerAtom(type, size, false, stream, *this);

-          m_Context = context; // restore the previous context

-          break;

-      }

-

-      // full container atoms

-      case AP4_ATOM_TYPE_META:

-        atom = DNew AP4_ContainerAtom(type, size, true, stream, *this);

-        break;

-

-      // other

-

-      case AP4_ATOM_TYPE_AVCC:

-        atom = DNew AP4_AvcCAtom(size, stream);

-        break;

-

-      case AP4_ATOM_TYPE_TEXT:

-        atom = DNew AP4_TextSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_TX3G:

-        atom = DNew AP4_Tx3gSampleEntry(size, stream, *this);

-        break;

-

-      case AP4_ATOM_TYPE_FTAB:

-        atom = DNew AP4_FtabAtom(size, stream);

-        break;

-

-	  case AP4_ATOM_TYPE_CVID:

-      case AP4_ATOM_TYPE_SVQ1:

-      case AP4_ATOM_TYPE_SVQ2:

-      case AP4_ATOM_TYPE_SVQ3:

-	  case AP4_ATOM_TYPE_H261:

-	  case AP4_ATOM_TYPE_H263:

-      case AP4_ATOM_TYPE_S263:

-	  case AP4_ATOM_TYPE_JPEG:

-	  case AP4_ATOM_TYPE_PNG:

-      case AP4_ATOM_TYPE_RLE:

-	  case AP4_ATOM_TYPE_MJPA:

-	  case AP4_ATOM_TYPE_MJPB:

-	  case AP4_ATOM_TYPE_RPZA:

-	  case AP4_ATOM_TYPE_DVC:

-	  case AP4_ATOM_TYPE_DIV3:

-	  case AP4_ATOM_TYPE_DIVX:

-	  case AP4_ATOM_TYPE_8BPS:

-	  case AP4_ATOM_TYPE_3IV1:

-	  case AP4_ATOM_TYPE_3IV2:

-	  case AP4_ATOM_TYPE_IV32:

-	  case AP4_ATOM_TYPE_IV41:

-	  case AP4_ATOM_TYPE_VP31:

-	  case AP4_ATOM_TYPE_YV12:

-        atom = DNew AP4_VisualSampleEntry(type, size, stream, *this);

-        break;

-

-	  case AP4_ATOM_TYPE_MJPG:

-	  case AP4_ATOM_TYPE_AVDJ://uncommon fourcc

-	  case AP4_ATOM_TYPE_DMB1://uncommon fourcc

-        atom = DNew AP4_VisualSampleEntry(AP4_ATOM_TYPE_MJPG, size, stream, *this);

-        break;

-

-	  case AP4_ATOM_TYPE_SAMR:

-	  case AP4_ATOM_TYPE__MP3:

-	  case AP4_ATOM_TYPE_IMA4:

-	  case AP4_ATOM_TYPE_QDMC:

-	  case AP4_ATOM_TYPE_QDM2:

-	  case AP4_ATOM_TYPE_NONE:

-	  case AP4_ATOM_TYPE_RAW:

-	  case AP4_ATOM_TYPE_TWOS:

-	  case AP4_ATOM_TYPE_SOWT:

-	  case AP4_ATOM_TYPE_IN24:

-	  case AP4_ATOM_TYPE_IN32:

-	  case AP4_ATOM_TYPE_FL32:

-	  case AP4_ATOM_TYPE_FL64:

-	  case AP4_ATOM_TYPE_LPCM:

-	  case AP4_ATOM_TYPE_ALAW:

-	  case AP4_ATOM_TYPE_ULAW:

-	  case AP4_ATOM_TYPE_NMOS:

-        atom = DNew AP4_AudioSampleEntry(type, size, stream, *this);

-        break;

-

-	  case AP4_ATOM_TYPE__AC3: // AC3-in-MP4 from ISO Standard

-	  case AP4_ATOM_TYPE_SAC3: // AC3-in-MP4 from Nero Stuff >.<

-        atom = DNew AP4_AC3SampleEntry(size, stream, *this);

-        break;

+		case AP4_ATOM_TYPE_MOOV:

+			atom = DNew AP4_MoovAtom(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_MVHD:

+			atom = DNew AP4_MvhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_TRAK:

+			atom = DNew AP4_TrakAtom(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_HDLR:

+			atom = DNew AP4_HdlrAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_DREF:

+			atom = DNew AP4_DrefAtom(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_URL:

+			atom = DNew AP4_UrlAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_TKHD:

+			atom = DNew AP4_TkhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_MDHD:

+			atom = DNew AP4_MdhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_STSD:

+			atom = DNew AP4_StsdAtom(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_STSC:

+			atom = DNew AP4_StscAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_STCO:

+			atom = DNew AP4_StcoAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_CO64:

+			atom = DNew AP4_Co64Atom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_STSZ:

+			atom = DNew AP4_StszAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_STTS:

+			atom = DNew AP4_SttsAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_CTTS:

+			atom = DNew AP4_CttsAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_STSS:

+			atom = DNew AP4_StssAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_MP4S:

+			atom = DNew AP4_Mp4sSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_MP4A:

+			atom = parent && parent->GetType() == AP4_ATOM_TYPE_STSD 

+				? (AP4_Atom*)DNew AP4_Mp4aSampleEntry(size, stream, *this)

+				: (AP4_Atom*)DNew AP4_UnknownAtom(type, size, false, stream);

+			break;

+

+		case AP4_ATOM_TYPE_MP4V:

+			atom = DNew AP4_Mp4vSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_AVC1:

+			atom = DNew AP4_Avc1SampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_ENCA:

+			atom = DNew AP4_EncaSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_ENCV:

+			atom = DNew AP4_EncvSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_ESDS:

+			atom = DNew AP4_EsdsAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_VMHD:

+			atom = DNew AP4_VmhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_SMHD:

+			atom = DNew AP4_SmhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_NMHD:

+			atom = DNew AP4_NmhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_HMHD:

+			atom = DNew AP4_HmhdAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_FRMA:

+			atom = DNew AP4_FrmaAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_SCHM:

+			atom = DNew AP4_SchmAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_FTYP:

+			atom = DNew AP4_FtypAtom(size, stream);

+			break;

+		  

+		case AP4_ATOM_TYPE_RTP:

+			if (m_Context == AP4_ATOM_TYPE_HNTI) {

+				atom = DNew AP4_RtpAtom(size, stream);

+			} else {

+				atom = DNew AP4_RtpHintSampleEntry(size, stream, *this);

+			}

+			break;

+

+		case AP4_ATOM_TYPE_TIMS:

+			atom = DNew AP4_TimsAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_SDP:

+			atom = DNew AP4_SdpAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_IKMS:

+			atom = DNew AP4_IkmsAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_ISFM:

+			atom = DNew AP4_IsfmAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_HINT:

+			atom = DNew AP4_TrefTypeAtom(type, size, stream);

+			break;

+

+		// container atoms

+		case AP4_ATOM_TYPE_TREF:

+		case AP4_ATOM_TYPE_HNTI:

+		case AP4_ATOM_TYPE_STBL:

+		case AP4_ATOM_TYPE_MDIA:

+		case AP4_ATOM_TYPE_DINF:

+		case AP4_ATOM_TYPE_MINF:

+		case AP4_ATOM_TYPE_SCHI:

+		case AP4_ATOM_TYPE_SINF:

+		case AP4_ATOM_TYPE_UDTA:

+		case AP4_ATOM_TYPE_ILST:

+		case AP4_ATOM_TYPE_NAM:

+		case AP4_ATOM_TYPE_ART:

+		case AP4_ATOM_TYPE_WRT:

+		case AP4_ATOM_TYPE_ALB:

+		case AP4_ATOM_TYPE_DAY:

+		case AP4_ATOM_TYPE_TOO:

+		case AP4_ATOM_TYPE_CMT:

+		case AP4_ATOM_TYPE_GEN:

+		case AP4_ATOM_TYPE_TRKN:

+		case AP4_ATOM_TYPE_EDTS:

+		case AP4_ATOM_TYPE_WAVE: 

+		case AP4_ATOM_TYPE_CMOV: {

+			AP4_UI32 context = m_Context;

+			m_Context = type; // set the context for the children

+			atom = DNew AP4_ContainerAtom(type, size, false, stream, *this);

+			m_Context = context; // restore the previous context

+			break;

+		}

+

+		// full container atoms

+		case AP4_ATOM_TYPE_META:

+			atom = DNew AP4_ContainerAtom(type, size, true, stream, *this);

+			break;

+

+		// other

+		case AP4_ATOM_TYPE_AVCC:

+			atom = DNew AP4_AvcCAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_TEXT:

+			atom = DNew AP4_TextSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_TX3G:

+			atom = DNew AP4_Tx3gSampleEntry(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_FTAB:

+			atom = DNew AP4_FtabAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_CVID:

+		case AP4_ATOM_TYPE_SVQ1:

+		case AP4_ATOM_TYPE_SVQ2:

+		case AP4_ATOM_TYPE_SVQ3:

+		case AP4_ATOM_TYPE_H261:

+		case AP4_ATOM_TYPE_H263:

+		case AP4_ATOM_TYPE_S263:

+		case AP4_ATOM_TYPE_JPEG:

+		case AP4_ATOM_TYPE_PNG:

+		case AP4_ATOM_TYPE_RLE:

+		case AP4_ATOM_TYPE_MJPA:

+		case AP4_ATOM_TYPE_MJPB:

+		case AP4_ATOM_TYPE_RPZA:

+		case AP4_ATOM_TYPE_DIV3:

+		case AP4_ATOM_TYPE_DIVX:

+		case AP4_ATOM_TYPE_8BPS:

+		case AP4_ATOM_TYPE_3IV1:

+		case AP4_ATOM_TYPE_3IV2:

+		case AP4_ATOM_TYPE_IV32:

+		case AP4_ATOM_TYPE_IV41:

+		case AP4_ATOM_TYPE_VP31:

+		case AP4_ATOM_TYPE_YV12:

+		case AP4_ATOM_TYPE_DVC:

+		case AP4_ATOM_TYPE_DV5P:

+		case AP4_ATOM_TYPE_DVCP:

+		case AP4_ATOM_TYPE_DVPP:

+			atom = DNew AP4_VisualSampleEntry(type, size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_MJPG:

+		case AP4_ATOM_TYPE_AVDJ://uncommon fourcc

+		case AP4_ATOM_TYPE_DMB1://uncommon fourcc

+			atom = DNew AP4_VisualSampleEntry(AP4_ATOM_TYPE_MJPG, size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_SAMR:

+		case AP4_ATOM_TYPE__MP3:

+		case AP4_ATOM_TYPE_IMA4:

+		case AP4_ATOM_TYPE_QDMC:

+		case AP4_ATOM_TYPE_QDM2:

+		case AP4_ATOM_TYPE_NONE:

+		case AP4_ATOM_TYPE_RAW:

+		case AP4_ATOM_TYPE_TWOS:

+		case AP4_ATOM_TYPE_SOWT:

+		case AP4_ATOM_TYPE_IN24:

+		case AP4_ATOM_TYPE_IN32:

+		case AP4_ATOM_TYPE_FL32:

+		case AP4_ATOM_TYPE_FL64:

+		case AP4_ATOM_TYPE_LPCM:

+		case AP4_ATOM_TYPE_ALAW:

+		case AP4_ATOM_TYPE_ULAW:

+		case AP4_ATOM_TYPE_NMOS:

+			atom = DNew AP4_AudioSampleEntry(type, size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE__AC3: // AC3-in-MP4 from ISO Standard

+		case AP4_ATOM_TYPE_SAC3: // AC3-in-MP4 from Nero Stuff >.<

+			atom = DNew AP4_AC3SampleEntry(size, stream, *this);

+			break;

 		case AP4_ATOM_TYPE_EAC3:

-        atom = DNew AP4_EAC3SampleEntry(size, stream, *this);

-        break;

+			atom = DNew AP4_EAC3SampleEntry(size, stream, *this);

+			break;

 

 		case AP4_ATOM_TYPE_CHPL:

-        atom = DNew AP4_ChplAtom(size, stream);

-        break;

-

-	  case AP4_ATOM_TYPE_DATA:

-        atom = DNew AP4_DataAtom(size, stream);

-        break;

-

-	  case AP4_ATOM_TYPE_DCOM:

-        atom = DNew AP4_DcomAtom(size, stream);

-	    break;

-

-	  case AP4_ATOM_TYPE_CMVD:

-        atom = DNew AP4_CmvdAtom(size, stream, *this);

-	    break;

-

-	  case AP4_ATOM_TYPE_ENDA:

-        atom = DNew AP4_EndaAtom(size, stream);

-	    break;

-

-	  case AP4_ATOM_TYPE_PASP:

-		atom = DNew AP4_PaspAtom(size, stream);

-		break;

-

-      default:

-

-		if(parent && parent->GetType() == AP4_ATOM_TYPE_STSD && (type & 0xffff0000) == AP4_ATOM_TYPE('m', 's', 0, 0))

-		{

-	        atom = DNew AP4_AudioSampleEntry(type, size, stream, *this);

-		}

-		else // try all the external type handlers

-        {

-            atom = NULL;

-            AP4_List<TypeHandler>::Item* handler_item = m_TypeHandlers.FirstItem();

-            while (handler_item) {

-                TypeHandler* handler = handler_item->GetData();

-                if (AP4_SUCCEEDED(handler->CreateAtom(type, size, stream, atom))) {

-                    break;

-                }

-                handler_item = handler_item->GetNext();

-            }

-            if (atom == NULL) {

-                // no custom handlers, create a generic atom

-                atom = DNew AP4_UnknownAtom(type, size, false, stream);

-            }

-        }

-

-		break;

+			atom = DNew AP4_ChplAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_DATA:

+			atom = DNew AP4_DataAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_DCOM:

+			atom = DNew AP4_DcomAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_CMVD:

+			atom = DNew AP4_CmvdAtom(size, stream, *this);

+			break;

+

+		case AP4_ATOM_TYPE_ENDA:

+			atom = DNew AP4_EndaAtom(size, stream);

+			break;

+

+		case AP4_ATOM_TYPE_PASP:

+			atom = DNew AP4_PaspAtom(size, stream);

+			break;

+

+		default:

+			if(parent && parent->GetType() == AP4_ATOM_TYPE_STSD && (type & 0xffff0000) == AP4_ATOM_TYPE('m', 's', 0, 0)) {

+				atom = DNew AP4_AudioSampleEntry(type, size, stream, *this);

+			} else {// try all the external type handlers

+				atom = NULL;

+				AP4_List<TypeHandler>::Item* handler_item = m_TypeHandlers.FirstItem();

+				while (handler_item) {

+					TypeHandler* handler = handler_item->GetData();

+					if (AP4_SUCCEEDED(handler->CreateAtom(type, size, stream, atom))) {

+						break;

+					}

+					handler_item = handler_item->GetNext();

+				}

+				if (atom == NULL) {

+					// no custom handlers, create a generic atom

+					atom = DNew AP4_UnknownAtom(type, size, false, stream);

+				}

+			}

+

+			break;

     }

 

     // skip to the end of the atom