Hey Guys,

I hacked together a patch for the encoding server to convert previously
recorded shows into an iPod Video format. Here it is.
Index: src/video/plugins/reencode.py
===================================================================
--- src/video/plugins/reencode.py	(revision 8931)
+++ src/video/plugins/reencode.py	(working copy)
@@ -92,14 +92,16 @@
     def encoding_profile_menu(self, menuw=None, arg=None):
         #create a menu with a few encoding options (1cd, 2cd, xvid, mpeg4)
         #args : tuple, (videocodec, size, multipass
-        menu_items = [ menu.MenuItem("XViD, 800bps", self.create_job, (1,700,False,800)) ]
-        menu_items.append( menu.MenuItem("XViD, 800bps, High Quality", self.create_job, (1,700,True,800)) )
-        menu_items.append( menu.MenuItem("XViD, 1200bps", self.create_job, (1,1400,False,1200)) )
-        menu_items.append( menu.MenuItem("XViD, 1200bps, High Quality", self.create_job, (1,1400,True,1200)) )
-        menu_items.append( menu.MenuItem("DivX, 800bps", self.create_job, (0,700,False,800)) )
-        menu_items.append( menu.MenuItem("DivX, 800bps, High Quality", self.create_job, (0,700,True,800)) )
-        menu_items.append( menu.MenuItem("DivX, 1200bps", self.create_job, (0,1400,False,1200)) )
-        menu_items.append( menu.MenuItem("DivX, 1200bps, High Quality", self.create_job, (0,1400,True,1200)) )
+        menu_items = [ menu.MenuItem("XViD, 800bps", self.create_job, (0,0,1,None,700,False,800)) ]
+        menu_items.append( menu.MenuItem("XViD, 800bps, High Quality", self.create_job, (0,0,1,None,700,True,800)) )
+        menu_items.append( menu.MenuItem("XViD, 1200bps", self.create_job, (0,0,1,None,1400,False,1200)) )
+        menu_items.append( menu.MenuItem("XViD, 1200bps, High Quality", self.create_job, (0,0,1,None,1400,True,1200)) )
+        menu_items.append( menu.MenuItem("DivX, 800bps", self.create_job, (0,0,0,None,700,False,800)) )
+        menu_items.append( menu.MenuItem("DivX, 800bps, High Quality", self.create_job, (0,0,0,None,700,True,800)) )
+        menu_items.append( menu.MenuItem("DivX, 1200bps", self.create_job, (0,0,0,None,1400,False,1200)) )
+        menu_items.append( menu.MenuItem("DivX, 1200bps, High Quality", self.create_job, (0,0,0,None,1400,True,1200)) )
+
+        menu_items.append( menu.MenuItem("iPod", self.create_job,(2,2,2,None,None,False,1200)) )
         
         encoding_menu = menu.Menu(_('Choose your encoding profile'), menu_items)
         menuw.pushmenu(encoding_menu)
@@ -107,7 +109,7 @@
     def create_job(self, menuw=None, arg=None):
         print 'arg:', arg
         #unwrap settings tupple
-        (vcodecnr, tgtsize, mpass, vbitrate) = arg
+        (contnr, audionr, vcodecnr, vfilter, tgtsize, mpass, vbitrate) = arg
 
         #we are going to create a job and send it to the encoding server, this can take some time while analyzing
         
@@ -133,7 +135,7 @@
             self.error(resp)
             return
         
-        container = resp[0]
+        container = resp[contnr]
         
         (status, resp) = setContainer(idnr, container)
         print 'setContainer:status:', status, ' resp:', resp
@@ -169,7 +171,7 @@
             self.error(resp)
             return
         
-        acodec = resp[0]
+        acodec = resp[audionr]
         
         (status, resp) = setAudioCodec(idnr, acodec, 128)
         print 'setAudioCodec:status:', status, ' resp:', resp
