change logo option.

keyword duplicate check changed.
add epg genre.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@836 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/auto_process.py b/rec10/trunk/src/auto_process.py
index b2d8b7c..489e705 100644 (file)
--- a/rec10/trunk/src/auto_process.py
+++ b/rec10/trunk/src/auto_process.py
@@ -163,7 +163,7 @@ def update_timeline_epg_schedule(btime,etime):
         if db['type']==recdblist.REC_KEYWORD or db['type']==recdblist.REC_KEYWORD_EVERY_SOME_DAYS:\r
             ret=epgdb.searchTime(db['title'], db['btime'], db['deltatime'], db['chtxt'])\r
             if len(ret)>4 and len(ret[2])>18:\r
-                rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1],ret[4])\r
+                rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1],ret[4],ret[6])\r
                 if not (db['btime'] == ret[2] and  db['etime']==ret[3]):\r
                     rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")\r
                 else:\r
@@ -173,7 +173,7 @@ def update_timeline_epg_schedule(btime,etime):
         elif db['type']==recdblist.REC_RESERVE or db['type']==recdblist.REC_FINAL_RESERVE :\r
             ret=epgdb.searchTime(db['title'], db['btime'],"5", db['chtxt'])\r
             if len(ret)>4 and len(ret[2])>18:\r
-                rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1],ret[4])\r
+                rec10d.rec10db.update_epg_timeline(db['type'], db['chtxt'], db['title'], db['btime'], ret[2],ret[3],ret[1],ret[4],ret[6])\r
                 if not (db['btime'] == ret[2] and  db['etime']==ret[3]):\r
                     rec10d.rec10db.update_status_change_timeline(db['type'], db['chtxt'], db['title'], db['btime'], "1")\r
                 else:\r
@@ -229,14 +229,6 @@ def killDeadEncode(path):
                     os.system(ktmp.encode('utf-8'))\r
             except:\r
                 ""\r
-            """if len(kmmt)>0:\r
-                kmmt=kmmt[0]\r
-            try:\r
-                if int(kmmt)>0:\r
-                    kmmp=u"kill -9 '"+kmmp+u"'"\r
-                    os.system(kmmp.encode('utf-8'))\r
-            except:\r
-                """""\r
 def deleteTmpFile(path,title,ext):\r
     level= 0##0:b25 1:ts(del tsmix and ts.b25) 5:x264(del 2 and so on) 10:mp4/mkv\r
     smsize= 0\r

diff --git a/rec10/trunk/src/dbMySQL.py b/rec10/trunk/src/dbMySQL.py
index 498a774..b34a078 100644 (file)
--- a/rec10/trunk/src/dbMySQL.py
+++ b/rec10/trunk/src/dbMySQL.py
@@ -50,6 +50,7 @@ class DB_MySQL:
             epgduplicate TINYINT DEFAULT 0,\
             epgchange TINYINT DEFAULT 0,\
             epgexp VARCHAR(200),\
+            epgcategory VARCHAR(100),\
             counter TINYINT DEFAULT -1,\
             UNIQUE uni (type,chtxt,title,btime,deltaday)\
             )')
@@ -464,13 +465,13 @@ class DB_MySQL:
                       (type, chtxt, title, btime, etime, deltatime, deltaday, opt ,counter))
         ##db.commit()
         self.close_db(db)
-    def update_epg_timeline(self,type,chtxt,title,btime,epgbtime,epgetime,epgtitle,epgexp):
+    def update_epg_timeline(self,type,chtxt,title,btime,epgbtime,epgetime,epgtitle,epgexp,epgcategory):
         db = self.connect_db()
         db[1].execute('\
         UPDATE timeline \
-        SET epgbtime=%s,epgetime=%s,epgtitle=%s,epgexp=%s \
+        SET epgbtime=%s,epgetime=%s,epgtitle=%s,epgexp=%s,epgcategory=%s \
         WHERE type=%s AND chtxt=%s AND title=%s AND btime=%s ', \
-                      (epgbtime,epgetime,epgtitle,epgexp,type, chtxt, title, btime))
+                      (epgbtime,epgetime,epgtitle,epgexp,epgcategory,type, chtxt, title, btime))
         ##db.commit()
         self.close_db(db)
     def update_status_change_timeline(self,type,chtxt,title,btime,epgchange):

