breeze/Bento4
1
0
Fork 0
mirror of https://github.com/axiomatic-systems/Bento4.git synced 2026-01-12 00:18:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source 
Updated Makefiles and scons build files
This commit is contained in:
bok
2009-10-05 05:59:13 +00:00
parent bf29589a3d
commit e2dce6852f
6 changed files with 72 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Build/Build.scons
View File

@@ -144,7 +144,7 @@ LibraryModule(name = 'Bento4',
build_source_dirs = ['C++/'+dir for dir in ['Core', 'Crypto', 'MetaData', 'System/StdC', 'Codecs']],
included_modules = 'Config')
for name in ['Mp4Dump', 'Mp4Info', 'Mp4Edit', 'Mp4Encrypt', 'Mp4Decrypt', 'Mp4Tag', 'Mp4Extract', 'Mp4RtpHintInfo', 'Mp42Aac', 'Mp4DcfPackager']:
for name in ['Mp4Dump', 'Mp4Info', 'Mp4Edit', 'Mp4Encrypt', 'Mp4Decrypt', 'Mp4Tag', 'Mp4Extract', 'Mp4RtpHintInfo', 'Mp42Aac', 'Mp42Ts', 'Mp4DcfPackager']:
Executable(name, source_dir='C++/Apps/'+name)
Executable('Aac2Mp4', source_dir='C++/Apps/Aac2Mp4')

5
Build/Makefiles/Lib.mak
View File

@@ -93,8 +93,9 @@ CORE_SOURCES = \
Ap48bdlAtom.cpp \
Ap4MehdAtom.cpp \
Ap4TrexAtom.cpp \
Ap4LinearReader.cpp \
Ap4Hmac.cpp
Ap4LinearReader.cpp \
Ap4Hmac.cpp \
Ap4KeyWrap.cpp
CORE_OBJECTS=$(CORE_SOURCES:.cpp=.o)

36
Build/Makefiles/Mp42Ts.mak Normal file
View File

@@ -0,0 +1,36 @@
##########################################################################
#
# Mp42Ts Program
#
# (c) 2002-2009 Axiomatic Systems, LLC
#
##########################################################################
all: mp42ts
##########################################################################
# includes
##########################################################################
include $(BUILD_ROOT)/Makefiles/Lib.exp
##########################################################################
# targets
##########################################################################
TARGET_SOURCES = Mp42Ts.cpp
##########################################################################
# make path
##########################################################################
VPATH += $(SOURCE_ROOT)/Apps/Mp42Ts
##########################################################################
# includes
##########################################################################
include $(BUILD_ROOT)/Makefiles/Rules.mak
##########################################################################
# rules
##########################################################################
mp42ts: $(TARGET_OBJECTS) $(TARGET_LIBRARY_FILES)
$(LINK) $(TARGET_OBJECTS) -o $@ $(LINK_LIBRARIES)

6
Build/Makefiles/TopLevel.mak
View File

@@ -47,7 +47,7 @@ Setup:
mkdir $(OUTPUT_DIR)
# ------- Apps -----------
ALL_APPS = mp4dump mp4info mp42aac aac2mp4 mp4decrypt mp4encrypt mp4edit mp4extract mp4rtphintinfo mp4tag mp4dcfpackager
ALL_APPS = mp4dump mp4info mp42aac mp42ts aac2mp4 mp4decrypt mp4encrypt mp4edit mp4extract mp4rtphintinfo mp4tag mp4dcfpackager
export ALL_APPS
##################################################################
@@ -83,6 +83,10 @@ mp42aac: lib
$(TITLE)
@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp42Aac.mak
mp42ts: lib
$(TITLE)
@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Mp42Ts.mak
aac2mp4: lib
$(TITLE)
@$(INVOKE_SUBMAKE) -f $(BUILD_ROOT)/Makefiles/Aac2Mp4.mak

9
Source/C++/Apps/Mp42Ts/Mp42Ts.cpp
View File

