Clean up FFmpeg media formats and switch to using av_get_bits_per_sample_format().

media/filters/ffmpeg_demuxer_unittest.cc

 // Copyright (c) 2009 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 <deque>
 
 #include "base/singleton.h"
 #include "base/tuple.h"
 #include "media/base/filter_host.h"
 #include "media/base/filters.h"
@@ skipping 346 matching lines @@
   EXPECT_EQ(g_streams[1].duration, pipeline.GetDuration().InMicroseconds());
 
   // Verify that 2 out of 3 streams were created.
   EXPECT_EQ(2, demuxer->GetNumberOfStreams());
 
   // First stream should be video and support FFmpegDemuxerStream interface.
   scoped_refptr<DemuxerStream> stream = demuxer->GetStream(0);
   scoped_refptr<FFmpegDemuxerStream> ffmpeg_demuxer_stream;
   ASSERT_TRUE(stream);
   std::string mime_type;
-  int result;
   EXPECT_TRUE(
       stream->media_format().GetAsString(MediaFormat::kMimeType, &mime_type));
   EXPECT_STREQ(mime_type::kFFmpegVideo, mime_type.c_str());
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(kFFmpegCodecID, &result));
-  EXPECT_EQ(CODEC_ID_THEORA, static_cast<CodecID>(result));
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(MediaFormat::kHeight, &result));
-  EXPECT_EQ(g_video_codec.height, result);
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(MediaFormat::kWidth, &result));
-  EXPECT_EQ(g_video_codec.width, result);
   EXPECT_TRUE(stream->QueryInterface(&ffmpeg_demuxer_stream));
   EXPECT_TRUE(ffmpeg_demuxer_stream);
   EXPECT_EQ(&g_streams[1], ffmpeg_demuxer_stream->av_stream());
 
   // Second stream should be audio and support FFmpegDemuxerStream interface.
   stream = demuxer->GetStream(1);
   ffmpeg_demuxer_stream = NULL;
   ASSERT_TRUE(stream);
   EXPECT_TRUE(
       stream->media_format().GetAsString(MediaFormat::kMimeType, &mime_type));
   EXPECT_STREQ(mime_type::kFFmpegAudio, mime_type.c_str());
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(kFFmpegCodecID, &result));
-  EXPECT_EQ(CODEC_ID_VORBIS, static_cast<CodecID>(result));
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(MediaFormat::kChannels, &result));
-  EXPECT_EQ(g_audio_codec.channels, result);
-  EXPECT_TRUE(
-      stream->media_format().GetAsInteger(MediaFormat::kSampleRate, &result));
-  EXPECT_EQ(g_audio_codec.sample_rate, result);
   EXPECT_TRUE(stream->QueryInterface(&ffmpeg_demuxer_stream));
   EXPECT_TRUE(ffmpeg_demuxer_stream);
   EXPECT_EQ(&g_streams[2], ffmpeg_demuxer_stream->av_stream());
 }
 
 // TODO(scherkus): as we keep refactoring and improving our mocks (both FFmpeg
 // and pipeline/filters), try to break this test into two.  Big issue right now
 // is that it takes ~50 lines of code just to set up FFmpegDemuxer.
 //
 // TODO(scherkus): http://crbug.com/10863
@@ skipping 208 matching lines @@
   reader->Read(audio_stream);
   pipeline.RunAllTasks();
   EXPECT_FALSE(reader->WaitForRead());
   EXPECT_FALSE(reader->called());
   EXPECT_FALSE(reader->buffer());
 
   // Manually release buffer, which should release any remaining AVPackets.
   reader = NULL;
   EXPECT_TRUE(PacketQueue::get()->WaitForOutstandingPackets(0));
 }