Adding VP8 Alpha support in Media Source

media/webm/webm_tracks_parser.cc

 // Copyright (c) 2012 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/webm/webm_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "media/base/buffers.h"
 #include "media/webm/webm_constants.h"
@@ skipping 13 matching lines @@
 
   if (codec_id == kWebMCodecMetadata)
     return kTextMetadata;
 
   return kTextNone;
 }
 
 WebMTracksParser::WebMTracksParser(const LogCB& log_cb)
     : track_type_(-1),
       track_num_(-1),
+      max_block_additional_id_(-1),
       audio_track_num_(-1),
       video_track_num_(-1),
       log_cb_(log_cb),
       audio_client_(log_cb),
       video_client_(log_cb) {
 }
 
 WebMTracksParser::~WebMTracksParser() {}
 
 int WebMTracksParser::Parse(const uint8* buf, int size) {
   track_type_ =-1;
   track_num_ = -1;
   track_name_.clear();
   track_language_.clear();
+  max_block_additional_id_ = -1;

[acolwell GONE FROM CHROMIUM, 2013/05/21 17:14:11]

nit: Remove since this doesn't appear to be used anywhere.

[vignesh, 2013/05/21 18:57:56]

Done.

   audio_track_num_ = -1;
   audio_decoder_config_ = AudioDecoderConfig();
   video_track_num_ = -1;
   video_decoder_config_ = VideoDecoderConfig();
   text_tracks_.clear();
   ignored_tracks_.clear();
 
   WebMListParser parser(kWebMIdTracks, this);
   int result = parser.Parse(buf, size);
 
@@ skipping 10 matching lines @@
     track_content_encodings_client_.reset(
         new WebMContentEncodingsClient(log_cb_));
     return track_content_encodings_client_->OnListStart(id);
   }
 
   if (id == kWebMIdTrackEntry) {
     track_type_ = -1;
     track_num_ = -1;
     track_name_.clear();
     track_language_.clear();
+    max_block_additional_id_ = -1;
     codec_id_ = "";
     codec_private_.clear();
     audio_client_.Reset();
     video_client_.Reset();
     return this;
   }
 
   if (id == kWebMIdAudio)
     return &audio_client_;
 
@@ skipping 103 matching lines @@
       text_track_info.language = track_language_;
     } else {
       MEDIA_LOG(log_cb_) << "Unexpected TrackType " << track_type_;
       return false;
     }
 
     track_type_ = -1;
     track_num_ = -1;
     track_name_.clear();
     track_language_.clear();
+    max_block_additional_id_ = -1;
     codec_id_ = "";
     codec_private_.clear();
     track_content_encodings_client_.reset();
 
     audio_client_.Reset();
     video_client_.Reset();
     return true;
   }
 
   return true;
 }
 
 bool WebMTracksParser::OnUInt(int id, int64 val) {
   int64* dst = NULL;
 
   switch (id) {
     case kWebMIdTrackNumber:
       dst = &track_num_;
       break;
     case kWebMIdTrackType:
       dst = &track_type_;
       break;
+    case kWebMIdMaxBlockAdditionId:
+      dst = &max_block_additional_id_;
+      break;
     default:
       return true;
   }
 
   if (*dst != -1) {
     MEDIA_LOG(log_cb_) << "Multiple values for id " << std::hex << id
                        << " specified";
     return false;
   }
 
@@ skipping 36 matching lines @@
 
   if (id == kWebMIdLanguage) {
     track_language_ = str;
     return true;
   }
 
   return true;
 }
 
 }  // namespace media