1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
|
--- mythburn.py.orig 2012-12-16 15:23:41.000000000 -0600
+++ mythburn.py 2012-12-16 15:33:37.000000000 -0600
@@ -44,7 +44,7 @@
# version of script - change after each update
-VERSION="0.1.20120304-1"
+VERSION="0.1.20121210-1"
# keep all temporary files for debugging purposes
# set this to True before a first run through when testing
@@ -93,6 +93,7 @@
from fcntl import ioctl
import CDROM
from shutil import copy
+from subprocess import Popen, PIPE
import MythTV
from MythTV.altdict import OrdDict
@@ -425,7 +426,7 @@
os.remove(os.path.join(root, name))
#############################################################
-# Romoves all the objects from a directory
+# Removes all the objects from a directory
def deleteEverythingInFolder(folder):
for root, dirs, files in os.walk(folder, topdown=False):
@@ -615,7 +616,7 @@
# of a video file from its stream info file
def getVideoParams(folder):
- """Returns the video resolution, fps and aspect ratio for the video file from the streamindo.xml file"""
+ """Returns the video resolution, fps and aspect ratio for the video file from the streaminfo.xml file"""
#open the XML containing information about this file
infoDOM = xml.dom.minidom.parse(os.path.join(folder, 'streaminfo.xml'))
@@ -651,14 +652,14 @@
# Gets the aspect ratio of a video file from its stream info file
def getAspectRatioOfVideo(index):
- """Returns the aspect ratio of the video file (1.333, 1.778, etc)"""
+ """Returns the aspect ratio of the original video file (1.333, 1.778, etc)"""
#open the XML containing information about this file
- infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo.xml'))
+ infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
#error out if its the wrong XML
if infoDOM.documentElement.tagName != "file":
- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml'))
+ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
if video.attributes["aspectratio"].value != 'N/A':
aspect_ratio = float(video.attributes["aspectratio"].value)
@@ -679,7 +680,7 @@
#error out if its the wrong XML
if infoDOM.documentElement.tagName != "file":
- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml'))
+ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml'))
video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
video_start = float(video.attributes["start_time"].value)
@@ -1432,9 +1433,18 @@
data.rating = str(vid.userrating)
- if doesFileExist(vid.coverfile):
+ #Check filename for valid path. If valid return nothing.
+ if doesFileExist(str(vid.coverfile)):
+ write("Coverart is in local directory: %s" % vid.coverfile)
data.coverfile = vid.coverfile
-
+ else:
+ # iterate through storage group directories to get Coverart
+ for sg in DB.getStorageGroup(groupname='Coverart', hostname=DB.gethostname()):
+ if doesFileExist(os.path.join(sg.dirname, str(vid.coverfile))):
+ write("Coverart is in Storage Groups: %s%s" % (sg.dirname, vid.coverfile))
+ data.coverfile = os.path.join(sg.dirname, str(vid.coverfile))
+ break
+
elif file.attributes["type"].value=="file":
data.type = file.attributes["type"].value
data.filename = file.attributes["filename"].value
@@ -1485,6 +1495,28 @@
#############################################################
+# Finds the path of a video file from a Storage Group
+
+def getVideoPath(filename):
+
+ filepath = None
+
+ #Check filename for valid path. If valid return nothing.
+ if doesFileExist(filename):
+ write("Video is in local video dir: %s" % filename)
+ return (filepath)
+ else:
+ # iterate through storage group directories
+ for sg in DB.getStorageGroup(groupname='Videos', hostname=DB.gethostname()):
+ wholepath = os.path.join(sg.dirname, filename)
+ if doesFileExist(wholepath):
+ write("Video is in Storage Groups: %s" % wholepath)
+ filepath = "".join(sg.dirname)
+ return (filepath)
+ break
+
+
+#############################################################
# Pre-process a single video/recording file
def preProcessFile(file, folder, count):
@@ -1501,7 +1533,7 @@
if file.attributes["type"].value == "recording":
mediafile = file.attributes["filename"].value
elif file.attributes["type"].value == "video":
- mediafile = os.path.join(videopath, file.attributes["filename"].value)
+ mediafile = os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
elif file.attributes["type"].value == "file":
mediafile = file.attributes["filename"].value
else:
@@ -1661,6 +1693,37 @@
fatalError("Failed while running mytharchivehelper to get stream information.\n"
"Result: %d, Command was %s" % (result, command))
+ #open the XML containing information about this file
+ infoDOM = xml.dom.minidom.parse(xmlFilename)
+
+ #error out if its the wrong XML
+ if infoDOM.documentElement.tagName != "file":
+ fatalError("This info file doesn't look right (%s)." % xmlFilename)
+
+ file = infoDOM.getElementsByTagName("file")[0]
+ video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0]
+
+ #use ffmpeg to get display aspect ratio (DAR) of video
+ cmd = "mythffmpeg -i " + quoteCmdArg(file.attributes["filename"].value) + " 2>&1"
+ aspect_ratio = Popen(cmd, shell=True, stdout=PIPE).stdout.read()
+ if "DAR" in aspect_ratio:
+ #clean DAR string
+ aspect_ratio = aspect_ratio.split("DAR ")[-1].split(",")[0]
+ aspect_ratio = ''.join([c for c in aspect_ratio if c in '1234567890:']).split(":")
+ else:
+ #calculate aspect from video size
+ aspect_ratio = getVideoSize(xmlFilename)
+
+ #convert to decimal
+ aspect_ratio = float(aspect_ratio[0]) / float(aspect_ratio[1])
+
+ write("Video %s aspect ratio is: %s" % (filename, aspect_ratio))
+
+ #set aspect ratio
+ video.setAttribute("aspectratio",str(aspect_ratio))
+
+ WriteXMLToFile (infoDOM,xmlFilename)
+
# print out the streaminfo.xml file to the log
infoDOM = xml.dom.minidom.parse(xmlFilename)
write(xmlFilename + ":-\n" + infoDOM.toprettyxml(" ", ""), False)
@@ -1707,7 +1770,7 @@
write("Using cutlist: %s" % cutlist_s)
if (localfile != ""):
- localfile = quoteFilename(localfile)
+ localfile = quoteCmdArg(localfile)
if usecutlist == True:
command = "mythtranscode --mpeg2 --honorcutlist %s --infile %s --outfile %s" % (cutlist_s, quoteCmdArg(localfile), quoteCmdArg(destination))
else:
@@ -1973,7 +2036,7 @@
#############################################################
# Re-encodes a file to mpeg2
-def encodeVideoToMPEG2(source, destvideofile, video, audio1, audio2, aspectratio, profile):
+def encodeVideoToMPEG2(source, destvideofile, video, folder, audio1, audio2, aspectratio, profile):
"""Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use mythffmpeg"""
profileNode = findEncodingProfile(profile)
@@ -1998,7 +2061,36 @@
value = quoteCmdArg(destvideofile)
if value == "%aspect":
value = aspectratio
+ if value == "720x480" or value == "720x576":
+ videores, fps, videoAR = getVideoParams(folder)
+ videoWidth = int(videores.split("x")[0])
+ videoHeight = int(videores.split("x")[1])
+
+ #add padding to correct for aspects > than 1.9:1
+ if float(videoAR) >= 1.9:
+ #check which video type and set the correct height
+ if videomode == "ntsc":
+ videoModeHeight = 480
+ else:
+ videoModeHeight = 576
+ #calculate the video height based on the aspect ratio of the video
+ #multiply by 1.185 to compensate for dvds non-square pixels
+ calVideoHeight = int(round((720 / float(videoAR)) * 1.185))
+ if calVideoHeight % 2 == 1:
+ calVideoHeight = calVideoHeight + 1
+ #write("calVideoHeight: %s" % calVideoHeight)
+
+ #use original video height if the calculated video height is close
+ if (calVideoHeight + 20 < videoHeight) or (calVideoHeight - 20 > videoHeight):
+ videoHeight = calVideoHeight
+
+ cropPixels = videoModeHeight - videoHeight
+
+ write("Crop Pixels Total: %s" % cropPixels)
+ name = "-vf"
+ value = "\"scale=720:%d, setsar=1:1, pad=720:%d:0:%d:black\"" % (videoModeHeight - cropPixels, videoModeHeight, cropPixels / 2)
+
# only re-encode the audio if it is not already in AC3 format
if audio1[AUDIO_CODEC] == "AC3":
if name == "-acodec":
@@ -2094,10 +2186,6 @@
outaudiosamplerate = 48000
outaudiocodec = "ac3"
deinterlace = 0
- croptop = 0
- cropright = 0
- cropbottom = 0
- cropleft = 0
qmin = 5
qmax = 31
qdiff = 31
@@ -2121,14 +2209,6 @@
outvideores = value
if name == "-deinterlace":
deinterlace = 1
- if name == "-croptop":
- croptop = value
- if name == "-cropright":
- cropright = value
- if name == "-cropbottom":
- cropbottom = value
- if name == "-cropleft":
- cropleft = value
if name == "-qmin":
qmin = value
if name == "-qmax":
@@ -4409,7 +4489,7 @@
elif file.attributes["type"].value=="recording":
mediafile = file.attributes["filename"].value
elif file.attributes["type"].value=="video":
- mediafile=os.path.join(videopath, file.attributes["filename"].value)
+ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
elif file.attributes["type"].value=="file":
mediafile=file.attributes["filename"].value
else:
@@ -4547,7 +4627,7 @@
#do the re-encode
encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
- audio1, audio2, aspectratio, profile)
+ folder, audio1, audio2, aspectratio, profile)
mediafile = os.path.join(folder, 'newfile2.mpg')
#remove the old mediafile that was run through mythtranscode
@@ -4621,7 +4701,7 @@
elif file.attributes["type"].value=="recording":
mediafile = file.attributes["filename"].value
elif file.attributes["type"].value=="video":
- mediafile=os.path.join(videopath, file.attributes["filename"].value)
+ mediafile=os.path.join(getVideoPath(file.attributes["filename"].value), file.attributes["filename"].value)
elif file.attributes["type"].value=="file":
mediafile=file.attributes["filename"].value
else:
@@ -4701,7 +4781,7 @@
#do the re-encode
encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video,
- audio1, audio2, aspectratio, profile)
+ folder, audio1, audio2, aspectratio, profile)
mediafile = os.path.join(folder, 'newfile2.mpg')
#remove an intermediate file
|
