| OLD | NEW |
| 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 #include "media/mp4/mp4_stream_parser.h" | 5 #include "media/mp4/mp4_stream_parser.h" |
| 6 | 6 |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 is_audio_track_encrypted_(false), | 37 is_audio_track_encrypted_(false), |
| 38 is_video_track_encrypted_(false) { | 38 is_video_track_encrypted_(false) { |
| 39 } | 39 } |
| 40 | 40 |
| 41 MP4StreamParser::~MP4StreamParser() {} | 41 MP4StreamParser::~MP4StreamParser() {} |
| 42 | 42 |
| 43 void MP4StreamParser::Init(const InitCB& init_cb, | 43 void MP4StreamParser::Init(const InitCB& init_cb, |
| 44 const NewConfigCB& config_cb, | 44 const NewConfigCB& config_cb, |
| 45 const NewBuffersCB& audio_cb, | 45 const NewBuffersCB& audio_cb, |
| 46 const NewBuffersCB& video_cb, | 46 const NewBuffersCB& video_cb, |
| 47 const NewTextBuffersCB& /* text_cb */ , |
| 47 const NeedKeyCB& need_key_cb, | 48 const NeedKeyCB& need_key_cb, |
| 49 const AddTextTrackCB& /* add_text_track_cb */ , |
| 48 const NewMediaSegmentCB& new_segment_cb, | 50 const NewMediaSegmentCB& new_segment_cb, |
| 49 const base::Closure& end_of_segment_cb, | 51 const base::Closure& end_of_segment_cb, |
| 50 const LogCB& log_cb) { | 52 const LogCB& log_cb) { |
| 51 DCHECK_EQ(state_, kWaitingForInit); | 53 DCHECK_EQ(state_, kWaitingForInit); |
| 52 DCHECK(init_cb_.is_null()); | 54 DCHECK(init_cb_.is_null()); |
| 53 DCHECK(!init_cb.is_null()); | 55 DCHECK(!init_cb.is_null()); |
| 54 DCHECK(!config_cb.is_null()); | 56 DCHECK(!config_cb.is_null()); |
| 55 DCHECK(!audio_cb.is_null() || !video_cb.is_null()); | 57 DCHECK(!audio_cb.is_null() || !video_cb.is_null()); |
| 56 DCHECK(!need_key_cb.is_null()); | 58 DCHECK(!need_key_cb.is_null()); |
| 57 DCHECK(!end_of_segment_cb.is_null()); | 59 DCHECK(!end_of_segment_cb.is_null()); |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 return !err; | 563 return !err; |
| 562 } | 564 } |
| 563 | 565 |
| 564 void MP4StreamParser::ChangeState(State new_state) { | 566 void MP4StreamParser::ChangeState(State new_state) { |
| 565 DVLOG(2) << "Changing state: " << new_state; | 567 DVLOG(2) << "Changing state: " << new_state; |
| 566 state_ = new_state; | 568 state_ = new_state; |
| 567 } | 569 } |
| 568 | 570 |
| 569 } // namespace mp4 | 571 } // namespace mp4 |
| 570 } // namespace media | 572 } // namespace media |
| OLD | NEW |