Author: dmeyer
Date: Fri Dec 15 19:42:15 2006
New Revision: 2244
Modified:
trunk/metadata/src/audio/core.py
trunk/metadata/src/core.py
trunk/metadata/src/video/core.py
Log:
move fourcc handling into core.Media
Modified: trunk/metadata/src/audio/core.py
==============================================================================
--- trunk/metadata/src/audio/core.py (original)
+++ trunk/metadata/src/audio/core.py Fri Dec 15 19:42:15 2006
@@ -33,10 +33,6 @@
EXTENSION_STREAM
from kaa.metadata.factory import register
-# fourcc list
-import kaa.metadata.fourcc as fourcc
-
-
AUDIOCORE = ['channels', 'samplerate', 'length', 'encoder', 'codec', 'format',
'samplebits', 'bitrate', 'fourcc', 'trackno' ]
@@ -50,11 +46,6 @@
_keys = Media._keys + AUDIOCORE
media = MEDIA_AUDIO
- def _finalize(self):
- Media._finalize(self)
- if self.codec is not None:
- self.fourcc, self.codec = fourcc.resolve(self.codec)
-
class Music(Audio):
"""
Modified: trunk/metadata/src/core.py
==============================================================================
--- trunk/metadata/src/core.py (original)
+++ trunk/metadata/src/core.py Fri Dec 15 19:42:15 2006
@@ -39,6 +39,8 @@
# kaa imports
from kaa.strutils import str_to_unicode, unicode_to_str
+import fourcc
+
UNPRINTABLE_KEYS = [ 'thumbnail']
# media type definitions
@@ -214,6 +216,12 @@
value = value.strip().rstrip().replace(u'\0', u'')
setattr(self, attr, value)
+ if 'fourcc' in self._keys and 'codec' in self._keys and \
+ self.codec is not None:
+ # resolve fourcc
+ self.fourcc, self.codec = fourcc.resolve(self.codec)
+
+
#
# data access
#
Modified: trunk/metadata/src/video/core.py
==============================================================================
--- trunk/metadata/src/video/core.py (original)
+++ trunk/metadata/src/video/core.py Fri Dec 15 19:42:15 2006
@@ -35,8 +35,6 @@
from kaa.metadata.factory import register
from kaa.metadata.audio.core import Audio as AudioStream
-# fourcc list
-import kaa.metadata.fourcc as fourcc
VIDEOCORE = ['length', 'encoder', 'bitrate', 'samplerate', 'codec', 'format',
'samplebits', 'width', 'height', 'fps', 'aspect', 'trackno',
'fourcc' ]
@@ -52,11 +50,6 @@
_keys = Media._keys + VIDEOCORE
media = MEDIA_VIDEO
- def _finalize(self):
- Media._finalize(self)
- if self.codec is not None:
- self.fourcc, self.codec = fourcc.resolve(self.codec)
-
class Chapter(Media):
"""
-------------------------------------------------------------------------
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
