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

Side by Side Diff: trunk/src/media/formats/mp4/mp4_stream_parser.cc

Issue 242203006: Revert 264763 "Wire up codec_delay() to MP3StreamParser and FFmp..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/formats/mp4/mp4_stream_parser.h" 5 #include "media/formats/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/time.h" 10 #include "base/time/time.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 LOG(ERROR) << "Unsupported sample size."; 245 LOG(ERROR) << "Unsupported sample size.";
246 return false; 246 return false;
247 } 247 }
248 248
249 is_audio_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted; 249 is_audio_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted;
250 DVLOG(1) << "is_audio_track_encrypted_: " << is_audio_track_encrypted_; 250 DVLOG(1) << "is_audio_track_encrypted_: " << is_audio_track_encrypted_;
251 audio_config.Initialize( 251 audio_config.Initialize(
252 codec, sample_format, channel_layout, sample_per_second, 252 codec, sample_format, channel_layout, sample_per_second,
253 extra_data.size() ? &extra_data[0] : NULL, extra_data.size(), 253 extra_data.size() ? &extra_data[0] : NULL, extra_data.size(),
254 is_audio_track_encrypted_, false, base::TimeDelta(), 254 is_audio_track_encrypted_, false, base::TimeDelta(),
255 0); 255 base::TimeDelta());
256 has_audio_ = true; 256 has_audio_ = true;
257 audio_track_id_ = track->header.track_id; 257 audio_track_id_ = track->header.track_id;
258 } 258 }
259 if (track->media.handler.type == kVideo && !video_config.IsValidConfig()) { 259 if (track->media.handler.type == kVideo && !video_config.IsValidConfig()) {
260 RCHECK(!samp_descr.video_entries.empty()); 260 RCHECK(!samp_descr.video_entries.empty());
261 if (desc_idx >= samp_descr.video_entries.size()) 261 if (desc_idx >= samp_descr.video_entries.size())
262 desc_idx = 0; 262 desc_idx = 0;
263 const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx]; 263 const VideoSampleEntry& entry = samp_descr.video_entries[desc_idx];
264 264
265 if (!entry.IsFormatValid()) { 265 if (!entry.IsFormatValid()) {
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 return !err; 575 return !err;
576 } 576 }
577 577
578 void MP4StreamParser::ChangeState(State new_state) { 578 void MP4StreamParser::ChangeState(State new_state) {
579 DVLOG(2) << "Changing state: " << new_state; 579 DVLOG(2) << "Changing state: " << new_state;
580 state_ = new_state; 580 state_ = new_state;
581 } 581 }
582 582
583 } // namespace mp4 583 } // namespace mp4
584 } // namespace media 584 } // namespace media
OLDNEW
« no previous file with comments | « trunk/src/media/filters/pipeline_integration_test.cc ('k') | trunk/src/media/formats/mpeg/adts_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698