Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(711)

Unified Diff: media/mp4/mp4_stream_parser.h

Issue 11819013: Add support for accepting MPEG2 AAC-LC bitstreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and add MPEG2 AAC-LC test. Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mp4/es_descriptor.h ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mp4/mp4_stream_parser.h
diff --git a/media/mp4/mp4_stream_parser.h b/media/mp4/mp4_stream_parser.h
index 05206efd682699129cd7ac042d773a045da01d99..0fc65c62a85e61f0e8581a90741aeb43966f010e 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_;
bool is_audio_track_encrypted_;
bool is_video_track_encrypted_;
« no previous file with comments | « media/mp4/es_descriptor.h ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698