Add config change support to FFmpegVideoDecoder

media/mp4/mp4_stream_parser.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mp4/mp4_stream_parser.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/time.h"
@@ skipping 182 matching lines @@
                               // No decoder-specific buffer needed for AVC;
                               // SPS/PPS are embedded in the video stream
                               NULL, 0, false);
       has_video_ = true;
       video_track_id_ = track->header.track_id;
 
       size_of_nalu_length_ = entry.avcc.length_size;
     }
   }
 
-  // TODO(strobe): For now, we avoid sending new configs on a new
-  // reinitialization segment, and instead simply embed the updated parameter
-  // sets into the video stream. The conditional should be removed when
-  // http://crbug.com/122913 is fixed.
-  if (!init_cb_.is_null())
-    RCHECK(config_cb_.Run(audio_config, video_config));
+  RCHECK(config_cb_.Run(audio_config, video_config));
 
   base::TimeDelta duration;
   if (moov_->extends.header.fragment_duration > 0) {
     duration = TimeDeltaFromFrac(moov_->extends.header.fragment_duration,
                                  moov_->header.timescale);
   } else if (moov_->header.duration > 0) {
     duration = TimeDeltaFromFrac(moov_->header.duration,
                                  moov_->header.timescale);
   } else {
     duration = kInfiniteDuration();
@@ skipping 145 matching lines @@
   return true;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media