diff --git a/rec10/trunk/src/install.py b/rec10/trunk/src/install.py
index 1f2e869..07eb623 100644 (file)
--- a/rec10/trunk/src/install.py
+++ b/rec10/trunk/src/install.py
@@ -94,6 +94,10 @@ def move():
     configwriter.setTempConfPath(u"mkvmerge", getLocalPath(u"mkvmerge"))\r
     configwriter.setTempConfPath(u"b25", getLocalPath(u"b25"))\r
     configwriter.setTempConfPath(u"tee", getLocalPath(u"tee"))\r
+    try:\r
+        configwriter.setTempConfPath(u"lame", getLocalPath(u"lame"))\r
+    except:\r
+        printutf8(u"lameが見つかりません(NeroAacEncを導入する場合は問題ありません)")\r
     printutf8(u"必須環境の設定が完了しました")\r
     printutf8(u"個人設定に入ります")\r
     if os.path.exists("/etc/rec10.conf"):\r
@@ -143,6 +147,8 @@ def move():
         configwriter.setTempConfPath("NeroAAC",aacpath)\r
     else:\r
         configwriter.setTempConfPath("useNeroAAC", "0")\r
+        aacpath="/usr/local/bin/neroAacEnc"\r
+        configwriter.setTempConfPath("NeroAAC",aacpath)\r
         printutf8(u"lameを使用します。")\r
     printutf8(u"x264のパスを指定してください(7/"+str(maxn)+")")\r
     x264path=getConf(useB,"/etc/rec10.conf","path","x264","x264 path : ")\r

diff --git a/rec10/trunk/src/readme.txt b/rec10/trunk/src/readme.txt
index e7c4518..ea70a7f 100644 (file)
--- a/rec10/trunk/src/readme.txt
+++ b/rec10/trunk/src/readme.txt
@@ -1,6 +1,6 @@
 ###########################################
 #     Rec10 -Ts Recording system-         #
-#                          Ver.0.9.9      #
+#                          Ver.0.9.10     #
 # 2011/02/02         Yukikaze & long.inus #
 #  Copyright (C) 2009-2011 Yukikaze      #
 ###########################################
@@ -71,6 +71,14 @@ chdata.pyを実行してください(python chdata.py)
 yukikaze.jp@gmail.com
 
 [History]
+11/XX/XX 0.9.10
+lameの実行パスチェックを実装
+mencoderのコマンドラインを最新版対応へ
+ffmpegのオプション追加
+epggenreを追加
+keywordの重複チェックをより賢く
+logoのインポートに対応
+
 11/02/02 0.9.9
 BonTsDemuxを最新版へ(nogui化によりXvfbが不要)
 一部CSチャンネルの追加

diff --git a/rec10/trunk/src/rec10.conf b/rec10/trunk/src/rec10.conf
index b36d9e4..f9d4640 100644 (file)
--- a/rec10/trunk/src/rec10.conf
+++ b/rec10/trunk/src/rec10.conf
@@ -6,7 +6,7 @@ mencoder = /usr/bin/mencoder
 tee = /usr/bin/tee
 ffmpeg = /usr/bin/ffmpeg
 rec10 = /usr/local/share/rec10
-
+lame = /usr/bin/lame
 #recpathは録画先のフォルダを指定
 recpath = /path of /recording
 

diff --git a/rec10/trunk/src/recdb.py b/rec10/trunk/src/recdb.py
index 4c92fc8..b080755 100644 (file)
--- a/rec10/trunk/src/recdb.py
+++ b/rec10/trunk/src/recdb.py
@@ -3,13 +3,17 @@
 # Rec10 TS Recording Tools\r
 # Copyright (C) 2009-2011 Yukikaze\r
 import chdb\r
