Ticket #5755: t5755_h264_aspect.diff

libs/libmythtv/recorderbase.cpp

@@ -294 +294 @@
         case ASPECT_21_1_1 :
             mark = MARK_ASPECT_21_1_1;
             break;
+        case ASPECT_OTHER :
+            mark = MARK_ASPECT_OTHER;
+            break;
         default :
             mark = MARK_ASPECT_4_3;
     }

libs/libmythtv/dtvrecorder.cpp

@@ -483 +483 @@
         _start_code = 0xffffffff;
     }
 
+    uint aspectRatio = 0;
     uint height = 0;
     uint width = 0;
 
@@ -567 +568 @@
                 hasKeyFrame = m_h264_parser.onKeyFrameStart();
                 hasFrame = true;
                 _seen_sps |= hasKeyFrame;
+            
+                width = m_h264_parser.pictureWidth();
+                height = m_h264_parser.pictureHeight();
+                aspectRatio = m_h264_parser.aspectRatio();
             }
-            width = m_h264_parser.pictureWidth();
-            height = m_h264_parser.pictureHeight();
         }
     } // for (; i < TSPacket::SIZE; i++)
 
@@ -586 +589 @@
             _frames_written_count++;
     }
 
+    if ((aspectRatio > 0) && (aspectRatio != m_videoAspect))
+    {
+        m_videoAspect = aspectRatio;
+        AspectChange((AspectRatio)aspectRatio, _frames_written_count);
+    }
+
     if (height && width && (height != m_videoHeight || m_videoWidth != width))
     {
         m_videoHeight = height;

libs/libmythtv/recorderbase.h

@@ -217 +217 @@
         ASPECT_1_1           = 0x01,
         ASPECT_4_3           = 0x02,
         ASPECT_16_9          = 0x03,
-        ASPECT_21_1_1         = 0x04
+        ASPECT_21_1_1        = 0x04,
+        ASPECT_OTHER         = 0x05,
     };
 
   protected:

libs/libmythtv/mpeg/H264Parser.h

@@ -108 +108 @@
     uint pictureWidth(void) const { return pic_width; }
     uint pictureHeight(void) const { return pic_height; }
 
+    /** \brief Computes aspect ratio from picture size and sample aspect ratio
+     */
+    uint aspectRatio(void) const;
+
     uint64_t frameAUstreamOffset(void) const {return frame_start_offset;}
     uint64_t keyframeAUstreamOffset(void) const {return keyframe_start_offset;}
 
@@ -177 +181 @@
     uint       frame_crop_right_offset;
     uint       frame_crop_top_offset;
     uint       frame_crop_bottom_offset;
+    uint8_t    aspect_ratio_idc;
     uint       sar_width, sar_height;
 
     uint64_t   AU_offset, frame_start_offset, keyframe_start_offset;

libs/libmythtv/mpeg/H264Parser.cpp

@@ -7 +7 @@
 #include "avcodec.h"
 }
 
-// #include <math.h>
+#include <cmath>
 
+static const float eps = 1E-5;
+
 /*
   Most of the comments below were cut&paste from ITU-T Rec. H.264
   as found here:  http://www.itu.int/rec/T-REC-H.264/e
@@ -129 +131 @@
     pic_width = pic_height = 0;
     frame_crop_left_offset = frame_crop_right_offset = 0;
     frame_crop_top_offset = frame_crop_bottom_offset = 0;
+    aspect_ratio_idc = 0;
     sar_width = sar_height = 0;
 
     AU_offset = frame_start_offset = keyframe_start_offset = 0;
@@ -819 +822 @@
           present, aspect_ratio_idc value shall be inferred to be
           equal to 0.
          */
-        uint8_t aspect_ratio_idc = get_bits(gb, 8);
+        aspect_ratio_idc = get_bits(gb, 8);
 
         switch (aspect_ratio_idc)
         {
@@ -921 +924 @@
     else
         sar_width = sar_height = 0;
 }
+
+uint H264Parser::aspectRatio(void) const
+{
+
+    double aspect = 0.0;
+
+    if (pic_height)
+        aspect = pic_width / (double)pic_height;
+
+    switch (aspect_ratio_idc)
+    {
+        case 0:
+            // Unspecified
+            break;
+        case 1:
+            // 1:1
+            break;
+        case 2:
+            // 12:11
+            aspect *= 1.0909090909090908;
+            break;
+        case 3:
+            // 10:11
+            aspect *= 0.90909090909090906;
+            break;
+        case 4:
+            // 16:11
+            aspect *= 1.4545454545454546;
+            break;
+        case 5:
+            // 40:33
+            aspect *= 1.2121212121212122;
+            break;
+        case 6:
+            // 24:11
+            aspect *= 2.1818181818181817;
+            break;
+        case 7:
+            // 20:11
+            aspect *= 1.8181818181818181;
+            break;
+        case 8:
+            // 32:11
+            aspect *= 2.9090909090909092;
+            break;
+        case 9:
+            // 80:33
+            aspect *= 2.4242424242424243;
+            break;
+        case 10:
+            // 18:11
+            aspect *= 1.6363636363636365;
+            break;
+        case 11:
+            // 15:11
+            aspect *= 1.3636363636363635;
+            break;
+        case 12:
+            // 64:33
+            aspect *= 1.9393939393939394;
+            break;
+        case 13:
+            // 160:99
+            aspect *= 1.6161616161616161;
+            break;
+        case EXTENDED_SAR:
+            if (sar_height)
+                aspect *= sar_width / (double)sar_height;
+            else
+                aspect = 0.0;
+            break;
+    }
+
+    if (aspect == 0.0)
+        return 0;
+    if (fabs(aspect - 1.3333333333333333) < eps)
+        return 2;
+    if (fabs(aspect - 1.7777777777777777) < eps)
+        return 3;
+    if (fabs(aspect - 2.21) < eps)
+        return 4;
+    
+    return 5;
+}

libs/libmythtv/programinfo.h

@@ -46 +46 @@
     MARK_ASPECT_4_3    = 11,
     MARK_ASPECT_16_9   = 12,
     MARK_ASPECT_21_1_1 = 13,
+    MARK_ASPECT_OTHER  = 14,
     MARK_VIDEO_WIDTH   = 30,
     MARK_VIDEO_HEIGHT  = 31,
 } MarkTypes;