Replace DCHECK with conditional and error.

media/base/audio_discard_helper.cc

 // Copyright 2014 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/base/audio_discard_helper.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/audio_buffer.h"
@@ skipping 176 matching lines @@
 
   // Handle end discard padding.
   if (current_discard_padding.second > base::TimeDelta()) {
     const size_t decoded_frames = decoded_buffer->frame_count();
     size_t end_frames_to_discard =
         TimeDeltaToFrames(current_discard_padding.second);
 
     if (decoder_delay_) {
       // Delayed end discard only works if the decoder delay is less than a
       // single buffer.
-      DCHECK_LT(decoder_delay_, original_frame_count);
+      if (decoder_delay_ >= original_frame_count) {
+        DLOG(ERROR) << "Encountered invalid discard padding value.";
+        return false;
+      }
 
       // If the discard is >= the decoder delay, trim everything we can off the
       // end of this buffer and the rest from the start of the next.
       if (end_frames_to_discard >= decoder_delay_) {
         DCHECK(!discard_frames_);
         discard_frames_ = decoder_delay_;
         end_frames_to_discard -= decoder_delay_;
       } else {
         DCHECK(!delayed_end_discard_);
         std::swap(delayed_end_discard_, end_frames_to_discard);
@@ skipping 22 matching lines @@
   DVLOG(3) << __func__ << " ts: " << timestamp_helper_.GetTimestamp()
            << " frames: " << decoded_buffer->frame_count();
 
   // Assign timestamp to the buffer.
   decoded_buffer->set_timestamp(timestamp_helper_.GetTimestamp());
   timestamp_helper_.AddFrames(decoded_buffer->frame_count());
   return true;
 }
 
 }  // namespace media