+import n_gram\r
 import rec10d\r
 import recdblist\r
 \r
 def reserveKeyword(keyword, chtxt, btime, etime, deltatime, opt):\r
     rec10d.rec10db.add_timeline(type=recdblist.REC_KEYWORD, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt)\r
 def reserveEverydayKeyword(keyword, chtxt, btime, etime, deltatime, opt, deltaday,count):\r
-    rec10d.rec10db.add_timeline(type=recdblist.REC_KEYWORD_EVERY_SOME_DAYS, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt, deltaday=deltaday,counter=count)\r
+    tcount=count\r
+    if tcount<0:\r
+        tcount=-1\r
+    rec10d.rec10db.add_timeline(type=recdblist.REC_KEYWORD_EVERY_SOME_DAYS, chtxt=chtxt, title=keyword, btime=btime, etime=etime, deltatime=deltatime, opt=opt, deltaday=deltaday,counter=tcount)\r
 def reserveReckey(type, title, chtxt, btime, etime, opt):\r
     rec10d.rec10db.add_timeline(type=type, chtxt=chtxt, title=title, btime=btime, etime=etime, opt=opt)\r
 def deleteReckey(type, title, chtxt, btime):\r
@@ -81,7 +85,11 @@ def checkDuplicated(title,chtxt,epgbtime,epgetime):
     for t in tl:\r
         if t["title"]==title and t["chtxt"]==chtxt:\r
             dup=1\r
+        elif n_gram.trigram(t["title"],title)> 500 and t["chtxt"]==chtxt:\r
+            dup=1\r
     for t in nel:\r
         if t["title"]==title and t["chtxt"]==chtxt:\r
             dup=1\r
+        elif n_gram.trigram(t["title"],title)> 500 and t["chtxt"]==chtxt:\r
+            dup=1\r
     return dup\r

diff --git a/rec10/trunk/src/ts2x264.py b/rec10/trunk/src/ts2x264.py
index 8d2e4a9..69b23b5 100644 (file)
--- a/rec10/trunk/src/ts2x264.py
+++ b/rec10/trunk/src/ts2x264.py
@@ -70,36 +70,25 @@ def ts2x264(pin, pout, opts):#sizeは"HD"か"SD"
         encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace)\r
     elif re.search("0",opts):#BonTsDemuxを使いたい場合\r
         ""\r
-    elif re.search("X",opts):\r
-        try:\r
-            encodeMencoderSar_lavf(pin, pout,size,is24fps,quality,crf,deinterlace)\r
-        except Exception, inst:\r
-            recdblist.addCommonlogEX("Error in X", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
-    elif re.search("Y",opts):\r
+    else:\r
         try:\r
-            encodeMencoderSar_lavf(pin, pout,size,is24fps,quality,crf,deinterlace)\r
+            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=1)\r
             if os.path.exists(pout):\r
                 if not os.path.getsize(pout)>1*1000:\r
                     recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)\r
                     try:\r
-                        encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)\r
+                        encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0)\r
                     except Exception, inst:\r
                         recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
             else:\r
                 recdblist.addCommonlogEX("Warning", "Old mencoder option used.","","",log_level=200)\r
                 try:\r
-                    encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)\r
+                    encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace=deinterlace,uselavf=0)\r
                 except Exception, inst:\r
                     recdblist.addCommonlogEX("Error", "ts2x264_mencoder_old(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
         except Exception, inst:\r
             recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
-    else:\r
-        try:\r
-            encodeMencoderSar(pin, pout,size,is24fps,quality,crf,deinterlace)\r
-        except Exception, inst:\r
-            recdblist.addCommonlogEX("Error", "ts2x264(ts2x264.py)", str(type(inst)), str(inst)+traceback.format_exc(),log_level=200)\r
-\r
-def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):\r
+def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1,uselavf=0):\r
     mencoder=configreader.getConfPath("mencoder")\r
     tee=configreader.getConfPath("tee")\r
     encvf=""\r
