diff -r baf439b22ddd -r 2d690156cf8f videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp --- a/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp Mon Jun 21 15:43:03 2010 +0300 +++ b/videoplayback/videoplaybackviews/src/mpxvideoplaybackdisplayhandler.cpp Thu Jul 15 18:41:27 2010 +0300 @@ -16,7 +16,7 @@ */ -// Version : %version: 14 % +// Version : %version: 15 % #include @@ -239,10 +239,13 @@ // // if can't find out match aspect ratio in dat file, - // choose the scaling type through the rule - // videoAspectRatio - aDisplayAspectRatio > 0.1 ==> zoom - // videoAspectRatio - aDisplayAspectRatio < 0.1 ==> stretch - // videoAspectRatio = aDisplayAspectRatio ==> natural + // choose the scaling type through the rule + // aspectRatioDiff = videoAspectRatio - aDisplayAspectRatio + // aspectRatioDiff == 0 ==> natural + // aspectRatioDiff > 0.1 ==> zoom + // aspectRatioDiff < - 0.3 ==> natural + // aspectRatioDiff >= - 0.3 and <= 0.1 ==> stretch + // if ( i == cnt ) { @@ -250,7 +253,8 @@ { scalingType = EMMFZoom; } - else if ( videoAspectRatio != displayAspectRatio ) + else if ( ( videoAspectRatio != displayAspectRatio ) && + ( videoAspectRatio - displayAspectRatio > (- 0.3) ) ) { scalingType = EMMFStretch; }