@@ -177,7 +179,18 @@
         if not status:
             self.error(resp)
             return
-        
+
+        (status, resp) = getVideoFiltersCAP(idnr)
+        print 'getVideoFiltersCAP:status:', status, ' resp:', resp
+
+        if not status:
+            self.error(resp)
+            return
+
+        #vfilters=resp[vfilter]
+        #(status, resp) = setVideoFilters(idnr, vfilters)
+        #print 'setVideoFilter:status:', status, ' resp:', resp
+
         #And finally, qeue and start the job
         (status, resp) = queueIt(idnr, True)
         print 'queueIt:status:', status, ' resp:', resp
Index: src/encodingcore.py
===================================================================
--- src/encodingcore.py	(revision 8931)
+++ src/encodingcore.py	(working copy)
@@ -58,14 +58,15 @@
 #"hardcoded capabilities" .. these might change or become dynamic in the future, when more capabilities are supported
 #the "container format" will remain hardcoded
 
-ContainerCapList = [ 'Avi', 'Mkv' ]
-VideoCodecList = [ 'MPEG 4 (lavc)', 'XViD']
-AudioCodecList = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg' ]
+ContainerCapList = [ 'Avi', 'Mkv', 'mp4' ]
+VideoCodecList = [ 'MPEG 4 (lavc)', 'XViD', 'iPodv' ]
+AudioCodecList = [ 'MPEG 1 Layer 3 (mp3)', 'Ogg', 'iPoda' ]
 
 VFDict = {
     'Deinterlacing' : ['None','Linear blend','Lavc deinterlacer'],
     'Inverse Telecine' : ['None','On (stateless filter)'],
-    'Denoise' : ['None','Normal denoise','HQ denoise']
+    'Denoise' : ['None','Normal denoise','HQ denoise'],
+    'iPod' : ['iPod']
     }
 
 MencoderFilters = {
@@ -73,15 +74,16 @@
     'Lavc deinterlacer' : "lavcdeint",
     'On (stateless filter)' : "ivtc=1",
     'Normal denoise' : "denoise3d",
-    'HQ denoise' : "hqdn3d"
+    'HQ denoise' : "hqdn3d",
+    'iPod' : "scale=320:240"
     }
 
 MencoderMapping = {
-    'MPEG 4 (lavc)' : ["lavc",["-lavcopts","vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s"]],
-#to hard    'MPEG 4 (lavc)' : ["lavc",["-lavcopts","vcodec=mpeg4:vhq:vqmin=2:v4mv:vlelim=-4:vcelim=9:lumi_mask=0.05:dark_mask=0.01:autoaspect:vbitrate=%s%s"]],
-#old one    'MPEG 4 (lavc)' : ["lavc",["-lavcopts","vcodec=mpeg4:vhq:autoaspect:vbitrate=%s%s"]],
-    'XViD' : ["xvid",["-xvidencopts","bitrate=%s%s"]],
-    'MPEG 1 Layer 3 (mp3)' : ["mp3lame",["-lameopts", "cbr:br=%s"]]
+    'MPEG 4 (lavc)' : ["copy","lavc",["-lavcopts","vcodec=mpeg4:vhq:vqmin=2:v4mv:trell:autoaspect:vbitrate=%s%s"]],
+    'XViD' : ["copy","xvid",["-xvidencopts","bitrate=%s%s"]],
+    'MPEG 1 Layer 3 (mp3)' : ["frameno","mp3lame",["-lameopts", "cbr:br=%s"]],
+    'iPodv' : ["lavc","lavc",["-lavcopts","vcodec=mpeg4:vbitrate=%s%s:mbd=2:cmp=2:subcmp=2:trell=yes:v4mv=yes:vglobal=1:acodec=aac:abitrate=128:aic=2:aglobal=1"],["-of","lavf"],["-ffourcc","mp4v"],["-lavfopts","format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames"]],
+    'iPoda' : ["lavc","lavc",["-lavcopts","acodec=aac:abitrate=%s:aic=2:aglobal=1"],["-lavfopts","format=mp4:i_certify_that_my_video_stream_does_not_use_b_frames"]]
     }
 
 
