From dedb2786d102cab26bb80b3707b2bb34c2021644 Mon Sep 17 00:00:00 2001
From: wgw <tjm1100@gmail.com>
Date: Fri, 21 Mar 2008 23:52:21 -0500
Subject: [PATCH] par control settings added

---
 config.py                             |  8 ++++++++
 plugins/admin/admin.py                |  7 ++++---
 plugins/admin/templates/settings.tmpl | 30 ++++++++++++++++++++++++++++++
 plugins/video/transcode.py            | 32 +++++++++++++++++++++-----------
 4 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/config.py b/config.py
index bf9f8c8..8e6ca94 100644
--- a/config.py
+++ b/config.py
@@ -114,6 +114,14 @@ def getOptres(tsn = None):
     except NoOptionError, ValueError:
         return False
 
+def getPixelAR(ref):
+    if config.has_option('Server', 'par'):
+        try:
+            return (True, config.getfloat('Server', 'par'))[ref]
+        except NoOptionError, ValueError:
+            pass
+    return (False, 1.0)[ref]
+
 def get(section, key):
     return config.get(section, key)
 
diff --git a/plugins/admin/admin.py b/plugins/admin/admin.py
index c61079a..8a82966 100644
--- a/plugins/admin/admin.py
+++ b/plugins/admin/admin.py
@@ -57,9 +57,10 @@ class Admin(Plugin):
         t.container = cname
         t.server_data = dict(config.items('Server', raw=True))
         t.server_known = ["port", "guid", "ffmpeg", "beacon", "hack83", "debug", \
-                          "precache", "optres", "video_fps", "video_br", "max_video_br", \
-                          "bufsize", "width", "height", "audio_br", "max_audio_br", \
-                          "audio_fr", "audio_ch", "audio_codec", "ffmpeg_pram"]
+                          "precache", "optres", "par", "video_fps", "video_br", \
+                          "max_video_br", "bufsize", "width", "height", "audio_br", \
+                          "max_audio_br", "audio_fr", "audio_ch", "audio_codec", \
+                          "ffmpeg_pram"]
         t.shares_data = shares_data
         t.shares_known = ["type", "path", "auto_subshares"]
         t.tivos_data = [ (section, dict(config.items(section, raw=True))) for section in config.sections() \
diff --git a/plugins/admin/templates/settings.tmpl b/plugins/admin/templates/settings.tmpl
index baa301a..50a2c3e 100644
--- a/plugins/admin/templates/settings.tmpl
+++ b/plugins/admin/templates/settings.tmpl
@@ -1035,6 +1035,36 @@ for recordings.<br>
 
       </div>
 
+      <div id="help-par" style="position: absolute; left: 0px; top: 0px; visibility: hidden;">
+      <p align="center"><strong>par</strong>
+      </p>
+
+      <p> <strong>Default Setting:</strong> blank<br>
+
+      <strong>Valid Entries:</strong> any valid par<br>
+
+      <strong>Required:</strong> No<br>
+
+      <strong>Skill:</strong> Very Advanced<br>
+
+      <strong>Description:</strong> Set pixel aspect ratio.
+Applies to S3 Tivos only. OPTRES must be false to use PAR. For some
+videofiles (e.g., AVC files), ffmpeg cannot determine the pixel aspect
+ratio correctly and assumes 1:1 which leads to a distorted image
+on anamorphically encoded video files.  This setting allows you to 
+override this default. If you do not understand this setting, and you
+observe no distortions, you can ignore it.  Set par=1.0 to tell pyTivo
+to automatically adjust the pixel aspect ratio whenever possible.<br>
+par=1.18518519 (32:27, usually the correct setting for wide-screen
+anamorphically encoded DVD content)<br>
+par=0.88888889 (8:9, usually the correct setting for anamorphically
+encoded DVDs from TV shows)<br>
+
+      <strong>Example Settings:</strong> 1.0, 1.18518519, 0.88888889 </p>
+
+
+      </div>
+
       <div id="help-shares" style="position: absolute; left: 0px; top: 0px; visibility: hidden;">
       <p align="center"><strong>shares</strong>
       </p>
diff --git a/plugins/video/transcode.py b/plugins/video/transcode.py
index 09616e0..7f257d9 100644
--- a/plugins/video/transcode.py
+++ b/plugins/video/transcode.py
@@ -161,19 +161,24 @@ def select_aspect(inFile, tsn = ''):
 
     multiplier16by9 = (16.0 * TIVO_HEIGHT) / (9.0 * TIVO_WIDTH)
     multiplier4by3  =  (4.0 * TIVO_HEIGHT) / (3.0 * TIVO_WIDTH)
-   
-    if config.isHDtivo(tsn) and height <= TIVO_HEIGHT and not optres:
-        #pass all resolutions to S3, except heights greater than conf height
-        if not vpar == None:
+
+    if config.isHDtivo(tsn) and not optres:
+        if config.getPixelAR(0):
+            if vpar == None:
+                npar = config.getPixelAR(1)
+            else:
+                npar = vpar
             # adjust for pixel aspect ratio, if set, because TiVo expects square pixels
-            if vpar<1.0:
-                return ['-s', str(width) + 'x' + str(int(math.ceil(height/vpar)))]
-            elif vpar>1.0:
+            if npar<1.0:
+                return ['-s', str(width) + 'x' + str(int(math.ceil(height/npar)))]
+            elif npar>1.0:
                 # FFMPEG expects width to be a multiple of two
-                return ['-s', str(int(math.ceil(width*vpar/2.0)*2)) + 'x' + str(height)]
-        return []
-    # else, optres is enabled and resizes video to the "S2" standard.
-    elif (rwidth, rheight) in [(4, 3), (10, 11), (15, 11), (59, 54), (59, 72), (59, 36), (59, 54)]:
+                return ['-s', str(int(math.ceil(width*npar/2.0)*2)) + 'x' + str(height)]
+        if height <= TIVO_HEIGHT:
+            # pass all resolutions to S3, except heights greater than conf height
+            return []
+        # else, resize video.
+    if (rwidth, rheight) in [(4, 3), (10, 11), (15, 11), (59, 54), (59, 72), (59, 36), (59, 54)]:
         debug_write(__name__, fn_attr(), ['File is within 4:3 list.'])
         return ['-aspect', '4:3', '-s', str(TIVO_WIDTH) + 'x' + str(TIVO_HEIGHT)]
     elif ((rwidth, rheight) in [(16, 9), (20, 11), (40, 33), (118, 81), (59, 27)]) and aspect169:
@@ -322,6 +327,11 @@ def tivo_compatable(inFile, tsn = ''):
         return False
 
     if config.isHDtivo(tsn):
+        if vpar != 1.0:
+            if config.getPixelAR(0):
+                if vpar != None or config.getPixelAR(1) != 1.0:
+                    debug_write(__name__, fn_attr(), ['FALSE,', vpar, 'not correct PAR,', inFile])
+                    return False
         debug_write(__name__, fn_attr(), ['TRUE, HD Tivo detected, skipping remaining tests', inFile])
         return True
 
-- 
2.11.4.GIT