@@ -115,6 +104,7 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     x264_bitrate="5000"\r
     tsar=getMoviePAR2(pin)\r
     x264sar=str(tsar[0])+":"+str(tsar[1])\r
+    lavft=""\r
     if is24fps==1:\r
         ofps="-ofps 24000/1001"\r
         fps="-fps 30000/1001"\r
@@ -191,6 +181,8 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
         x264profile=" --level 32 --profile baseline "\r
     else:\r
         x264profile=" --level 41 --profile high "\r
+    if uselavf==1:\r
+        lavft="-demuxer lavf "\r
     x264crf=str(crf)\r
     os.environ['LANG']="ja_JP.UTF-8"\r
     random.seed(pin)\r
@@ -202,7 +194,7 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     unicode(commands.getoutput(u"mkfifo "+streampath),'utf-8','ignore')\r
     logmencoder=recdblist.getLogTitle(pin)+".mencoder.log"\r
     logx264=recdblist.getLogTitle(pin)+".x264.log"\r
-    encexe=mencoder+u" \""+pin+u"\" -quiet -vfm ffmpeg "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" 2>&1 | "+tee+" \""+logmencoder+"\" & "\r
+    encexe=mencoder+u" \""+pin+u"\" -quiet -vfm ffmpeg "+lavft+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" 2>&1 | "+tee+" \""+logmencoder+"\" & "\r
     encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf)\r
     #encexe=encexe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u"  --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize\r
     encexe=u"nice -n 19 " +encexe+" 2>&1 | "+tee+" \""+logx264+"\""\r
@@ -225,131 +217,6 @@ def encodeMencoderSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     os.remove(logx264)\r
     recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)\r
 #    recdblist.addCommandLogTar(pin,u"Mencoder","mencoder", encexe,txt)\r
