FFmpeg fixups for M33 roll. Now with more Opus!

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/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 583 matching lines @@
       output_buffer->get()->TrimEnd(discard_padding);
       frames_decoded -= discard_padding;
     }
   } else if (bytes_decoded > 0) {
     frames_to_discard_ -= frames_decoded;
     frames_decoded = 0;
   }
 
   // Decoding finished successfully, update statistics.
   PipelineStatistics statistics;
-  statistics.audio_bytes_decoded =
-      frames_decoded *
-      demuxer_stream_->audio_decoder_config().bytes_per_frame();
+  statistics.audio_bytes_decoded = input->data_size();
   statistics_cb_.Run(statistics);
 
+  // Discard the buffer to indicate we need more data.
+  if (!frames_decoded)
+    *output_buffer = NULL;
+
   return true;
 }
 
 }  // namespace media