@@ -158,6 +160,7 @@
             return "Unknown container format"
 
         self.container = container
+        self.output = ('%s.%s' % (self.output,self.container))
 
     def getContainerList(self):
         return ContainerCapList
@@ -207,7 +210,7 @@
 
     def setVideoFilters(self, videofilters):
         """Set video filters"""
-        for vfilter, option in videofilters.items():
+        for vfilter, option in videofilters:
             if MencoderFilters.has_key(option):
                 self.vfilters += [ MencoderFilters[option] ]
 
@@ -322,9 +325,10 @@
 
     def _GCLMAudiopass(self):
         """Returns audio pass specefic part of mencoder cl"""
-        return ["-ovc", "frameno", "-oac", MencoderMapping[self.acodec][0], MencoderMapping[self.acodec][1][0],
-                MencoderMapping[self.acodec][1][1] % self.abrate,
-                "-o", "frameno.avi"]
+        if self.acodec=='iPoda':
+       	   return ["-ovc", MencoderMapping[self.acodec][0], "-oac", MencoderMapping[self.acodec][1], MencoderMapping[self.acodec][2][0], MencoderMapping[self.acodec][2][1] % self.abrate, MencoderMapping[self.acodec][3][0], MencoderMapping[self.acodec][3][1], "-o", "frameno.avi"]
+        else:
+       	   return ["-ovc", MencoderMapping[self.acodec][0], "-oac", MencoderMapping[self.acodec][1], MencoderMapping[self.acodec][2][0], MencoderMapping[self.acodec][2][1] % self.abrate, "-o", "frameno.avi"]
 
     def _GCLMVideopass(self, passnr):
         """Returns video pass specefic part of mencoder cl"""
@@ -363,6 +367,8 @@
             idealres = self._OptimalRes(self.cropres[0], int(yscaled))
             _debug_("Rescaled, rounded yres is %sx%s" % (idealres[0], idealres[1]))
             vf += [ "scale=%s:%s" % (idealres[0], idealres[1])]
+        elif self.vcodec == "iPodv":
+            vf += [ "scale=320:240" ]
 
         _debug_("Video filters: %s" % vf)
 
@@ -379,9 +385,10 @@
         else:
             output=self.output
 
-        args = ["-oac", "copy", "-ovc",MencoderMapping[self.vcodec][0], MencoderMapping[self.vcodec][1][0],
-                MencoderMapping[self.vcodec][1][1] % (self.vbrate, vpass),
-                "-vf", vfilter, "-o", output]
+        if (self.vcodec=='iPodv'):
+        	args = ["-oac", MencoderMapping[self.vcodec][0], "-ovc", MencoderMapping[self.vcodec][1], MencoderMapping[self.vcodec][2][0], MencoderMapping[self.vcodec][2][1] % (self.vbrate, vpass), "-vf", vfilter, MencoderMapping[self.vcodec][3][0], MencoderMapping[self.vcodec][3][1], MencoderMapping[self.vcodec][4][0], MencoderMapping[self.vcodec][4][1], MencoderMapping[self.vcodec][5][0], MencoderMapping[self.vcodec][5][1], "-o", output]
+        else:
+        	args = ["-oac", MencoderMapping[self.vcodec][0], "-ovc", MencoderMapping[self.vcodec][1], MencoderMapping[self.vcodec][2][0], MencoderMapping[self.vcodec][2][1] % (self.vbrate, vpass), "-vf", vfilter, "-o", output]
 
         #if we have a progressive ntsc file, lock the output fps (do this with ivtc too)
         if ("ivtc=1" in vf) or self.ntscprog:
-------------------------------------------------------------------------
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-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-users

Reply via email to