Merge M56: "Fail decodeAudioFileData() when duration is unknown."

media/filters/audio_file_reader.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/filters/audio_file_reader.h"
 
 #include <stddef.h>
 
 #include <cmath>
 
@@ skipping 17 matching lines @@
       sample_rate_(0),
       av_sample_format_(0) {}
 
 AudioFileReader::~AudioFileReader() {
   Close();
 }
 
 bool AudioFileReader::Open() {
   if (!OpenDemuxer())
     return false;
-  return OpenDecoder();
+  if (!OpenDecoder())
+    return false;
+
+  // If the duration is unknown, fail out; this API can not work with streams of
+  // unknown duration currently.
+  return glue_->format_context()->duration != AV_NOPTS_VALUE;
 }
 
 bool AudioFileReader::OpenDemuxer() {
   glue_.reset(new FFmpegGlue(protocol_));
   AVFormatContext* format_context = glue_->format_context();
 
   // Open FFmpeg AVFormatContext.
   if (!glue_->OpenContext()) {
     DLOG(WARNING) << "AudioFileReader::Open() : error in avformat_open_input()";
     return false;
@@ skipping 192 matching lines @@
       current_frame, audio_bus->frames() - current_frame);
 
   // Returns the actual number of sample-frames decoded.
   // Ideally this represents the "true" exact length of the file.
   return current_frame;
 }
 
 base::TimeDelta AudioFileReader::GetDuration() const {
   const AVRational av_time_base = {1, AV_TIME_BASE};
 
-  // Estimated duration in micro seconds.
+  DCHECK_NE(glue_->format_context()->duration, AV_NOPTS_VALUE);
   base::CheckedNumeric<int64_t> estimated_duration_us =
       glue_->format_context()->duration;
 
   if (audio_codec_ == kCodecAAC) {
     // For certain AAC-encoded files, FFMPEG's estimated frame count might not
     // be sufficient to capture the entire audio content that we want. This is
     // especially noticeable for short files (< 10ms) resulting in silence
     // throughout the decoded buffer. Thus we add the priming frames and the
     // remainder frames to the estimation.
     // (See: crbug.com/513178)
@@ skipping 43 matching lines @@
              glue_->format_context(), stream_index_,
              ConvertToTimeBase(GetAVStreamForTesting()->time_base, seek_time),
              AVSEEK_FLAG_BACKWARD) >= 0;
 }
 
 const AVStream* AudioFileReader::GetAVStreamForTesting() const {
   return glue_->format_context()->streams[stream_index_];
 }
 
 }  // namespace media