Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Now AVCONV honors the video bitrate param, so the ISOs should be of t…

…he right size
  • Loading branch information...
commit d875b5023d34a0af047661de46da7ae4d762d5f1 1 parent 362b150
Sergio Costas authored
Showing with 30 additions and 62 deletions.
  1. +17 −33 devede_avconv_convert.py
  2. +13 −29 devede_ffmpeg_convert.py
50 devede_avconv_convert.py
View
@@ -228,7 +228,6 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
command_var=["avconv"]
- #command_var=["avconv"]
command_var.append("-i")
command_var.append(videofile["path"])
@@ -471,10 +470,6 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
elif videofile["mbd"]==2:
command_var.append("-mbd")
command_var.append("2")
-
- if (vcd==False):
- command_var.append("-b:v")
- command_var.append(str(videorate)+"k")
#if disctype!="divx":
# lavcopts+=":keyint="+str(keyintv)
@@ -508,35 +503,12 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
os.remove(passlog_var)
except:
pass
- #if videofile["turbo1stpass"]:
- # lavcopts+=":turbo"
-
-#
-# if (disctype=="divx") and (copy_audio==False) and (isvob==False):
-# lameopts="abr:br="+str(audiorate)
-# command_var.append("-lameopts")
-# extra_params=videofile["params_lame"] # take the LAME extra params
-# while (extra_params!=""):
-# extra_params,new_param=devede_other.get_new_param(extra_params)
-# if (new_param!="") and (new_param!=':'):
-# while (len(new_param)>1) and (new_param[0]==':'):
-# new_param=new_param[1:]
-# while (len(new_param)>1) and (new_param[-1]==':'):
-# new_param=new_param[:-1]
-# lameopts+=":"+new_param
-# command_var.append(lameopts)
- currentfile=self.create_filename(filefolder+filename,title,chapter,disctype=="divx")
-
- if (passlog_var != None) and (isvob==False):
- command_var.append("-passlogfile")
- command_var.append(passlog_var)
-
- if (encpass==1) and (isvob==False):
- command_var.append("-y")
- command_var.append("/dev/null")
- else:
- command_var.append(currentfile)
+ if (vcd==False):
+ command_var.append("-b:v")
+ command_var.append(str(videorate)+"k")
+
+
at=audio_tracks
while (at>1):
@@ -553,6 +525,18 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
if new_param!="":
command_var.append(new_param)
+ currentfile=self.create_filename(filefolder+filename,title,chapter,disctype=="divx")
+
+ if (passlog_var != None) and (isvob==False):
+ command_var.append("-passlogfile")
+ command_var.append(passlog_var)
+
+ if (encpass==1) and (isvob==False):
+ command_var.append("-y")
+ command_var.append("/dev/null")
+ else:
+ command_var.append(currentfile)
+
self.print_error=_("Conversion failed.\nIt seems a bug of Mencoder.")
if (videofile["params"]!="") or (videofile["params_vf"]!="") or (videofile["params_lame"]!=""):
self.print_error+="\n"+_("Also check the extra params passed to Mencoder for syntax errors.")
42 devede_ffmpeg_convert.py
View
@@ -508,36 +508,7 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
os.remove(passlog_var)
except:
pass
- #if videofile["turbo1stpass"]:
- # lavcopts+=":turbo"
-
-#
-# if (disctype=="divx") and (copy_audio==False) and (isvob==False):
-# lameopts="abr:br="+str(audiorate)
-# command_var.append("-lameopts")
-# extra_params=videofile["params_lame"] # take the LAME extra params
-# while (extra_params!=""):
-# extra_params,new_param=devede_other.get_new_param(extra_params)
-# if (new_param!="") and (new_param!=':'):
-# while (len(new_param)>1) and (new_param[0]==':'):
-# new_param=new_param[1:]
-# while (len(new_param)>1) and (new_param[-1]==':'):
-# new_param=new_param[:-1]
-# lameopts+=":"+new_param
-# command_var.append(lameopts)
-
- currentfile=self.create_filename(filefolder+filename,title,chapter,disctype=="divx")
- if (passlog_var != None) and (isvob==False):
- command_var.append("-passlogfile")
- command_var.append(passlog_var)
-
- if (encpass==1) and (isvob==False):
- command_var.append("-y")
- command_var.append("/dev/null")
- else:
- command_var.append(currentfile)
-
at=audio_tracks
while (at>1):
if (volume!=100):
@@ -552,6 +523,19 @@ def __init__(self,global_vars,videofile,filename,filefolder,progresbar,proglabel
extra_params,new_param=devede_other.get_new_param(extra_params)
if new_param!="":
command_var.append(new_param)
+
+ currentfile=self.create_filename(filefolder+filename,title,chapter,disctype=="divx")
+
+ if (passlog_var != None) and (isvob==False):
+ command_var.append("-passlogfile")
+ command_var.append(passlog_var)
+
+ if (encpass==1) and (isvob==False):
+ command_var.append("-y")
+ command_var.append("/dev/null")
+ else:
+ command_var.append(currentfile)
+
self.print_error=_("Conversion failed.\nIt seems a bug of Mencoder.")
if (videofile["params"]!="") or (videofile["params_vf"]!="") or (videofile["params_lame"]!=""):
Please sign in to comment.
Something went wrong with that request. Please try again.