Author: tack
Date: Thu Dec 28 17:06:50 2006
New Revision: 2293
Modified:
trunk/metadata/src/audio/core.py
trunk/metadata/src/video/core.py
trunk/metadata/src/video/mkv.py
Log:
Add id attribute to audio, video, subtitle, and chapter tracks. Add support
for id in mkv parser.
Modified: trunk/metadata/src/audio/core.py
==============================================================================
--- trunk/metadata/src/audio/core.py (original)
+++ trunk/metadata/src/audio/core.py Thu Dec 28 17:06:50 2006
@@ -34,7 +34,7 @@
from kaa.metadata.factory import register
AUDIOCORE = ['channels', 'samplerate', 'length', 'encoder', 'codec', 'format',
- 'samplebits', 'bitrate', 'fourcc', 'trackno' ]
+ 'samplebits', 'bitrate', 'fourcc', 'trackno', 'id' ]
MUSICCORE = ['trackof', 'album', 'genre', 'discs', 'thumbnail' ]
Modified: trunk/metadata/src/video/core.py
==============================================================================
--- trunk/metadata/src/video/core.py (original)
+++ trunk/metadata/src/video/core.py Thu Dec 28 17:06:50 2006
@@ -37,7 +37,7 @@
VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec', 'format',
- 'samplebits', 'width', 'height', 'fps', 'aspect', 'trackno',
'fourcc' ]
+ 'samplebits', 'width', 'height', 'fps', 'aspect', 'trackno',
'fourcc', 'id' ]
AVCORE = ['length', 'encoder', 'trackno', 'trackof', 'copyright', 'product',
'genre', 'writer', 'producer', 'studio', 'rating', 'starring',
@@ -55,7 +55,7 @@
"""
Chapter in a Multiplexed Container.
"""
- _keys = ['name', 'pos', 'enabled']
+ _keys = ['name', 'pos', 'enabled', 'id']
def __init__(self, name=None, pos=0):
Media.__init__(self)
@@ -68,7 +68,7 @@
"""
Subtitle Tracks in a Multiplexed Container.
"""
- _keys = ['language', 'trackno', 'title']
+ _keys = ['language', 'trackno', 'title', 'id']
media = MEDIA_SUBTITLE
def __init__(self, language=None):
Modified: trunk/metadata/src/video/mkv.py
==============================================================================
--- trunk/metadata/src/video/mkv.py (original)
+++ trunk/metadata/src/video/mkv.py Thu Dec 28 17:06:50 2006
@@ -413,6 +413,7 @@
elif track_type == MATROSKA_SUBTITLES_TRACK:
log.debug("Subtitle track found")
track = core.Subtitle()
+ track.id = len(self.subtitles)
self.subtitles.append(track)
for elem in elements:
self.process_track_common(elem, track)
@@ -486,6 +487,7 @@
track.codec = track.codec[2:]
self.media = core.MEDIA_AV
+ track.id = len(self.video)
self.video.append(track)
return track
@@ -514,6 +516,7 @@
elif track.codec.startswith('A_'):
track.codec = track.codec[2:]
+ track.id = len(self.audio)
self.audio.append(track)
return track
@@ -551,6 +554,7 @@
chap.name = display_elem.get_utf8()
log.debug('Chapter "%s" found' % str(chap.name))
+ chap.id = len(self.chapters)
self.chapters.append(chap)
-------------------------------------------------------------------------
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
