Fix MSE ADTS parsing on Android.

media/formats/mpeg/adts_stream_parser.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/adts_stream_parser.h"
 
 #include <stddef.h>
 
+#include "build/build_config.h"
 #include "media/base/media_log.h"
+#include "media/formats/mp4/aac.h"
 #include "media/formats/mpeg/adts_constants.h"
 
 namespace media {
 
 static const uint32_t kADTSStartCodeMask = 0xfff00000;
 
 ADTSStreamParser::ADTSStreamParser()
     : MPEGAudioStreamParserBase(kADTSStartCodeMask, kCodecAAC, 0) {}
 
 ADTSStreamParser::~ADTSStreamParser() {}
 
 int ADTSStreamParser::ParseFrameHeader(const uint8_t* data,

[chcunningham, 2016/09/28 18:50:00]

I think we have an opportunity to de-dupe the code in:
https://cs.chromium.org/chromium/src/media/formats/mpeg/adts_header_parser.cc...

I think I prefer the way its written below, so I would opt to remove the logic
in adts_header_parser and have it call this method.

[DaleCurtis, 2016/09/29 01:23:52]

Thanks for pointing that out. I had forgotten about that code. Deleted that file
and callers now use this code directly.

                                        int size,
                                        int* frame_size,
                                        int* sample_rate,
                                        ChannelLayout* channel_layout,
                                        int* sample_count,
-                                       bool* metadata_frame) const {
+                                       bool* metadata_frame,
+                                       std::vector<uint8_t>* extra_data) const {
   DCHECK(data);
   DCHECK_GE(size, 0);
   DCHECK(frame_size);
 
   if (size < 8)
     return 0;
 
   BitReader reader(data, size);
   int sync;
   int version;
@@ skipping 50 matching lines @@
 
   if (sample_count)
     *sample_count = (num_data_blocks + 1) * kSamplesPerAACFrame;
 
   if (channel_layout)
     *channel_layout = kADTSChannelLayoutTable[channel_layout_index];
 
   if (metadata_frame)
     *metadata_frame = false;
 
+// Only Android needs this extra data to be passed.
+#if defined(OS_ANDROID)
+  if (extra_data) {
+    // See mp4::AAC::Parse() for details. We don't need to worry about writing
+    // extensions since we can't have extended ADTS by this point (it's
+    // explicitly rejected as invalid above).
+    DCHECK_NE(sample_rate_index, 15u);
+    const uint16_t esds = (((((profile + 1) << 4) + sample_rate_index) << 4) +
+                           channel_layout_index)
+                          << 3;
+    extra_data->push_back((esds & 0xFF00) >> 8);
+    extra_data->push_back(esds & 0x00FF);
+    DCHECK(mp4::AAC().Parse(*extra_data, media_log()));
+  }
+#endif
+
   return bytes_read;
 }
 
 }  // namespace media