Changeset 379

Show
Ignore:
Timestamp:
01/24/10 08:03:31 (7 months ago)
Author:
bok
Message:

Changed AP4_Size from unsigned long to AP4_UI32

Location:
trunk/Source/C++/Core
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/Source/C++/Core/Ap4Atom.cpp

    r361 r379  
    298298    } 
    299299    AP4_FormatString(header, sizeof(header),  
    300                      "size=%ld+%lld%s",  
     300                     "size=%d+%lld%s",  
    301301                     GetHeaderSize(),  
    302302                     GetSize()-GetHeaderSize(),  

  • trunk/Source/C++/Core/Ap4DecoderConfigDescriptor.cpp

    r309 r379  
    133133{ 
    134134    char info[64]; 
    135     AP4_FormatString(info, sizeof(info), "size=%ld+%ld",  
     135    AP4_FormatString(info, sizeof(info), "size=%d+%d",  
    136136        GetHeaderSize(), 
    137137        m_PayloadSize); 

  • trunk/Source/C++/Core/Ap4Ipmp.cpp

    r309 r379  
    8686{ 
    8787    char info[64]; 
    88     AP4_FormatString(info, sizeof(info), "size=%ld+%ld",  
     88    AP4_FormatString(info, sizeof(info), "size=%d+%d",  
    8989                     GetHeaderSize(),m_PayloadSize); 
    9090    inspector.StartElement("[IPMP_DescriptorPointer]", info); 
    … …  
    202202{ 
    203203    char info[64]; 
    204     AP4_FormatString(info, sizeof(info), "size=%ld+%ld",  
     204    AP4_FormatString(info, sizeof(info), "size=%d+%d",  
    205205                     GetHeaderSize(),m_PayloadSize); 
    206206    inspector.StartElement("[IPMP_Descriptor]", info); 

  • trunk/Source/C++/Core/Ap4SampleEntry.cpp

    r324 r379  
    6464AP4_SampleEntry::AP4_SampleEntry(AP4_Atom::Type format, 
    6565                                 AP4_Size       size) : 
    66     AP4_ContainerAtom(format, size, false) 
     66    AP4_ContainerAtom(format, (AP4_UI64)size, false) 
    6767{ 
    6868} 
    … …  
    7575                                 AP4_ByteStream&  stream, 
    7676                                 AP4_AtomFactory& atom_factory) : 
    77     AP4_ContainerAtom(format, size, false) 
     77    AP4_ContainerAtom(format, (AP4_UI64)size, false) 
    7878{ 
    7979    Read(stream, atom_factory); 

  • trunk/Source/C++/Core/Ap4Types.h

    r276 r379  
    4848typedef signed   short AP4_SI16; 
    4949typedef unsigned char  AP4_UI08; 
    50 typedef unsigned char  AP4_Byte; 
    51 typedef unsigned long  AP4_Size; 
     50typedef AP4_UI08       AP4_Byte; 
     51typedef AP4_UI32       AP4_Size; 
    5252 
    5353// the rest depends on whether the platform supports 64-bit integers