Skip to content

Commit

Permalink
x264vfw support
Browse files Browse the repository at this point in the history 
 - both ffdshow and x264vfw are supported
 - needs wine, virtualdub, ffdshow and x264vfw (http://sourceforge.net/projects/x264vfw/files/x264vfw/35_2120bm_31356/) installed
  • Loading branch information
@monarc99
monarc99 committed Jun 4, 2012
1 parent de625ad commit 5c78829
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 21 deletions.
5 changes: 5 additions & 0 deletions bin/otrverwaltung
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ class App:
'show_bottom': False,
'cutlist_hash': hashlib.md5(str(time.time())).hexdigest(),
'window_settings': '',
'h264_codec': 'x264vfw',
'komisar_hd_string': '--tune film --direct auto --force-cfr --rc-lookahead 60 --b-adapt 2 --weightp 0',
'komisar_hq_string': '--tune film --direct auto --force-cfr --rc-lookahead 60 --b-adapt 2 --aq-mode 2 --weightp 0',
'x264vfw_hd_string': '--tune film --direct auto --force-cfr --rc-lookahead 60 --b-adapt 2 --weightp 0',
'x264vfw_hq_string': '--tune film --direct auto --force-cfr --rc-lookahead 60 --b-adapt 2 --aq-mode 2 --weightp 0',
'pre_cut_show': 11,
'after_cut_show': 5
},
Expand Down
31 changes: 31 additions & 0 deletions data/ui/PreferencesWindow.glade
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,25 @@
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="h264_codec_hbox">
<property name="visible">True</property>
<child>
<object class="GtkComboBoxEntry" id="h264_codec_cbox">
<property name="visible">True</property>
</object>
<packing>
<property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox17">
<property name="visible">True</property>
Expand Down Expand Up @@ -751,6 +770,18 @@
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="h264_codec">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">H264 Codec</property>
</object>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
</object>
<packing>
<property name="position">1</property>
Expand Down
90 changes: 77 additions & 13 deletions otrverwaltung/actions/decodeorcut.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import os
from os.path import basename, join, dirname, exists, splitext
import time
import re

from otrverwaltung import fileoperations
from otrverwaltung.conclusions import FileConclusion
Expand All @@ -30,6 +31,7 @@
from otrverwaltung import cutlists as cutlists_management
from otrverwaltung import path
from otrverwaltung.GeneratorTask import GeneratorTask
from fractions import Fraction

class DecodeOrCut(BaseAction):

Expand Down Expand Up @@ -337,7 +339,6 @@ def completed():
file_conclusion.cut.rename = self.rename_by_schema(basename(file_conclusion.uncut_video))
else:
file_conclusion.cut.rename = basename(cut_video)

return True

def __get_format(self, filename):
Expand Down Expand Up @@ -449,7 +450,38 @@ def __get_aspect_ratio(self, filename):
return None, "Aspekt konnte nicht bestimmt werden " + line

return None, "Aspekt Ratio konnte nicht bestimmt werden."

def __get_sample_aspect_ratio(self, filename):
""" Gets the aspect ratio of a movie using mplayer.
Returns without error:
aspect_ratio, None
with error:
None, error_message """
mplayer = self.config.get('general', 'mplayer')

if not mplayer:
return None, "Der Mplayer ist nicht angegeben. Dieser wird zur Bestimmung der Sample Aspekt Ratio benötigt."

try:
process = subprocess.Popen([mplayer, "-msglevel", "all=6", "-vo", "null", "-frames", "1", "-nosound", filename], stdout=subprocess.PIPE)
except OSError:
return None, "MPlayer wurde nicht gefunden!"

stdout = process.communicate()[0]

infos_match = re.compile(r"VO Config \((\d{1,})x(\d{1,})->(\d{1,})x(\d{1,})")

for line in stdout.split('\n'):
m = re.search(infos_match,line)

if m:
sar = Fraction( int(m.group(3)), int(m.group(1)) )
return str(sar.numerator) + ":" + str(sar.denominator), None
else:
pass

return None, "Sample Aspekt Ratio konnte nicht bestimmt werden."

def __create_cutlist_virtualdub(self, filename):
""" returns: cuts, error_message """

