| Index: media/mp4/mp4_stream_parser.h
|
| diff --git a/media/mp4/mp4_stream_parser.h b/media/mp4/mp4_stream_parser.h
|
| index 292f6286c594a8337636348deceaa95fc829bbfb..bc68896c10721c3b2c4070dabfc3704b1cad909a 100644
|
| --- a/media/mp4/mp4_stream_parser.h
|
| +++ b/media/mp4/mp4_stream_parser.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
|
| #define MEDIA_MP4_MP4_STREAM_PARSER_H_
|
|
|
| +#include <set>
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| @@ -24,7 +25,7 @@ class BoxReader;
|
|
|
| class MEDIA_EXPORT MP4StreamParser : public StreamParser {
|
| public:
|
| - MP4StreamParser(bool has_sbr);
|
| + MP4StreamParser(const std::set<int>& audio_object_types, bool has_sbr);
|
| virtual ~MP4StreamParser();
|
|
|
| virtual void Init(const InitCB& init_cb, const NewConfigCB& config_cb,
|
| @@ -107,6 +108,8 @@ class MEDIA_EXPORT MP4StreamParser : public StreamParser {
|
| bool has_video_;
|
| uint32 audio_track_id_;
|
| uint32 video_track_id_;
|
| + // The object types allowed for audio tracks.
|
| + std::set<int> audio_object_types_;
|
| bool has_sbr_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
|
|
|