Packman Build Service PMBS

omxplayer.changes Changed

omxplayer.spec Changed

omxplayer-2015.11.21.tar.gz/OMXControl.cpp -> omxplayer-2015.12.05.tar.gz/OMXControl.cpp Changed

omxplayer-2015.11.21.tar.gz/OMXReader.cpp -> omxplayer-2015.12.05.tar.gz/OMXReader.cpp Changed

@@ -846,6 +846,31 @@
   return false;
 }
 
+double OMXReader::SelectAspect(AVStream* st, bool& forced)
+{
+  // trust matroshka container
+  if (m_bMatroska && st->sample_aspect_ratio.num != 0)
+  {
+    forced = true;
+    return av_q2d(st->sample_aspect_ratio);
+  }
+
+  forced = false;
+  /* if stream aspect is 1:1 or 0:0 use codec aspect */
+  if((st->sample_aspect_ratio.den == 1 || st->sample_aspect_ratio.den == 0) &&
+     (st->sample_aspect_ratio.num == 1 || st->sample_aspect_ratio.num == 0) &&
+      st->codec->sample_aspect_ratio.num != 0)
+  {
+    return av_q2d(st->codec->sample_aspect_ratio);
+  }
+
+  forced = true;
+  if(st->sample_aspect_ratio.num != 0)
+    return av_q2d(st->sample_aspect_ratio);
+
+  return 0.0;
+}
+
 bool OMXReader::GetHints(AVStream *stream, COMXStreamInfo *hints)
 {
   if(!hints || !stream)
@@ -888,12 +913,8 @@
       hints->fpsrate      = 0;
     }
 
-    if (stream->sample_aspect_ratio.num != 0)
-      hints->aspect = av_q2d(stream->sample_aspect_ratio) * stream->codec->width / stream->codec->height;
-    else if (stream->codec->sample_aspect_ratio.num != 0)
-      hints->aspect = av_q2d(stream->codec->sample_aspect_ratio) * stream->codec->width / stream->codec->height;
-    else
-      hints->aspect = 0.0f;
+    hints->aspect = SelectAspect(stream, hints->forced_aspect) * stream->codec->width / stream->codec->height;
+
     if (m_bAVI && stream->codec->codec_id == CODEC_ID_H264)
       hints->ptsinvalid = true;
     AVDictionaryEntry *rtag = m_dllAvUtil.av_dict_get(stream->metadata, "rotate", NULL, 0);

omxplayer-2015.11.21.tar.gz/OMXReader.h -> omxplayer-2015.12.05.tar.gz/OMXReader.h Changed

omxplayer-2015.11.21.tar.gz/OMXStreamInfo.h -> omxplayer-2015.12.05.tar.gz/OMXStreamInfo.h Changed

omxplayer-2015.11.21.tar.gz/OMXVideo.cpp -> omxplayer-2015.12.05.tar.gz/OMXVideo.cpp Changed

omxplayer-2015.11.21.tar.gz/README.md -> omxplayer-2015.12.05.tar.gz/README.md Changed

omxplayer-2015.11.21.tar.gz/dbuscontrol.sh -> omxplayer-2015.12.05.tar.gz/dbuscontrol.sh Changed

omxplayer-2015.11.21.tar.gz/omxplayer.1 -> omxplayer-2015.12.05.tar.gz/omxplayer.1 Changed

omxplayer-2015.11.21.tar.gz/omxplayer.cpp -> omxplayer-2015.12.05.tar.gz/omxplayer.cpp Changed

@@ -703,8 +703,8 @@
         m_config_audio.device = optarg;
         if(m_config_audio.device != "local" && m_config_audio.device != "hdmi" && m_config_audio.device != "both")
         {
-          print_usage();
-          return 0;
+          printf("Bad argument for -%c: Output device must be `local', `hdmi' or `both'\n", c);
+          return EXIT_FAILURE;
         }
         m_config_audio.device = "omx:" + m_config_audio.device;
         break;
@@ -844,8 +844,9 @@
           }
         if (i == sizeof layouts/sizeof *layouts)
         {
+          printf("Wrong layout specified: %s\n", optarg);
           print_usage();
-          return 0;
+          return EXIT_FAILURE;
         }
         break;
       }
@@ -882,21 +883,21 @@
         break;
       case 'h':
         print_usage();
-        return 0;
+        return EXIT_SUCCESS;
         break;
       case 'v':
         print_version();
-        return 0;
+        return EXIT_SUCCESS;
         break;
       case 'k':
         print_keybindings();
-        return 0;
+        return EXIT_SUCCESS;
         break;
       case ':':
-        return 0;
+        return EXIT_FAILURE;
         break;
       default:
-        return 0;
+        return EXIT_FAILURE;
         break;
     }
   }
@@ -918,25 +919,25 @@
   if(!filename_is_URL && !IsPipe(m_filename) && !Exists(m_filename))
   {
     PrintFileNotFound(m_filename);
-    return 0;
+    return EXIT_FAILURE;
   }
 
   if(m_asked_for_font && !Exists(m_font_path))
   {
     PrintFileNotFound(m_font_path);
-    return 0;
+    return EXIT_FAILURE;
   }
 
   if(m_asked_for_italic_font && !Exists(m_italic_font_path))
   {
     PrintFileNotFound(m_italic_font_path);
-    return 0;
+    return EXIT_FAILURE;
   }
 
   if(m_has_external_subtitles && !Exists(m_external_subtitles_path))
   {
     PrintFileNotFound(m_external_subtitles_path);
-    return 0;
+    return EXIT_FAILURE;
   }
 
   if(!m_has_external_subtitles && !filename_is_URL)

omxplayer-2015.11.21.tar.gz/prepare-native-raspbian.sh -> omxplayer-2015.12.05.tar.gz/prepare-native-raspbian.sh Changed

Changes of Revision 11