ffmpeg chromium glue

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2011 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 "base/base_paths.h"
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "media/base/media.h"
 #include "media/base/mock_callback.h"
@@ skipping 27 matching lines @@
     VIDEO,
     MAX_CODECS_INDEX
   };
 
   ChunkDemuxerTest()
       : demuxer_(new ChunkDemuxer()) {
     memset(&format_context_, 0, sizeof(format_context_));
     memset(&streams_, 0, sizeof(streams_));
     memset(&codecs_, 0, sizeof(codecs_));
 
-    codecs_[VIDEO].codec_type = CODEC_TYPE_VIDEO;
+    codecs_[VIDEO].codec_type = AVMEDIA_TYPE_VIDEO;
     codecs_[VIDEO].codec_id = CODEC_ID_VP8;
     codecs_[VIDEO].width = 320;
     codecs_[VIDEO].height = 240;
 
-    codecs_[AUDIO].codec_type = CODEC_TYPE_AUDIO;
+    codecs_[AUDIO].codec_type = AVMEDIA_TYPE_AUDIO;
     codecs_[AUDIO].codec_id = CODEC_ID_VORBIS;
     codecs_[AUDIO].channels = 2;
     codecs_[AUDIO].sample_rate = 44100;
   }
 
   virtual ~ChunkDemuxerTest() {
     if (demuxer_.get())
       demuxer_->Shutdown();
+    if (format_context_.streams) {
+      delete[] format_context_.streams;
+      format_context_.streams = NULL;
+      format_context_.nb_streams = 0;
+    }
   }
 
   void ReadFile(const std::string& name, scoped_array<uint8>* buffer,
                 int* size) {
     FilePath file_path;
     EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &file_path));
     file_path = file_path.Append(FILE_PATH_LITERAL("media"))
         .Append(FILE_PATH_LITERAL("test"))
         .Append(FILE_PATH_LITERAL("data"))
         .AppendASCII(name);
@@ skipping 58 matching lines @@
     }
 
     if (has_video) {
       memcpy(buf, video_track_entry.get(), video_track_entry_size);
       buf += video_track_entry_size;
     }
   }
 
   void SetupAVFormatContext(bool has_audio, bool has_video) {
     int i = 0;
+    format_context_.streams = new AVStream *[MAX_CODECS_INDEX];
     if (has_audio) {
       format_context_.streams[i] = &streams_[i];
       streams_[i].codec = &codecs_[AUDIO];
       streams_[i].duration = 100;
       streams_[i].time_base.den = base::Time::kMicrosecondsPerSecond;
       streams_[i].time_base.num = 1;
       i++;
     }
 
     if (has_video) {
@@ skipping 252 matching lines @@
 
   cb.SetClusterTimecode(5);
   AddSimpleBlock(&cb, kAudioTrackNum, 5);
   AddSimpleBlock(&cb, kVideoTrackNum, 7);
   scoped_ptr<Cluster> clusterE(cb.Finish());
 
   EXPECT_FALSE(demuxer_->AddData(clusterE->data(), clusterE->size()));
 }
 
 }  // namespace media