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

media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.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/ffmpeg_h264_to_annex_b_bitstream_converter.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/formats/mp4/box_definitions.h"
 
 namespace media {
 
 FFmpegH264ToAnnexBBitstreamConverter::FFmpegH264ToAnnexBBitstreamConverter(
-    AVCodecContext* stream_codec_context)
+    AVCodecParameters* stream_codec_parameters)
     : configuration_processed_(false),
-      stream_codec_context_(stream_codec_context) {
-  CHECK(stream_codec_context_);
+      stream_codec_parameters_(stream_codec_parameters) {
+  CHECK(stream_codec_parameters_);
 }
 
 FFmpegH264ToAnnexBBitstreamConverter::~FFmpegH264ToAnnexBBitstreamConverter() {}
 
 bool FFmpegH264ToAnnexBBitstreamConverter::ConvertPacket(AVPacket* packet) {
   std::unique_ptr<mp4::AVCDecoderConfigurationRecord> avc_config;
 
   if (packet == NULL || !packet->data)
     return false;
 
   // Calculate the needed output buffer size.
   if (!configuration_processed_) {
-    if (!stream_codec_context_->extradata ||
-        stream_codec_context_->extradata_size <= 0)
+    if (!stream_codec_parameters_->extradata ||
+        stream_codec_parameters_->extradata_size <= 0)
       return false;
 
     avc_config.reset(new mp4::AVCDecoderConfigurationRecord());
 
-    if (!converter_.ParseConfiguration(
-            stream_codec_context_->extradata,
-            stream_codec_context_->extradata_size,
-            avc_config.get())) {
+    if (!converter_.ParseConfiguration(stream_codec_parameters_->extradata,
+                                       stream_codec_parameters_->extradata_size,
+                                       avc_config.get())) {
       return false;
     }
   }
 
   uint32_t output_packet_size = converter_.CalculateNeededOutputBufferSize(
       packet->data, packet->size, avc_config.get());
 
   if (output_packet_size == 0)
     return false;  // Invalid input packet.
 
@@ skipping 21 matching lines @@
     configuration_processed_ = true;
 
   // 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