[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mp4/fileformat qtffplin.cpp,1.69,1.70
From: ehyche () helixcommunity ! org
Date: 2009-03-27 12:26:32
Message-ID: 200903271328.n2RDSd5D007765 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mp4/fileformat
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv679
Modified Files:
qtffplin.cpp
Log Message:
Fix inconsistent line endings
Index: qtffplin.cpp
===================================================================
RCS file: /cvsroot/datatype/mp4/fileformat/qtffplin.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- qtffplin.cpp 29 Oct 2008 16:52:59 -0000 1.69
+++ qtffplin.cpp 27 Mar 2009 12:26:30 -0000 1.70
@@ -555,132 +555,132 @@
HX_RESULT CQTFileFormat::Set3GPPAssetInfoOnHeader(HX_RESULT status,
IHXValues* pHeader)
{
- // 3GP Asset Info: Title, Description, Performer, Author, Genre
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_TITLE_KEY,
- (const char*) (m_MovieInfo.GetTitle()),
- m_MovieInfo.GetTitleLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_AUTHOR_KEY,
- (const char*) (m_MovieInfo.GetAuthor()),
- m_MovieInfo.GetAuthorLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_COPYRIGHT_KEY,
- (const char*) (m_MovieInfo.GetCopyright()),
- m_MovieInfo.GetCopyrightLength());
-
-#ifdef HELIX_FEATURE_3GPP_METAINFO
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_DESCRIPTION_KEY,
- (const char*) (m_MovieInfo.GetDescription()),
- m_MovieInfo.GetDescriptionLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_PERFORMER_KEY,
- (const char*) (m_MovieInfo.GetPerformer()),
- m_MovieInfo.GetPerformerLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_GENRE_KEY,
- (const char*) (m_MovieInfo.GetGenre()),
- m_MovieInfo.GetGenreLength());
-
- // 3GP Asset Info: Rating
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_CRITERIA_KEY,
- (const char*) (m_MovieInfo.GetRatingCriteria()),
- m_MovieInfo.GetRatingCriteriaLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_ENTITY_KEY,
- (const char*) (m_MovieInfo.GetRatingEntity()),
- m_MovieInfo.GetRatingEntityLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_INFO_KEY,
- (const char*) (m_MovieInfo.GetRatingInfo()),
- m_MovieInfo.GetRatingInfoLength());
+ // 3GP Asset Info: Title, Description, Performer, Author, Genre
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_TITLE_KEY,
+ (const char*) (m_MovieInfo.GetTitle()),
+ m_MovieInfo.GetTitleLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_AUTHOR_KEY,
+ (const char*) (m_MovieInfo.GetAuthor()),
+ m_MovieInfo.GetAuthorLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_COPYRIGHT_KEY,
+ (const char*) (m_MovieInfo.GetCopyright()),
+ m_MovieInfo.GetCopyrightLength());
- // 3GP Asset Info: Classification
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_CLASSIFICATION_ENTITY_KEY,
- (const char*) (m_MovieInfo.GetClassEntity()),
- m_MovieInfo.GetClassEntityLength());
- status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_CLASSIFICATION_INFO_KEY,
- (const char*) (m_MovieInfo.GetClassInfo()),
+#ifdef HELIX_FEATURE_3GPP_METAINFO
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_DESCRIPTION_KEY,
+ (const char*) (m_MovieInfo.GetDescription()),
+ m_MovieInfo.GetDescriptionLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_PERFORMER_KEY,
+ (const char*) (m_MovieInfo.GetPerformer()),
+ m_MovieInfo.GetPerformerLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_GENRE_KEY,
+ (const char*) (m_MovieInfo.GetGenre()),
+ m_MovieInfo.GetGenreLength());
+
+ // 3GP Asset Info: Rating
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_CRITERIA_KEY,
+ (const char*) (m_MovieInfo.GetRatingCriteria()),
+ m_MovieInfo.GetRatingCriteriaLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_ENTITY_KEY,
+ (const char*) (m_MovieInfo.GetRatingEntity()),
+ m_MovieInfo.GetRatingEntityLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_RATING_INFO_KEY,
+ (const char*) (m_MovieInfo.GetRatingInfo()),
+ m_MovieInfo.GetRatingInfoLength());
+
+ // 3GP Asset Info: Classification
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_CLASSIFICATION_ENTITY_KEY,
+ (const char*) (m_MovieInfo.GetClassEntity()),
+ m_MovieInfo.GetClassEntityLength());
+ status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_CLASSIFICATION_INFO_KEY,
+ (const char*) (m_MovieInfo.GetClassInfo()),
m_MovieInfo.GetClassInfoLength());
if (SUCCEEDED(status))
- {
- ULONG32 classTable = (ULONG32) m_MovieInfo.GetClassTable();
- if (classTable)
- pHeader->SetPropertyULONG32(_3GPP_META_INFO_CLASSIFICATION_TABLE_KEY,
- classTable);
- }
+ {
+ ULONG32 classTable = (ULONG32) m_MovieInfo.GetClassTable();
+ if (classTable)
+ pHeader->SetPropertyULONG32(_3GPP_META_INFO_CLASSIFICATION_TABLE_KEY,
+ classTable);
+ }
// 3GP Asset Info: Keyword Count
- ULONG32 keywordCount = 0L;
- if (SUCCEEDED(status))
+ ULONG32 keywordCount = 0L;
+ if (SUCCEEDED(status))
{
- keywordCount = (ULONG32) m_MovieInfo.GetKeywordCount();
- if (keywordCount)
- pHeader->SetPropertyULONG32(_3GPP_META_INFO_KEYWORD_COUNT_KEY, keywordCount);
- }
-
- // 3GP Asset Info: Keywords
- for (ULONG32 ulIndex = 0; ulIndex < keywordCount; ulIndex++)
- {
- // "AssetKeyword" is 12 chars
- // keyCount is 8 bytes => "%d" at most is "255" => 3 chars
- // null char '\0' is 1 char
- // we'll allocate 64 chars to be really safe
- char key[64];
-
- SafeSprintf(key, 64, _3GPP_META_INFO_KEYWORD_KEY, ulIndex);
- status = SetPropertyOnHeader(status, pHeader, key,
- (const char*) (m_MovieInfo.GetKeyword(ulIndex)),
- m_MovieInfo.GetKeywordLength(ulIndex));
- }
+ keywordCount = (ULONG32) m_MovieInfo.GetKeywordCount();
+ if (keywordCount)
+ pHeader->SetPropertyULONG32(_3GPP_META_INFO_KEYWORD_COUNT_KEY, keywordCount);
+ }
- // 3GP Asset Info: Location Info
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_NAME_KEY,
- (const char*) m_MovieInfo.GetLocationName(),
- m_MovieInfo.GetLocationNameLength());
+ // 3GP Asset Info: Keywords
+ for (ULONG32 ulIndex = 0; ulIndex < keywordCount; ulIndex++)
+ {
+ // "AssetKeyword" is 12 chars
+ // keyCount is 8 bytes => "%d" at most is "255" => 3 chars
+ // null char '\0' is 1 char
+ // we'll allocate 64 chars to be really safe
+ char key[64];
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_ASTRONOMICAL_BODY_KEY,
- (const char*) m_MovieInfo.GetLocationAstronomicalBody(),
- m_MovieInfo.GetLocationAstronomicalBodyLength());
+ SafeSprintf(key, 64, _3GPP_META_INFO_KEYWORD_KEY, ulIndex);
+ status = SetPropertyOnHeader(status, pHeader, key,
+ (const char*) (m_MovieInfo.GetKeyword(ulIndex)),
+ m_MovieInfo.GetKeywordLength(ulIndex));
+ }
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_ADDITIONAL_NOTES_KEY,
- (const char*) m_MovieInfo.GetLocationAdditionalNotes(),
- m_MovieInfo.GetLocationAdditionalNotesLength());
+ // 3GP Asset Info: Location Info
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_NAME_KEY,
+ (const char*) m_MovieInfo.GetLocationName(),
+ m_MovieInfo.GetLocationNameLength());
- if (SUCCEEDED(status))
- {
- INT16 locationRole = m_MovieInfo.GetLocationRole();
- if (locationRole >= (INT16) 0)
- pHeader->SetPropertyULONG32(_3GPP_META_INFO_LOCATION_ROLE_KEY,
- (ULONG32) locationRole);
- }
-
- LONG32 long_wholePart = m_MovieInfo.GetLongitude_WholePart();
- LONG32 long_fractionalPart = m_MovieInfo.GetLongitude_FractionalPart();
- LONG32 lat_wholePart = m_MovieInfo.GetLatitude_WholePart();
- LONG32 lat_fractionalPart = m_MovieInfo.GetLatitude_FractionalPart();
- LONG32 alt_wholePart = m_MovieInfo.GetAltitude_WholePart();
- LONG32 alt_fractionalPart = m_MovieInfo.GetAltitude_FractionalPart();
-
- // if any part of the GPS coordinates are invalid, then all
- // coordinates are invalid
- if (long_wholePart > -99999 && long_fractionalPart > -99999 &&
- lat_wholePart > -99999 && lat_fractionalPart > -99999 &&
- alt_wholePart > -99999 && alt_fractionalPart > -99999 )
- {
- char strPos[50];
-
- // 3GP Asset Info: Location Info: Longitude
- SafeSprintf(strPos, 50, "%ld.%lu", long_wholePart, long_fractionalPart);
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_LONGITUDE_KEY, strPos, strlen(strPos));
-
- // 3GP Asset Info: Location Info: Latitude
- SafeSprintf(strPos, 50, "%ld.%lu", lat_wholePart, lat_fractionalPart);
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_LATITUDE_KEY, strPos, strlen(strPos));
-
- // 3GP Asset Info: Location Info: Altitude
- SafeSprintf(strPos, 50, "%ld.%lu", alt_wholePart, alt_fractionalPart);
- status = SetPropertyOnHeader(status, pHeader,
- _3GPP_META_INFO_LOCATION_ALTITUDE_KEY, strPos, strlen(strPos));
- }
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_ASTRONOMICAL_BODY_KEY,
+ (const char*) m_MovieInfo.GetLocationAstronomicalBody(),
+ m_MovieInfo.GetLocationAstronomicalBodyLength());
+
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_ADDITIONAL_NOTES_KEY,
+ (const char*) m_MovieInfo.GetLocationAdditionalNotes(),
+ m_MovieInfo.GetLocationAdditionalNotesLength());
+
+ if (SUCCEEDED(status))
+ {
+ INT16 locationRole = m_MovieInfo.GetLocationRole();
+ if (locationRole >= (INT16) 0)
+ pHeader->SetPropertyULONG32(_3GPP_META_INFO_LOCATION_ROLE_KEY,
+ (ULONG32) locationRole);
+ }
+
+ LONG32 long_wholePart = m_MovieInfo.GetLongitude_WholePart();
+ LONG32 long_fractionalPart = m_MovieInfo.GetLongitude_FractionalPart();
+ LONG32 lat_wholePart = m_MovieInfo.GetLatitude_WholePart();
+ LONG32 lat_fractionalPart = m_MovieInfo.GetLatitude_FractionalPart();
+ LONG32 alt_wholePart = m_MovieInfo.GetAltitude_WholePart();
+ LONG32 alt_fractionalPart = m_MovieInfo.GetAltitude_FractionalPart();
+
+ // if any part of the GPS coordinates are invalid, then all
+ // coordinates are invalid
+ if (long_wholePart > -99999 && long_fractionalPart > -99999 &&
+ lat_wholePart > -99999 && lat_fractionalPart > -99999 &&
+ alt_wholePart > -99999 && alt_fractionalPart > -99999 )
+ {
+ char strPos[50];
+
+ // 3GP Asset Info: Location Info: Longitude
+ SafeSprintf(strPos, 50, "%ld.%lu", long_wholePart, long_fractionalPart);
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_LONGITUDE_KEY, strPos, strlen(strPos));
+
+ // 3GP Asset Info: Location Info: Latitude
+ SafeSprintf(strPos, 50, "%ld.%lu", lat_wholePart, lat_fractionalPart);
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_LATITUDE_KEY, strPos, strlen(strPos));
+
+ // 3GP Asset Info: Location Info: Altitude
+ SafeSprintf(strPos, 50, "%ld.%lu", alt_wholePart, alt_fractionalPart);
+ status = SetPropertyOnHeader(status, pHeader,
+ _3GPP_META_INFO_LOCATION_ALTITUDE_KEY, strPos, strlen(strPos));
+ }
// 3GP Asset Info: Album
status = SetPropertyOnHeader(status, pHeader, _3GPP_META_INFO_ALBUM_TITLE_KEY,
@@ -721,7 +721,7 @@
// Check the license
#ifdef QTCONFIG_SERVER
- if (SUCCEEDED(status) && (m_TrackManager.GetEType() == QT_ETYPE_SERVER))
+ if (SUCCEEDED(status) && (m_TrackManager.GetEType() == QT_ETYPE_SERVER))
{
switch (m_TrackManager.GetFType())
{
@@ -783,7 +783,7 @@
}
// Reject unsupported brands
- if (SUCCEEDED(status) && (m_TrackManager.GetEType() == QT_ETYPE_SERVER))
+ if (SUCCEEDED(status) && (m_TrackManager.GetEType() == QT_ETYPE_SERVER))
{
UINT32 ulBrand = 0;
HX_RESULT resBrand = m_TrackManager.GetMajorBrand(&ulBrand);
@@ -1054,7 +1054,7 @@
// Broadcast Receiver plug-in to check and see if the RealServer is actually
// licensed to receive this content
#ifdef QTCONFIG_SERVER
- if (SUCCEEDED(status) && (!m_bViewSourceRequest) && (m_TrackManager.GetEType() == QTCONFIG_SERVER))
+ if (SUCCEEDED(status) && (!m_bViewSourceRequest) && (m_TrackManager.GetEType() == QTCONFIG_SERVER))
{
switch(m_TrackManager.GetFType())
{
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic