Changeset 442 in SHVCSoftware for trunk/source/App/TAppDownConvert

Timestamp:

21 Oct 2013, 13:41:29 (12 years ago)

Author:

seregin

Message:

reintegrate SHM-3.1-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/App/TAppDownConvert/TAppDownConvert.cpp (modified) (2 diffs)

trunk/source/App/TAppDownConvert/TAppDownConvert.cpp

@@ -270 +270 @@
   FILE * outfile;
 
-  int M,N;
-  int ratio;
+  int M = -1 ,N = -1;
+  int ratio = -1;
   int Frames=0;
   int totalFrames=0;
@@ -326 +326 @@
     return -1;
   }
-  if ( ratio > 1 || ratio < 0)
-  {
+
+  switch( ratio )
+  {
+  default:
     printf("\ndown sampling parameter %d is not supported (0: 2x downsampling, 1: 1.5x downsampling)\n", ratio);
     return -1;
-  }
-
-  if (ratio==0)
-  {
+  case 0:
     M=4;
     N=8;
-  }
-  else if (ratio==1)
-  {
+    break;
+  case 1:
     M=8;
     N=12;
+    break;
   }