-def encodeMencoderSar_lavf(pin,pout,size,is24fps,quality,crf,deinterlace=1):\r
-    mencoder=configreader.getConfPath("mencoder")\r
-    tee=configreader.getConfPath("tee")\r
-    encvf=""\r
-    txt=""\r
-    encvf="-sws 9 -vf yadif=0,pp=l5"\r
-    harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"\r
-    ofps="-ofps 30000/1001"\r
-    fps="-fps 30000/1001"\r
-    x264fps="30000/1001"\r
-    x264streamsize=""\r
-    x264preset=""\r
-    x264tune=""\r
-    x264_bitrate="5000"\r
-    tsar=getMoviePAR2(pin)\r
-    x264sar=str(tsar[0])+":"+str(tsar[1])\r
-    if is24fps==1:\r
-        ofps="-ofps 24000/1001"\r
-        fps="-fps 30000/1001"\r
-        x264fps="24000/1001"\r
-        x264tune="--tune animation"\r
-        encvf="-sws 9 -vf pullup,softskip"\r
-        harddup=",pp=l5,unsharp=l3x3:0.75:c3x3:0.75,hqdn3d=2:1:2,harddup"\r
-    if size == "HD":\r
-        tsize=getParSize(pin,720)\r
-        encvf = encvf + ",scale=-3:720::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x720"\r
-        x264_bitrate="2500"\r
-    elif size == "WVGA":\r
-        tsize=getParSize(pin,480)\r
-        encvf = encvf + ",scale=-3:480::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x480"\r
-        x264_bitrate="1500"\r
-    elif size == "FullHD":\r
-        tsize=getParSize(pin,1080)\r
-        encvf = encvf + ",scale=-3:1080::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x1080"\r
-        x264_bitrate="5000"\r
-    elif size == "QVGA_BASE":\r
-        tsize=getParSize(pin,240)\r
-        encvf = encvf + ",scale=-3:240::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x240"\r
-        x264_bitrate="300"\r
-    elif size == "WVGA_BASE":\r
-        tsize=getParSize(pin,480)\r
-        encvf = encvf + ",scale=-3:480::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x480"\r
-        x264_bitrate="1500"\r
-    else:\r
-        tsize=getParSize(pin,720)\r
-        encvf = encvf + ",scale=-3:720::0:3"+harddup\r
-        x264streamsize=str(tsize[0])+u"x720"\r
-        x264_bitrate="2500"\r
-    if deinterlace==0:\r
-        tsize=getMovieBaseSize2(pin)\r
-        ofps="-ofps 30000/1001"\r
-        #fps="-fps 30000/1001"\r
-        fps=""\r
-        x264fps="30000/1001"\r
-        x264tune=x264tune+" --tff --nal-hrd vbr"\r
-        encvf="-vf hqdn3d=2:1:2"\r
-        harddup=",harddup"\r
-        encvf=encvf+harddup\r
-        x264streamsize=str(tsize[0])+u"x"+str(tsize[1])\r
-    if tsize[0] <= 0 or tsize[1] <= 0:\r
-        encvf="-sws 9 -vf yadif=0,pp=l5"\r
-        harddup=",hqdn3d=2:1:2,unsharp=l3x3:0.75:c3x3:0.75,harddup"\r
-        ofps="-ofps 30000/1001"\r
-        fps="-fps 30000/1001"\r
-        x264fps="30000/1001"\r
-        tsize=[1280,720]\r
-        encvf = encvf + ",scale=-2:720::0:3,expand=1280:720"+harddup\r
-        x264streamsize=u"1280x720"\r
-        x264_bitrate="2500"\r
-    if quality==1:\r
-        x264preset=u"ultrafast"\r
-    elif quality==2:\r
-        x264preset=u"veryfast"\r
-    elif quality==3:\r
-        x264preset=u"fast"\r
-    elif quality==4:\r
-        x264preset=u"medium"\r
-    elif quality==5:\r
-        x264preset=u"slow"\r
-    elif quality==6:\r
-        x264preset=u"slower"\r
-    else:\r
-        x264preset=u"medium"\r
-    if size == "WVGA_BASE" or size == "QVGA_BASE":\r
-        x264profile=" --level 32 --profile baseline "\r
-    else:\r
-        x264profile=" --level 41 --profile high "\r
-    x264crf=str(crf)\r
-    os.environ['LANG']="ja_JP.UTF-8"\r
-    random.seed(pin)\r
-    random.jumpahead(10)\r
-    temptime=int(time.time())\r
-    temptime=temptime % 9697\r
-    random.jumpahead(temptime)\r
-    streampath=os.path.join(os.path.dirname(pin),str(random.randint(10000, 99999999)))\r
-    unicode(commands.getoutput(u"mkfifo "+streampath),'utf-8','ignore')\r
-    logmencoder=recdblist.getLogTitle(pin)+".mencoder.log"\r
-    logx264=recdblist.getLogTitle(pin)+".x264.log"\r
-    encexe=mencoder+u" \""+pin+u"\" -quiet -vfm ffmpeg -demuxer lavf "+encvf+u",format=i420 "+fps+" "+ofps+" -oac mp3lame -ovc raw -of rawvideo -o \""+streampath+"\" 2>&1 | "+tee+" \""+logmencoder+"\" & "\r
-    encexe=encexe+getX264Commandline(x264preset, x264sar, x264fps, x264profile, x264tune, pout, streampath, x264streamsize, crf=x264crf)\r
-    #encexe=encexe+u" nice -n 19 "+x264+" "+x264_sar+" "+x264crf+u" "+x264_addline+u"  --threads "+x264_thread+" "+x264profile+x264preset+" "+x264tune+" "+x264fps+" -o \""+pout+"\" "+streampath+" "+x264streamsize\r
-    encexe=u"nice -n 19 " +encexe+" 2>&1 | "+tee+" \""+logx264+"\""\r
-    try:\r
-        recdblist.addCommandSelfLog(pin, encexe)\r
-    except Exception, inst:\r
-        print type(inst)\r
-        print str(inst)\r
-        print traceback.print_exc(file=sys.stdout)\r
-    recdblist.printutf8(encexe)\r
-    txt=""\r
-    try:\r
-        txt=unicode(commands.getoutput(encexe.encode('utf-8')),'utf-8','ignore')\r
-    except:\r
-        ""\r
-    os.remove(streampath)\r
-    zip.addFile2FileZip(logmencoder, recdblist.getLogTitle(pin)+".log.zip")\r
-    zip.addFile2FileZip(logx264, recdblist.getLogTitle(pin)+".log.zip")\r
-    os.remove(logmencoder)\r
-    os.remove(logx264)\r
-    recdblist.addCommandLog(pin, u"Mencoder", encexe, txt)\r
 def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):\r
     """\r
 \r
@@ -366,6 +233,10 @@ def encodeFfmpegSar(pin,pout,size,is24fps,quality,crf,deinterlace=1):
     tsar=getMoviePAR2(pin)\r
     filter="-deinterlace"\r
     x264sar=str(tsar[0])+":"+str(tsar[1])\r
+    if is24fps==1:\r
+        fps=u"-r 23.976023 "\r
+        x264fps="24000/1001"\r
+        x264tune="--tune animation"\r
     if size == "HD":\r
         tsize=getParSize(pin,720)\r
         s = "-s "+str(tsize[0])+"x720 "\r

diff --git a/rec10/trunk/src/tv2audio.py b/rec10/trunk/src/tv2audio.py
index d0105e9..4bfd97a 100644 (file)
--- a/rec10/trunk/src/tv2audio.py
+++ b/rec10/trunk/src/tv2audio.py
@@ -2,8 +2,7 @@
 # coding: UTF-8\r
 # Rec10 TS Recording Tools\r
 # Copyright (C) 2009-2011 Yukikaze\r
-import os\r
-import re\r
+\r
 import commands\r
 import os\r
 import re\r
@@ -33,7 +32,7 @@ def wav2aac_nero(pin,pout):
             recdblist.addLog(pin, txt, u"Wav2aac_Lameログ-詳細")\r
 def wav2mp3_lame(pin,pout):\r
     os.environ['LANG']="ja_JP.UTF-8"\r
-    lame="lame"\r
+    lame=configreader.getConfPath('lame')\r
     exe=lame+" -b 128 \""+pin+"\" \""+pout+"\""\r
     try:\r
         txt=commands.getoutput(exe.encode('utf-8'))\r
@@ -196,7 +195,7 @@ def ts2dualaudio_BonTsDemux(pin, delay,opts):
     ffpout22=ffpout2.replace(".wav",".mp3")\r
     useNero=0\r
     try:\r
-        if configreader.getConfPath("useNeroAAC")=="1" and os.path.exists(configreader.getConfPath("NeroAAC")):\r
+        if os.path.exists(configreader.getConfPath("NeroAAC")):\r
             useNero=1\r
     except:\r
         useNero=0\r
@@ -240,7 +239,7 @@ def ts2pentaaudio_BonTsDemux(pin, delay,opts):
     ffpout21=ffpout1.replace(".wav",".mp3")\r
     useNero=0\r
     try:\r
-        if configreader.getConfPath("useNeroAAC")=="1" and os.path.exists(configreader.getConfPath("NeroAAC")):\r
+        if os.path.exists(configreader.getConfPath("NeroAAC")):\r
             useNero=1\r
     except:\r
         useNero=0\r

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index b48d690..d237be8 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -47,12 +47,6 @@ def raw2mp4(pin,pout,opt):
     duration="-fps 29.970030 "\r
     if re.search("a",opt):\r
         duration="-fps 23.976023 "\r
-    elif re.search("v",opt):\r
-        duration="-fps 23.976023 "\r
-    if re.search("d",opt):\r
-        duration="-fps 29.970030 "##ffmpegが24fpsに対応していないための措置\r
-    elif re.search("5",opt):\r
-        duration="-fps 29.970030 "##ffmpegが24fpsに対応していないための措置\r
     if re.search("I",opt):\r
         duration="-fps 29.970030 "\r
     exe = configreader.getConfPath("mp4box")\r