FFmpegDemuxer: Clear |extra_data| when enabling bitstream conversion.

media/filters/ffmpeg_demuxer.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_demuxer.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 652 matching lines @@
 #if defined(USE_PROPRIETARY_CODECS)
   if (bitstream_converter_)
     InitBitstreamConverter();
 #endif  // defined(USE_PROPRIETARY_CODECS)
 }
 
 void FFmpegDemuxerStream::InitBitstreamConverter() {
 #if defined(USE_PROPRIETARY_CODECS)
   switch (stream_->codec->codec_id) {
     case AV_CODEC_ID_H264:
+      // Clear |extra_data| so that future (fallback) decoders will know that
+      // conversion is forcibly enabled on this stream.
+      //
+      // TODO(sandersd): Ideally we would convert |extra_data| to concatenated
+      // SPS/PPS data, but it's too late to be useful because Initialize() was
+      // already called on GpuVideoDecoder, which is the only path that would
+      // consume that data.
+      if (video_config_)
+        video_config_->SetExtraData(std::vector<uint8_t>());
       bitstream_converter_.reset(
           new FFmpegH264ToAnnexBBitstreamConverter(stream_->codec));
       break;
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
     case AV_CODEC_ID_HEVC:
       bitstream_converter_.reset(
           new FFmpegH265ToAnnexBBitstreamConverter(stream_->codec));
       break;
 #endif
     case AV_CODEC_ID_AAC:
@@ skipping 1096 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media