Ensure DiscardPadding is parsed as a signed integer.

media/filters/opus_audio_decoder.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/opus_audio_decoder.h"
 
 #include <cmath>
 
 #include "base/single_thread_task_runner.h"
 #include "base/sys_byteorder.h"
@@ skipping 473 matching lines @@
                 << " timestamp: " << input->timestamp().InMicroseconds()
                 << " us, duration: " << input->duration().InMicroseconds()
                 << " us, packet size: " << input->data_size() << " bytes with"
                 << " status: " << opus_strerror(frames_decoded);
     return false;
   }
 
   if (output_timestamp_helper_->base_timestamp() == kNoTimestamp() &&
       !input->end_of_stream()) {
     DCHECK(input->timestamp() != kNoTimestamp());
-    // Adjust the timestamp helper so the base timestamp is corrected for frames
-    // dropped due to codec delay.
     output_timestamp_helper_->SetBaseTimestamp(input->timestamp());
-    output_timestamp_helper_->SetBaseTimestamp(
-        input->timestamp() -
-        output_timestamp_helper_->GetFrameDuration(config_.codec_delay()));
   }
 
   // Trim off any extraneous allocation.
   DCHECK_LE(frames_decoded, output_buffer->get()->frame_count());
   const int trim_frames = output_buffer->get()->frame_count() - frames_decoded;
   if (trim_frames > 0)
     output_buffer->get()->TrimEnd(trim_frames);
 
   // Handle frame discard and trimming.
   int frames_to_output = frames_decoded;
   if (frames_decoded > frames_to_discard_) {
     if (frames_to_discard_ > 0) {
       output_buffer->get()->TrimStart(frames_to_discard_);
       frames_to_output -= frames_to_discard_;
       frames_to_discard_ = 0;
     }
     if (input->discard_padding().InMicroseconds() > 0) {
       int discard_padding = TimeDeltaToAudioFrames(
           input->discard_padding(), config_.samples_per_second());
       if (discard_padding < 0 || discard_padding > frames_to_output) {
         DVLOG(1) << "Invalid file. Incorrect discard padding value.";
         return false;
       }
       output_buffer->get()->TrimEnd(discard_padding);
       frames_to_output -= discard_padding;
+    } else {
+      DCHECK_EQ(input->discard_padding().InMicroseconds(), 0);
     }
   } else {
     frames_to_discard_ -= frames_to_output;
     frames_to_output = 0;
   }
 
   // Assign timestamp and duration to the buffer.
   output_buffer->get()->set_timestamp(output_timestamp_helper_->GetTimestamp());
   output_buffer->get()->set_duration(
       output_timestamp_helper_->GetFrameDuration(frames_to_output));
   output_timestamp_helper_->AddFrames(frames_decoded);

[acolwell GONE FROM CHROMIUM, 2014/04/25 00:06:05]

Shouldn't this be frames_to_output?

[DaleCurtis, 2014/04/25 00:22:10]

Whoops, yes.

 
   // Discard the buffer to indicate we need more data.
   if (!frames_to_output)
     *output_buffer = NULL;

[acolwell GONE FROM CHROMIUM, 2014/04/25 00:06:05]

Move this above the output_buffer timestamps setup and early return so we aren't
doing throw away work?

[DaleCurtis, 2014/04/25 00:22:10]

Done.

 
   return true;
 }
 
 }  // namespace media