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

Side by Side Diff: media/mp4/mp4_stream_parser.h

Issue 10710002: Add HE AAC support to ISO BMFF. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Add unittest for 5.1 channel. Created 8 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_ 5 #ifndef MEDIA_MP4_MP4_STREAM_PARSER_H_
6 #define MEDIA_MP4_MP4_STREAM_PARSER_H_ 6 #define MEDIA_MP4_MP4_STREAM_PARSER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "media/base/media_export.h" 12 #include "media/base/media_export.h"
13 #include "media/base/stream_parser.h" 13 #include "media/base/stream_parser.h"
14 #include "media/mp4/aac.h"
14 #include "media/mp4/offset_byte_queue.h" 15 #include "media/mp4/offset_byte_queue.h"
15 #include "media/mp4/track_run_iterator.h" 16 #include "media/mp4/track_run_iterator.h"
16 17
17 namespace media { 18 namespace media {
18 namespace mp4 { 19 namespace mp4 {
19 20
20 struct Movie; 21 struct Movie;
21 class BoxReader; 22 class BoxReader;
22 23
23 class MEDIA_EXPORT MP4StreamParser : public StreamParser { 24 class MEDIA_EXPORT MP4StreamParser : public StreamParser {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 79
79 mp4::TrackRunIterator runs_; 80 mp4::TrackRunIterator runs_;
80 81
81 scoped_ptr<mp4::Movie> moov_; 82 scoped_ptr<mp4::Movie> moov_;
82 83
83 bool has_audio_; 84 bool has_audio_;
84 bool has_video_; 85 bool has_video_;
85 uint32 audio_track_id_; 86 uint32 audio_track_id_;
86 uint32 video_track_id_; 87 uint32 video_track_id_;
87 bool parameter_sets_inserted_; 88 bool parameter_sets_inserted_;
89 AAC aac_;
88 90
89 // We keep this around to avoid having to go digging through the moov with 91 // We keep this around to avoid having to go digging through the moov with
90 // every frame. 92 // every frame.
91 uint8 size_of_nalu_length_; 93 uint8 size_of_nalu_length_;
92 94
93 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser); 95 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
94 }; 96 };
95 97
96 } // namespace mp4 98 } // namespace mp4
97 } // namespace media 99 } // namespace media
98 100
99 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_ 101 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698