Author: tack
Date: Wed Apr 26 00:08:44 2006
New Revision: 1507
Modified:
trunk/metadata/src/mediainfo.py
trunk/metadata/src/video/asfinfo.py
trunk/metadata/src/video/riffinfo.py
Log:
Some fourcc stuff I forgot to check in ages ago :)
Modified: trunk/metadata/src/mediainfo.py
==============================================================================
--- trunk/metadata/src/mediainfo.py (original)
+++ trunk/metadata/src/mediainfo.py Wed Apr 26 00:08:44 2006
@@ -56,10 +56,10 @@
MEDIACORE = ['title', 'caption', 'comment', 'artist', 'size', 'type',
'subtype', 'date', 'keywords', 'country', 'language', 'url']
-AUDIOCORE = ['channels', 'samplerate', 'length', 'encoder', 'codec',
+AUDIOCORE = ['channels', 'samplerate', 'length', 'encoder', 'codec', 'format',
'samplebits', 'bitrate', 'language']
-VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec',
+VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec', 'format',
'samplebits', 'width', 'height', 'fps', 'aspect']
MUSICCORE = ['trackno', 'trackof', 'album', 'genre','discs', 'image',
Modified: trunk/metadata/src/video/asfinfo.py
==============================================================================
--- trunk/metadata/src/video/asfinfo.py (original)
+++ trunk/metadata/src/video/asfinfo.py Wed Apr 26 00:08:44 2006
@@ -274,6 +274,7 @@
vi.width, vi.height, depth, \
codec, = struct.unpack('<4xII2xH4s', s[89:89+20])
vi.codec = fourcc.RIFFCODEC[codec]
+ vi.format = codec
vi.id = strno
self.video.append(vi)
elif streamtype == GUIDS['ASF_Audio_Media']:
@@ -282,6 +283,7 @@
ai.samplebits, = struct.unpack('<HHIIHH', s[78:78+16])
ai.bitrate = 8*bitrate # XXX Is this right?
ai.codec = fourcc.RIFFWAVE[twocc]
+ ai.format = twocc
ai.id = strno
self.audio.append(ai)
pass
Modified: trunk/metadata/src/video/riffinfo.py
==============================================================================
--- trunk/metadata/src/video/riffinfo.py (original)
+++ trunk/metadata/src/video/riffinfo.py Wed Apr 26 00:08:44 2006
@@ -202,6 +202,7 @@
ai.codec = fourcc.RIFFWAVE[retval['wFormatTag']]
except (KeyError, IndexError):
ai.codec = "Unknown"
+ ai.format = retval['wFormatTag']
self.audio.append(ai)
elif fccType == 'vids':
v = struct.unpack('<IIIHH',t[0:16])
@@ -227,6 +228,7 @@
vi.bitrate = strh['dwRate']
vi.fps = round(float(strh['dwRate'] * 100) / strh['dwScale']) / 100
vi.length = strh['dwLength'] / vi.fps
+ vi.format = retval['fourcc']
self.video.append(vi)
return retval
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
