Added logging calls to FFmpegDemuxer.

media/base/sample_format.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/sample_format.h"
 
 #include "base/logging.h"
 
 namespace media {
 
@@ skipping 11 matching lines @@
     case kSampleFormatPlanarF32:
       return 4;
     case kSampleFormatMax:
       break;
   }
 
   NOTREACHED() << "Invalid sample format provided: " << sample_format;
   return 0;
 }
 
+const char* SampleFormatToString(SampleFormat sample_format) {
+  switch(sample_format) {
+    case kUnknownSampleFormat:
+      return "UNKNOWN_SAMPLE_FORMAT";

[DaleCurtis, 2013/08/05 22:16:54]

Is this the style you want? Not say, "Unknown", "8-bit unsigned", "32-bit
float", etc. 

[Ty Overby, 2013/08/05 22:23:29]

I like yours more.

Done.

+    case kSampleFormatU8:
+      return "U8";
+    case kSampleFormatS16:
+      return "S16";
+    case kSampleFormatS32:
+      return "S32";
+    case kSampleFormatF32:
+      return "F32";
+    case kSampleFormatPlanarS16:
+      return "PLANAR S16";
+    case kSampleFormatPlanarF32:
+      return "PLANAR F32";
+    case kSampleFormatMax:

[DaleCurtis, 2013/08/05 22:16:54]

Just break here and rely on the NOTREACHED() below.

[Ty Overby, 2013/08/05 22:23:29]

Done.

+      NOTREACHED() << "Invalid sample format provided: " << sample_format;
+      break;
+  }
+  NOTREACHED() << "Invalid sample format provided: " << sample_format;
+  return "";
+}
+
 }  // namespace media