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

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

Issue 10651006: Add Common Encryption support to BMFF, including subsample decryption. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Remove references to non-public encrypted files in tests Created 8 years, 6 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"
(...skipping 27 matching lines...) Expand all
38 kWaitingForInit, 38 kWaitingForInit,
39 kParsingBoxes, 39 kParsingBoxes,
40 kEmittingSamples, 40 kEmittingSamples,
41 kError 41 kError
42 }; 42 };
43 43
44 bool ParseBox(bool* err); 44 bool ParseBox(bool* err);
45 bool ParseMoov(mp4::BoxReader* reader); 45 bool ParseMoov(mp4::BoxReader* reader);
46 bool ParseMoof(mp4::BoxReader* reader); 46 bool ParseMoof(mp4::BoxReader* reader);
47 47
48 bool EmitKeyNeeded(const TrackEncryption& track_encryption);
49
48 bool ReadMDATsUntil(const int64 tgt_tail); 50 bool ReadMDATsUntil(const int64 tgt_tail);
49 51
50 void ChangeState(State new_state); 52 void ChangeState(State new_state);
51 53
52 bool EmitConfigs(); 54 bool EmitConfigs();
53 bool EnqueueSample(BufferQueue* audio_buffers, 55 bool EnqueueSample(BufferQueue* audio_buffers,
54 BufferQueue* video_buffers, 56 BufferQueue* video_buffers,
55 bool* err); 57 bool* err);
56 58
57 State state_; 59 State state_;
(...skipping 30 matching lines...) Expand all
88 // every frame. 90 // every frame.
89 uint8 size_of_nalu_length_; 91 uint8 size_of_nalu_length_;
90 92
91 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser); 93 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
92 }; 94 };
93 95
94 } // namespace mp4 96 } // namespace mp4
95 } // namespace media 97 } // namespace media
96 98
97 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_ 99 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698