Support MPEG1 audio in the MPEG2-TS stream parser.

media/formats/mpeg/mp3_stream_parser.h

 // 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.
 
 #ifndef MEDIA_FORMATS_MPEG_MP3_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MPEG_MP3_STREAM_PARSER_H_
 
 #include "base/basictypes.h"
 #include "media/base/media_export.h"
 #include "media/formats/mpeg/mpeg_audio_stream_parser_base.h"
 
 namespace media {
 
 class MEDIA_EXPORT MP3StreamParser : public MPEGAudioStreamParserBase {
  public:
+  struct Mpeg1AudioHeader {
+    int version;
+    int layer;
+    int frame_size;
+    int sample_rate;
+    int channel_mode;
+    ChannelLayout channel_layout;
+    int sample_count;
+  };
+
+  static const int kMpeg1AudioHeaderSize;
+
+  // Assumption: size of array |data| should be at least the size of an Mpeg1
+  // audio header (i.e. should be greater than or equal to 4).

[damienv1, 2014/09/03 17:43:43]

Update the comment using kMpeg1AudioHeaderSize instead of hard-coded 4.

+  static bool ParserMpeg1AudioFrameHeader(

[damienv1, 2014/09/03 18:59:54]

Could be simply ParseMpeg1AudioHeader.

+      const LogCB& log_cb,
+      const uint8* data,
+      Mpeg1AudioHeader* header);
+
   MP3StreamParser();
   virtual ~MP3StreamParser();
 
  private:
   // MPEGAudioStreamParserBase overrides.
   virtual int ParseFrameHeader(const uint8* data,
                                int size,
                                int* frame_size,
                                int* sample_rate,
                                ChannelLayout* channel_layout,
                                int* sample_count,
                                bool* metadata_frame) const OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(MP3StreamParser);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MPEG_MP3_STREAM_PARSER_H_