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

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

Issue 10843044: Fix sourceAbort() for BMFF streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 bool EmitConfigs(); 63 bool EmitConfigs();
64 bool PrepareAVCBuffer(const AVCDecoderConfigurationRecord& avc_config, 64 bool PrepareAVCBuffer(const AVCDecoderConfigurationRecord& avc_config,
65 std::vector<uint8>* frame_buf, 65 std::vector<uint8>* frame_buf,
66 std::vector<SubsampleEntry>* subsamples) const; 66 std::vector<SubsampleEntry>* subsamples) const;
67 bool EnqueueSample(BufferQueue* audio_buffers, 67 bool EnqueueSample(BufferQueue* audio_buffers,
68 BufferQueue* video_buffers, 68 BufferQueue* video_buffers,
69 bool* err); 69 bool* err);
70 bool SendAndFlushSamples(BufferQueue* audio_buffers, 70 bool SendAndFlushSamples(BufferQueue* audio_buffers,
71 BufferQueue* video_buffers); 71 BufferQueue* video_buffers);
72 72
73 void Reset();
74
73 State state_; 75 State state_;
74 InitCB init_cb_; 76 InitCB init_cb_;
75 NewConfigCB config_cb_; 77 NewConfigCB config_cb_;
76 NewBuffersCB audio_cb_; 78 NewBuffersCB audio_cb_;
77 NewBuffersCB video_cb_; 79 NewBuffersCB video_cb_;
78 NeedKeyCB need_key_cb_; 80 NeedKeyCB need_key_cb_;
79 NewMediaSegmentCB new_segment_cb_; 81 NewMediaSegmentCB new_segment_cb_;
80 base::Closure end_of_segment_cb_; 82 base::Closure end_of_segment_cb_;
81 83
82 OffsetByteQueue queue_; 84 OffsetByteQueue queue_;
(...skipping 17 matching lines...) Expand all
100 uint32 video_track_id_; 102 uint32 video_track_id_;
101 bool has_sbr_; 103 bool has_sbr_;
102 104
103 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser); 105 DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
104 }; 106 };
105 107
106 } // namespace mp4 108 } // namespace mp4
107 } // namespace media 109 } // namespace media
108 110
109 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_ 111 #endif // MEDIA_MP4_MP4_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « no previous file | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698