Author: dmeyer
Date: Wed Dec 6 15:35:50 2006
New Revision: 2154
Modified:
trunk/metadata/src/fourcc.py
trunk/metadata/src/mediainfo.py
Log:
also print fourcc code
Modified: trunk/metadata/src/fourcc.py
==============================================================================
--- trunk/metadata/src/fourcc.py (original)
+++ trunk/metadata/src/fourcc.py Wed Dec 6 15:35:50 2006
@@ -6,16 +6,18 @@
"""
if isinstance(code, (int, long)):
if code in TWOCC:
- return unicode(TWOCC[code])
- return u'Unknown'
+ return u'0x%x' % code, unicode(TWOCC[code])
+ return u'0x%x' % code, u'Unknown'
if code.upper() in FOURCC:
- return unicode(FOURCC[code.upper()])
+ return unicode(code.upper()), unicode(FOURCC[code.upper()])
if code.upper().startswith('MS'):
code = code[2:]
+ if len(code) > 2:
+ return unicode(code), u'Unknown'
code = (ord(code[0]) << 8) + ord(code[1])
if code in TWOCC:
- return unicode(TWOCC[code])
- return u'Unknown'
+ return u'0x%x' % code, unicode(TWOCC[code])
+ return u'0x%x' % code, u'Unknown'
TWOCC = {
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Wed Dec 6 15:35:50 2006
@@ -272,7 +272,8 @@
if value == None:
continue
if key == 'codec':
- value = fourcc.resolve(value)
+ f, value = fourcc.resolve(value)
+ result += u'\n fourcc: %s' % f
result += u'\n %s: %s' % (unicode(key), unicode(value))
return result
@@ -322,7 +323,8 @@
if value == None:
continue
if key == 'codec':
- value = fourcc.resolve(value)
+ f, value = fourcc.resolve(value)
+ result += u'\n fourcc: %s' % f
result += u'\n %s: %s' % (unicode(key), unicode(value))
return result
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
