Fix MSE ADTS parsing on Android.

media/formats/mpeg/mpeg_audio_stream_parser_base.cc

 // Copyright 2014 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/formats/mpeg/mpeg_audio_stream_parser_base.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 161 matching lines @@
 int MPEGAudioStreamParserBase::ParseFrame(const uint8_t* data,
                                           int size,
                                           BufferQueue* buffers) {
   DVLOG(2) << __FUNCTION__ << "(" << size << ")";
 
   int sample_rate;
   ChannelLayout channel_layout;
   int frame_size;
   int sample_count;
   bool metadata_frame = false;
-  int bytes_read = ParseFrameHeader(data,
-                                    size,
-                                    &frame_size,
-                                    &sample_rate,
-                                    &channel_layout,
-                                    &sample_count,
-                                    &metadata_frame);
+  std::vector<uint8_t> extra_data;
+  int bytes_read =
+      ParseFrameHeader(data, size, &frame_size, &sample_rate, &channel_layout,
+                       &sample_count, &metadata_frame, &extra_data);
 
   if (bytes_read <= 0)
     return bytes_read;
 
   // Make sure data contains the entire frame.
   if (size < frame_size)
     return 0;
 
-  DVLOG(2) << " sample_rate " << sample_rate
-           << " channel_layout " << channel_layout
-           << " frame_size " << frame_size
-           << " sample_count " << sample_count;
+  DVLOG(2) << " sample_rate " << sample_rate << " channel_layout "
+           << channel_layout << " frame_size " << frame_size << " sample_count "
+           << sample_count;
 
-  if (config_.IsValidConfig() &&
-      (config_.samples_per_second() != sample_rate ||
-       config_.channel_layout() != channel_layout)) {
+  if (config_.IsValidConfig() && (config_.samples_per_second() != sample_rate ||
+                                  config_.channel_layout() != channel_layout)) {
     // Clear config data so that a config change is initiated.
     config_ = AudioDecoderConfig();
 
     // Send all buffers associated with the previous config.
     if (!buffers->empty() && !SendBuffers(buffers, true))
       return -1;
   }
 
   if (!config_.IsValidConfig()) {
     config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
-                       sample_rate, std::vector<uint8_t>(), Unencrypted(),
+                       sample_rate, extra_data, Unencrypted(),
                        base::TimeDelta(), codec_delay_);
 
     base::TimeDelta base_timestamp;
     if (timestamp_helper_)
       base_timestamp = timestamp_helper_->GetTimestamp();
 
     timestamp_helper_.reset(new AudioTimestampHelper(sample_rate));
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
     std::unique_ptr<MediaTracks> media_tracks(new MediaTracks());
@@ skipping 68 matching lines @@
 
   if (size < 10)
     return 0;
 
   BitReader reader(data, size);
   int32_t id;
   int version;
   uint8_t flags;
   int32_t id3_size;
 
-  if (!reader.ReadBits(24, &id) ||
-      !reader.ReadBits(16, &version) ||
-      !reader.ReadBits(8, &flags) ||
-      !ParseSyncSafeInt(&reader, &id3_size)) {
+  if (!reader.ReadBits(24, &id) || !reader.ReadBits(16, &version) ||
+      !reader.ReadBits(8, &flags) || !ParseSyncSafeInt(&reader, &id3_size)) {
     return -1;
   }
 
   int32_t actual_tag_size = 10 + id3_size;
 
   // Increment size if 'Footer present' flag is set.
   if (flags & 0x10)
     actual_tag_size += 10;
 
   // Make sure we have the entire tag.
@@ skipping 38 matching lines @@
     if (!candidate_start_code)
       return 0;
 
     bool parse_header_failed = false;
     const uint8_t* sync = candidate_start_code;
     // Try to find 3 valid frames in a row. 3 was selected to decrease
     // the probability of false positives.
     for (int i = 0; i < 3; ++i) {
       int sync_size = end - sync;
       int frame_size;
-      int sync_bytes = ParseFrameHeader(
-          sync, sync_size, &frame_size, NULL, NULL, NULL, NULL);
+      int sync_bytes = ParseFrameHeader(sync, sync_size, &frame_size, nullptr,
+                                        nullptr, nullptr, nullptr, nullptr);
 
       if (sync_bytes == 0)
         return 0;
 
       if (sync_bytes > 0) {
         DCHECK_LT(sync_bytes, sync_size);
 
         // Skip over this frame so we can check the next one.
         sync += frame_size;
 
@@ skipping 39 matching lines @@
   if (end_of_segment) {
     in_media_segment_ = false;
     end_of_segment_cb_.Run();
   }
 
   timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
 }  // namespace media