Roll src/third_party/ffmpeg/ 3c7a09882..cdf4accee (3188 commits).

media/filters/ffmpeg_h265_to_annex_b_bitstream_converter.cc

 // Copyright 2015 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/ffmpeg_h265_to_annex_b_bitstream_converter.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "media/base/decrypt_config.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/formats/mp4/avc.h"
 #include "media/formats/mp4/box_definitions.h"
 #include "media/formats/mp4/hevc.h"
 
 namespace media {
 
 FFmpegH265ToAnnexBBitstreamConverter::FFmpegH265ToAnnexBBitstreamConverter(
-    AVCodecContext* stream_codec_context)
-    : stream_codec_context_(stream_codec_context) {
-  CHECK(stream_codec_context_);
+    AVCodecParameters* stream_codec_parameters)
+    : stream_codec_parameters_(stream_codec_parameters) {
+  CHECK(stream_codec_parameters_);
 }
 
 FFmpegH265ToAnnexBBitstreamConverter::~FFmpegH265ToAnnexBBitstreamConverter() {}
 
 bool FFmpegH265ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) {
   DVLOG(3) << __FUNCTION__;
   if (packet == NULL || !packet->data)
     return false;
 
   // Calculate the needed output buffer size.
   if (!hevc_config_) {
-    if (!stream_codec_context_->extradata ||
-        stream_codec_context_->extradata_size <= 0) {
+    if (!stream_codec_parameters_->extradata ||
+        stream_codec_parameters_->extradata_size <= 0) {
       DVLOG(1) << "HEVCDecoderConfiguration not found, no extra codec data";
       return false;
     }
 
     hevc_config_.reset(new mp4::HEVCDecoderConfigurationRecord());
 
-    if (!hevc_config_->Parse(
-            stream_codec_context_->extradata,
-            stream_codec_context_->extradata_size)) {
+    if (!hevc_config_->Parse(stream_codec_parameters_->extradata,
+                             stream_codec_parameters_->extradata_size)) {
       DVLOG(1) << "Parsing HEVCDecoderConfiguration failed";
       return false;
     }
   }
 
   std::vector<uint8_t> input_frame;
   std::vector<SubsampleEntry> subsamples;
   // TODO(servolk): Performance could be improved here, by reducing unnecessary
   // data copying, but first annex b conversion code needs to be refactored to
   // allow that (see crbug.com/455379).
@@ skipping 32 matching lines @@
   memcpy(dest_packet.data, &input_frame[0], input_frame.size());
 
   // At the end we must destroy the old packet.
   av_packet_unref(packet);
   *packet = dest_packet;  // Finally, replace the values in the input packet.
 
   return true;
 }
 
 }  // namespace media