Expand Down Expand Up @@ -654,26 +686,58 @@ def __cut_file_virtualdub(self, filename, config_value, cuts=None, manually=Fals
format = self.__get_format(filename)

if format == Format.HQ:
aspect, error_message = self.__get_aspect_ratio(filename)
if not aspect:
return None, error_message

if aspect == "16:9":
comp_data = codec.get_comp_data_h264_169()
if self.config.get('general', 'h264_codec') == 'ffdshow':
aspect, error_message = self.__get_aspect_ratio(filename)
if not aspect:
return None, error_message
if aspect == "16:9":
comp_data = codec.get_comp_data_h264_169()
else:
comp_data = codec.get_comp_data_h264_43()
compression = 'VirtualDub.video.SetCompression(0x53444646,0,10000,0);\n'
elif self.config.get('general', 'h264_codec') == 'x264vfw':
aspect, error_message = self.__get_sample_aspect_ratio(filename)
if not aspect:
return None, error_message
comp_data = codec.get_comp_data_x264vfw_dynamic(aspect,self.config.get('general', 'x264vfw_hq_string'))
compression = 'VirtualDub.video.SetCompression(0x34363278,0,10000,0);\n'
elif self.config.get('general', 'h264_codec') == 'komisar':
aspect, error_message = self.__get_sample_aspect_ratio(filename)
if not aspect:
return None, error_message
comp_data = codec.get_comp_data_komisar_dynamic(aspect,self.config.get('general', 'komisar_hq_string'))
compression = 'VirtualDub.video.SetCompression(0x34363278,0,10000,0);\n'
else:
comp_data = codec.get_comp_data_h264_43()
return None, "Codec nicht unterstützt. Nur ffdshow, x264vfw und komisar unterstützt."
elif format == Format.HD:
aspect, error_message = self.__get_aspect_ratio(filename)
if not aspect:
return None, error_message

if aspect == "16:9":
comp_data = codec.get_comp_data_hd_169()

if self.config.get('general', 'h264_codec') == 'ffdshow':
if aspect == "16:9":
comp_data = codec.get_comp_data_hd_169()
else:
comp_data = codec.get_comp_data_hd_43()
compression = 'VirtualDub.video.SetCompression(0x53444646,0,10000,0);\n'
elif self.config.get('general', 'h264_codec') == 'x264vfw':
aspect, error_message = self.__get_sample_aspect_ratio(filename)
if not aspect:
return None, error_message
comp_data = codec.get_comp_data_x264vfw_dynamic(aspect,self.config.get('general', 'x264vfw_hd_string'))
compression = 'VirtualDub.video.SetCompression(0x34363278,0,10000,0);\n'
elif self.config.get('general', 'h264_codec') == 'komisar':
if aspect == "16:9":
comp_data = codec.get_comp_data_hd_komisar_169()
else:
comp_data = codec.get_comp_data_hd_komisar_43()
compression = 'VirtualDub.video.SetCompression(0x34363278,0,10000,0);\n'
else:
comp_data = codec.get_comp_data_hd_43()
return None, "Codec nicht unterstützt. Nur ffdshow, x264vfw und komisar unterstützt."

elif format == Format.AVI:
comp_data = codec.get_comp_data_dx50()
compression = 'VirtualDub.video.SetCompression(0x53444646,0,10000,0);\n'

else:
return None, "Format nicht unterstützt (Nur Avi DX50, HQ H264 und HD sind möglich)."
Expand All @@ -698,7 +762,7 @@ def __cut_file_virtualdub(self, filename, config_value, cuts=None, manually=Fals
f.writelines([
'VirtualDub.video.SetMode(1);\n',
'VirtualDub.video.SetSmartRendering(1);\n',
'VirtualDub.video.SetCompression(0x53444646,0,10000,0);\n'
compression,
'VirtualDub.video.SetCompData(%s);\n' % comp_data
])
else:
Expand Down
Loading

4 comments on commit 5c78829

@elbersb
Copy link
Contributor

@elbersb elbersb commented on 5c78829 Aug 5, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hier ist dann die Frage, ob man ffdshow überhaupt noch unterstützen sollte...

@elbersb
Copy link
Contributor

@elbersb elbersb commented on 5c78829 Aug 5, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weiß der Otto-Normal-Nutzer überhaupt von diesen Dingen?

@monarc99
Copy link
Owner Author

@monarc99 monarc99 commented on 5c78829 Aug 5, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monarc99
Copy link
Owner Author

@monarc99 monarc99 commented on 5c78829 Aug 5, 2012 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.