Set AVDISCARD_ALL flag for disabled streams in FFmpegDemuxer

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 714 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
   return is_enabled_;
 }
 
 void FFmpegDemuxerStream::set_enabled(bool enabled, base::TimeDelta timestamp) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   if (enabled == is_enabled_)
     return;
 
   is_enabled_ = enabled;
+  av_stream()->discard = enabled ? AVDISCARD_DEFAULT : AVDISCARD_ALL;
   if (is_enabled_) {
     waiting_for_keyframe_ = true;
   }
   if (!is_enabled_ && !read_cb_.is_null()) {
     DVLOG(1) << "Read from disabled stream, returning EOS";
     base::ResetAndReturn(&read_cb_).Run(kOk, DecoderBuffer::CreateEOSBuffer());
     return;
   }
   if (!stream_status_change_cb_.is_null())
     stream_status_change_cb_.Run(this, is_enabled_, timestamp);
@@ skipping 535 matching lines @@
         // when using external decoder (e.g. hardware decoder), so override them
         // to make sure this translates into a valid VideoDecoderConfig. Coded
         // size is overridden in AVStreamToVideoDecoderConfig().
         if (stream->codecpar->format == AV_PIX_FMT_NONE)
           stream->codecpar->format = AV_PIX_FMT_YUV420P;
       }
 #endif
     } else if (codec_type == AVMEDIA_TYPE_SUBTITLE) {
       detected_text_track_count++;
       if (codec_id != AV_CODEC_ID_WEBVTT || !text_enabled_) {
+        stream->discard = AVDISCARD_ALL;
         continue;
       }
     } else {
+      stream->discard = AVDISCARD_ALL;
       continue;
     }
 
     // Attempt to create a FFmpegDemuxerStream from the AVStream. This will
     // return nullptr if the AVStream is invalid. Validity checks will verify
     // things like: codec, channel layout, sample/pixel format, etc...
     std::unique_ptr<FFmpegDemuxerStream> demuxer_stream =
         FFmpegDemuxerStream::Create(this, stream, media_log_);
     if (demuxer_stream.get()) {
       streams_[i] = std::move(demuxer_stream);
@@ skipping 536 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media