@@ -116,11 +116,12 @@ AP4_BitWriter::Write(AP4_UI32 bits, unsigned int bit_count)
while (bit_count) {
unsigned int mask = bit_count==32 ? 0xFFFFFFFF : ((1<<bit_count)-1);
if (bit_count <= space) {
*data = *data | ((bits&mask) << (space-bit_count));
*data |= ((bits&mask) << (space-bit_count));
m_BitCount += bit_count;
return;
} else {
*data++ = *data | ((bits&mask) >> (bit_count-space));
*data |= ((bits&mask) >> (bit_count-space));
++data;
m_BitCount += space;
bit_count -= space;
space = 8;
@@ -263,11 +264,11 @@ WritePacketHeader(unsigned int pid,
if (adaptation_field_size == 0) {
// no adaptation field
header[3] = (1<<4) | (ContinuityCounter[cc_index]++)&0x0F;
header[3] = (1<<4) | ((ContinuityCounter[cc_index]++)&0x0F);
output->Write(header, 4);
} else {
// adaptation field present
header[3] = (3<<4) | (ContinuityCounter[cc_index]++)&0x0F;
header[3] = (3<<4) | ((ContinuityCounter[cc_index]++)&0x0F);
output->Write(header, 4);
if (adaptation_field_size == 1) {

44
Source/C++/Core/Ap4Marlin.cpp
View File

@@ -148,8 +148,9 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
AP4_MoovAtom* moov = AP4_DYNAMIC_CAST(AP4_MoovAtom, top_level.GetChild(AP4_ATOM_TYPE_MOOV));
if (moov == NULL) return AP4_ERROR_INVALID_FORMAT;
AP4_TrakAtom* od_trak = NULL;
AP4_List<AP4_TrakAtom>::Item* trak_item = moov->GetTrakAtoms().FirstItem();
while (trak_item) {
for (AP4_List<AP4_TrakAtom>::Item* trak_item = moov->GetTrakAtoms().FirstItem();
trak_item;
trak_item = trak_item->GetNext()) {
AP4_TrakAtom* trak = trak_item->GetData();
if (trak) {
if (trak->GetId() == od_track_id) {
@@ -158,7 +159,6 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
sinf_entries.Add(new SinfEntry(trak->GetId(), NULL));
}
}
trak_item = trak_item->GetNext();
}
// check that we have found the OD track
@@ -227,8 +227,8 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
// process all the object descriptors in the od update
for (AP4_List<AP4_Descriptor>::Item* od_item = od_update->GetDescriptors().FirstItem();
od_item;
od_item = od_item->GetNext()) {
od_item;
od_item = od_item->GetNext()) {
od = AP4_DYNAMIC_CAST(AP4_ObjectDescriptor, od_item->GetData());
if (od == NULL) continue;
@@ -243,8 +243,8 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
AP4_UI32 track_id = track_references->GetTrackIds()[es_id_ref->GetRefIndex()-1];
SinfEntry* sinf_entry = NULL;
for (AP4_List<SinfEntry>::Item* sinf_entry_item = sinf_entries.FirstItem();
sinf_entry_item;
sinf_entry_item = sinf_entry_item->GetNext()) {
sinf_entry_item;
sinf_entry_item = sinf_entry_item->GetNext()) {
sinf_entry = sinf_entry_item->GetData();
if (sinf_entry->m_TrackId == track_id) {
break; // match
@@ -263,8 +263,8 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
// find the ipmp descriptor referenced by the pointer
AP4_IpmpDescriptor* ipmpd = NULL;
for (AP4_List<AP4_Descriptor>::Item* ipmpd_item = ipmp_update->GetDescriptors().FirstItem();
ipmpd_item;
ipmpd_item = ipmpd_item->GetNext()) {
ipmpd_item;
ipmpd_item = ipmpd_item->GetNext()) {
// check that this descriptor is of the right type
ipmpd = AP4_DYNAMIC_CAST(AP4_IpmpDescriptor, ipmpd_item->GetData());
if (ipmpd == NULL || ipmpd->GetIpmpsType() != AP4_MARLIN_IPMPS_TYPE_MGSV) continue;
@@ -315,15 +315,15 @@ AP4_MarlinIpmpParser::Parse(AP4_AtomParent& top_level,
}
// get rid of entries that have no SINF
AP4_List<SinfEntry>::Item* sinf_entry_item = sinf_entries.FirstItem();
while (sinf_entry_item) {
for (AP4_List<SinfEntry>::Item* sinf_entry_item = sinf_entries.FirstItem();
sinf_entry_item;
sinf_entry_item = sinf_entry_item->GetNext()) {
SinfEntry* sinf_entry = sinf_entry_item->GetData();
if (sinf_entry->m_Sinf == NULL) {
sinf_entries.Remove(sinf_entry);
sinf_entry_item = sinf_entries.FirstItem();
continue;
}
sinf_entry_item = sinf_entry_item->GetNext();
}
// remove the iods atom and the OD track if required
@@ -386,8 +386,8 @@ AP4_MarlinIpmpDecryptingProcessor::CreateTrackHandler(AP4_TrakAtom* trak)
// look for this track in the list of entries
AP4_MarlinIpmpParser::SinfEntry* sinf_entry = NULL;
for (AP4_List<AP4_MarlinIpmpParser::SinfEntry>::Item* sinf_entry_item = m_SinfEntries.FirstItem();
sinf_entry_item;
sinf_entry_item = sinf_entry_item->GetNext()) {
sinf_entry_item;
sinf_entry_item = sinf_entry_item->GetNext()) {
sinf_entry = sinf_entry_item->GetData();
if (sinf_entry->m_TrackId == trak->GetId()) {
break; // match
@@ -621,8 +621,9 @@ AP4_MarlinIpmpEncryptingProcessor::Initialize(
// look for an available track ID, starting at 1
unsigned int od_track_id = 0;
unsigned int od_track_position = 0;
AP4_List<AP4_TrakAtom>::Item* trak_item = moov->GetTrakAtoms().FirstItem();
while (trak_item) {
for (AP4_List<AP4_TrakAtom>::Item* trak_item = moov->GetTrakAtoms().FirstItem();
trak_item;
trak_item = trak_item->GetNext()) {
AP4_TrakAtom* trak = trak_item->GetData();
if (trak) {
od_track_position++;
@@ -636,8 +637,7 @@ AP4_MarlinIpmpEncryptingProcessor::Initialize(
}
//m_SinfEntries.Add(new SinfEntry(trak->GetId(), NULL));
}
trak_item = trak_item->GetNext();
}
}
// check that there was at least one track in the file
@@ -665,11 +665,11 @@ AP4_MarlinIpmpEncryptingProcessor::Initialize(
// add the iods atom to the moov atom (try to put it just after mvhd)
int iods_position = 0;
int item_position = 0;
for (AP4_List<AP4_Atom>::Item* item = moov->GetChildren().FirstItem();
item;
++item) {
for (AP4_List<AP4_Atom>::Item* moov_item = moov->GetChildren().FirstItem();
moov_item;
moov_item = moov_item->GetNext()) {
++item_position;
if (item->GetData()->GetType() == AP4_ATOM_TYPE_MVHD) {
if (moov_item->GetData()->GetType() == AP4_ATOM_TYPE_MVHD) {
iods_position = item_position;
break;
}