Recherche avancée

Sur d’autres sites (4444)

• fftools/ffmpeg : Fix honor -r output option with streamcopy

  3 septembre 2024, par Nicolas Gaullier

  fftools/ffmpeg : Fix honor -r output option with streamcopy
  Fix "ost->st->avg_frame_rate = ost->frame_rate" in streamcopy_init()
  
  being reset to input's frame rate a few lines below.
  
  Note that in current code, there are some discrepancies amongst the
  
  muxers. For example, avienc relies on time_base, so it is not affected
  
  by this patch, whereas mxfenc and matroskaenc do use avg_frame_rate,
  
  so this patch fixes -r being honored.
  In the updated fate test, the input is (wrongly) probed as 50fps. With
  
  this patch, the correct value (25fps) is successfully forced with -r.
  Signed-off-by : Nicolas Gaullier <nicolas.gaullier@cji.paris>
  
  Signed-off-by : Anton Khirnov <anton@khirnov.net>
  

  • [DH] fftools/ffmpeg_mux_init.c
  • [DH] tests/ref/fate/time_base

• fftools/ffmpeg_demux : honor -ch_layout options for overriding input stream channel...

  18 mai 2024, par Marton Balint

  fftools/ffmpeg_demux : honor -ch_layout options for overriding input stream channel layout
  The code only set the channel layout of the AVFormatContext, so the user could
  
  not override the channel layout if the demuxer did not have such parameter.
  This used to work via the respective AVCodecContext option, but since
  
  639c2f00497257cb60ecaeeac1aacfa80df3be06 it no longer gets passed to the
  
  decoders. It is actually better if we set it manually, instead of using the
  
  codec option because that way we can also override it on the stream level, so
  
  it will also work for stream copy or bitstream filtering.
  We don't allow changing the number of channels, because that can cause
  
  unexpected results. We disable layout guessing, if a channel layout is
  
  specified.
  Fixes ticket #11016.
  Signed-off-by : Marton Balint <cus@passwd.hu>
  

  • [DH] fftools/ffmpeg_demux.c

• flvdec : Honor the "flv_metadata" option for the "datastream" metadata field

  9 février 2024, par Martin Storsjö

  flvdec : Honor the "flv_metadata" option for the "datastream" metadata field
  By default the option "flv_metadata" (internally using the field
  
  name "trust_metadata") is set to 0, meaning that we don't allocate
  
  streams based on information in the metadata, only based on
  
  actual streams we encounter. However the "datastream" metadata field
  
  still would allocate a subtitle stream.
  When muxing, the "datastream" field is added if either a data stream
  
  or subtitle stream is present - but the same metadata field is used
  
  to preemtively create a subtitle stream only. Thus, if the field
  
  was added due to a data stream, not a subtitle stream, the demuxer
  
  would create a stream which won't get any actual packets.
  If there was such an extra, empty subtitle stream, running
  
  avformat_find_stream_info still used to terminate within reasonable
  
  time before 3749eede66c3774799766b1f246afae8a6ffc9bb. After that
  
  commit, it no longer would terminate until it reaches the max
  
  analyze duration, which is 90 seconds for flv streams (see
  
  e6a084641aada7a2e4672172f2ee26642800a361,
  
  24fdf7334d2bb9aab0abdbc878b8ae51eb57c86b and
  
  f58e011a1f30332ba824c155078ca701e29aef63).
  Before that commit (which removed the deprecated AVStream.codec), the
  
  "st->codecpar->codec_id = AV_CODEC_ID_TEXT", set within the demuxer,
  
  would get propagated into st->codec->codec_id by numerous
  
  avcodec_parameters_to_context(st->codec, st->codecpar), then further
  
  into st->internal->avctx->codec_id by update_stream_avctx within
  
  read_frame_internal in libavformat/utils.c (demux.c these days).
  Signed-off-by : Martin Storsjö <martin@martin.st>
  

  • [DH] libavformat/flvdec.c