Fix sourceAbort() for BMFF streams.

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 40 matching lines @@
   ChangeState(kParsingBoxes);
   init_cb_ = init_cb;
   config_cb_ = config_cb;
   audio_cb_ = audio_cb;
   video_cb_ = video_cb;
   need_key_cb_ = need_key_cb;
   new_segment_cb_ = new_segment_cb;
   end_of_segment_cb_ = end_of_segment_cb;
 }
 
+void MP4StreamParser::Reset() {
+  queue_.Reset();
+  moov_.reset();
+  runs_.reset();
+  moof_head_ = 0;
+  mdat_tail_ = 0;
+}
+
 void MP4StreamParser::Flush() {
   DCHECK_NE(state_, kWaitingForInit);
-
-  queue_.Reset();
-  moof_head_ = 0;
-  mdat_tail_ = 0;
+  Reset();
+  ChangeState(kParsingBoxes);
 }
 
 bool MP4StreamParser::Parse(const uint8* buf, int size) {
   DCHECK_NE(state_, kWaitingForInit);
 
   if (state_ == kError)
     return false;
 
   queue_.Push(buf, size);
 
@@ skipping 13 matching lines @@
         err = !ReadAndDiscardMDATsUntil(max_clear);
       }
     }
   } while (result && !err);
 
   if (!err)
     err = !SendAndFlushSamples(&audio_buffers, &video_buffers);
 
   if (err) {
     DLOG(ERROR) << "Error while parsing MP4";
-    queue_.Reset();
-    moov_.reset();
-    runs_.reset();
+    Reset();
     ChangeState(kError);
     return false;
   }
 
   return true;
 }
 
 bool MP4StreamParser::ParseBox(bool* err) {
   const uint8* buf;
   int size;
@@ skipping 258 matching lines @@
 
   scoped_ptr<DecryptConfig> decrypt_config;
   if (runs_->is_encrypted())
     decrypt_config = runs_->GetDecryptConfig();
 
   std::vector<uint8> frame_buf(buf, buf + runs_->sample_size());
   if (video) {
     std::vector<SubsampleEntry> subsamples;
     if (decrypt_config.get())
       subsamples = decrypt_config->subsamples();
-    RCHECK(PrepareAVCBuffer(runs_->video_description().avcc,
-                            &frame_buf, &subsamples));
+    if (!PrepareAVCBuffer(runs_->video_description().avcc,
+                          &frame_buf, &subsamples)) {
+      DLOG(ERROR) << "Failed to prepare AVC sample for decode";
+      *err = true;
+      return false;
+    }
     if (!subsamples.empty()) {
       decrypt_config.reset(new DecryptConfig(
           decrypt_config->key_id(),
           decrypt_config->iv(),
           decrypt_config->checksum(),
           decrypt_config->data_offset(),
           subsamples));
     }
   }
 
   if (audio) {
     const AAC& aac = runs_->audio_description().esds.aac;
-    RCHECK(aac.ConvertEsdsToADTS(&frame_buf));
+    if (!aac.ConvertEsdsToADTS(&frame_buf)) {
+      DLOG(ERROR) << "Failed to convert ESDS to ADTS";
+      *err = true;
+      return false;
+    }
   }
 
   scoped_refptr<StreamParserBuffer> stream_buf =
     StreamParserBuffer::CopyFrom(&frame_buf[0], frame_buf.size(),
                                  runs_->is_keyframe());
 
   if (runs_->is_encrypted())
     stream_buf->SetDecryptConfig(decrypt_config.Pass());
 
   stream_buf->SetDuration(runs_->duration());
@@ skipping 53 matching lines @@
   return !err;
 }
 
 void MP4StreamParser::ChangeState(State new_state) {
   DVLOG(2) << "Changing state: " << new_state;
   state_ = new_state;
 }
 
 }  // namespace mp4
 }  // namespace media