mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-24 07:17:04 +00:00
70c1647a35
Rev #2: Fixes doubled header writing, checked FATE running without errors Rev #3: Fixed coding style This commit addresses the following scenario: we are using ffmpeg to transcode or remux mkv (or something else) to mkv. The result is being streamed on-the-fly to an HTML5 client (streaming starts while ffmpeg is still running). The problem here is that the client is unable to detect the duration because the duration is only written to the mkv at the end of the transcoding/remoxing process. In matroskaenc.c, the duration is only written during mkv_write_trailer but not during mkv_write_header. The approach: FFMPEG is currently putting quite some effort to estimate the durations of source streams, but in many cases the source stream durations are still left at 0 and these durations are nowhere mapped to or used for output streams. As much as I would have liked to deduct or estimate output durations based on input stream durations - I realized that this is a hard task (as Nicolas already mentioned in a previous conversation). It would involve changes to the duration calculation/estimation/deduction for input streams and propagating these durations to output streams or the output context in a correct way. So I looked for a simple and small solution with better chances to get accepted. In webmdashenc.c I found that a duration is written during write_header and this duration is taken from the streams' metadata, so I decided for a similar approach. And here's what it does: At first it is checking the duration of the AVFormatContext. In typical cases this value is not set, but: It is set in cases where the user has specified a recording_time or an end_time via the -t or -to parameters. Then it is looking for a DURATION metadata field in the metadata of the output context (AVFormatContext::metadata). This would only exist in case the user has explicitly specified a metadata DURATION value from the command line. Then it is iterating all streams looking for a "DURATION" metadata (this works unless the option "-map_metadata -1" has been specified) and determines the maximum value. The precendence is as follows: 1. Use duration of AVFormatContext - 2. Use explicitly specified metadata duration value - 3. Use maximum (mapped) metadata duration over all streams. To test this: 1. With explicit recording time: ffmpeg -i file:"src.mkv" -loglevel debug -t 01:38:36.000 -y "dest.mkv" 2. Take duration from metadata specified via command line parameters: ffmpeg -i file:"src.mkv" -loglevel debug -map_metadata -1 -metadata Duration="01:14:33.00" -y "dest.mkv" 3. Take duration from mapped input metadata: ffmpeg -i file:"src.mkv" -loglevel debug -y "dest.mkv" Regression risk: Very low IMO because it only affects the header while ffmpeg is still running. When ffmpeg completes the process, the duration is rewritten to the header with the usual value (same like without this commit). Signed-off-by: SoftWorkz <softworkz@hotmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> |
||
|---|---|---|
| .. | ||
| tests | ||
| .gitignore | ||
| 3dostr.c | ||
| 4xm.c | ||
| a64.c | ||
| aacdec.c | ||
| aadec.c | ||
| ac3dec.c | ||
| acm.c | ||
| act.c | ||
| adp.c | ||
| ads.c | ||
| adtsenc.c | ||
| adxdec.c | ||
| aea.c | ||
| afc.c | ||
| aiff.h | ||
| aiffdec.c | ||
| aiffenc.c | ||
| aixdec.c | ||
| allformats.c | ||
| amr.c | ||
| anm.c | ||
| apc.c | ||
| ape.c | ||
| apetag.c | ||
| apetag.h | ||
| apngdec.c | ||
| apngenc.c | ||
| aqtitledec.c | ||
| asf.c | ||
| asf.h | ||
| asfcrypt.c | ||
| asfcrypt.h | ||
| asfdec_f.c | ||
| asfdec_o.c | ||
| asfenc.c | ||
| assdec.c | ||
| assenc.c | ||
| ast.c | ||
| ast.h | ||
| astdec.c | ||
| astenc.c | ||
| async.c | ||
| au.c | ||
| audiointerleave.c | ||
| audiointerleave.h | ||
| avc.c | ||
| avc.h | ||
| avformat.h | ||
| avformatres.rc | ||
| avi.h | ||
| avidec.c | ||
| avienc.c | ||
| avio_internal.h | ||
| avio.c | ||
| avio.h | ||
| aviobuf.c | ||
| avisynth.c | ||
| avlanguage.c | ||
| avlanguage.h | ||
| avr.c | ||
| avs.c | ||
| bethsoftvid.c | ||
| bfi.c | ||
| bink.c | ||
| bintext.c | ||
| bit.c | ||
| bluray.c | ||
| bmv.c | ||
| boadec.c | ||
| brstm.c | ||
| c93.c | ||
| cache.c | ||
| caf.c | ||
| caf.h | ||
| cafdec.c | ||
| cafenc.c | ||
| cavsvideodec.c | ||
| cdg.c | ||
| cdxl.c | ||
| chromaprint.c | ||
| cinedec.c | ||
| concat.c | ||
| concatdec.c | ||
| crcenc.c | ||
| crypto.c | ||
| cutils.c | ||
| dashenc.c | ||
| data_uri.c | ||
| dauddec.c | ||
| daudenc.c | ||
| dcstr.c | ||
| dfa.c | ||
| diracdec.c | ||
| dnxhddec.c | ||
| dsfdec.c | ||
| dsicin.c | ||
| dss.c | ||
| dtsdec.c | ||
| dtshddec.c | ||
| dump.c | ||
| dv.c | ||
| dv.h | ||
| dvbsub.c | ||
| dvbtxt.c | ||
| dvenc.c | ||
| dxa.c | ||
| eacdata.c | ||
| electronicarts.c | ||
| epafdec.c | ||
| ffm.h | ||
| ffmdec.c | ||
| ffmenc.c | ||
| ffmeta.h | ||
| ffmetadec.c | ||
| ffmetaenc.c | ||
| file_open.c | ||
| file.c | ||
| filmstripdec.c | ||
| filmstripenc.c | ||
| flac_picture.c | ||
| flac_picture.h | ||
| flacdec.c | ||
| flacenc_header.c | ||
| flacenc.c | ||
| flacenc.h | ||
| flic.c | ||
| flv.h | ||
| flvdec.c | ||
| flvenc.c | ||
| format.c | ||
| framecrcenc.c | ||
| framehash.c | ||
| frmdec.c | ||
| fsb.c | ||
| ftp.c | ||
| g722.c | ||
| g723_1.c | ||
| g729dec.c | ||
| genh.c | ||
| gif.c | ||
| gifdec.c | ||
| golomb_tab.c | ||
| gopher.c | ||
| gsmdec.c | ||
| gxf.c | ||
| gxf.h | ||
| gxfenc.c | ||
| h261dec.c | ||
| h263dec.c | ||
| h264dec.c | ||
| hashenc.c | ||
| hdsenc.c | ||
| hevc.c | ||
| hevc.h | ||
| hevcdec.c | ||
| hls.c | ||
| hlsenc.c | ||
| hlsproto.c | ||
| hnm.c | ||
| http.c | ||
| http.h | ||
| httpauth.c | ||
| httpauth.h | ||
| icecast.c | ||
| icodec.c | ||
| icoenc.c | ||
| id3v1.c | ||
| id3v1.h | ||
| id3v2.c | ||
| id3v2.h | ||
| id3v2enc.c | ||
| idcin.c | ||
| idroqdec.c | ||
| idroqenc.c | ||
| iff.c | ||
| ilbc.c | ||
| img2_alias_pix.c | ||
| img2_brender_pix.c | ||
| img2.c | ||
| img2.h | ||
| img2dec.c | ||
| img2enc.c | ||
| ingenientdec.c | ||
| internal.h | ||
| ipmovie.c | ||
| ircam.c | ||
| ircam.h | ||
| ircamdec.c | ||
| ircamenc.c | ||
| isom.c | ||
| isom.h | ||
| iss.c | ||
| iv8.c | ||
| ivfdec.c | ||
| ivfenc.c | ||
| jacosubdec.c | ||
| jacosubenc.c | ||
| jvdec.c | ||
| latmenc.c | ||
| libavformat.v | ||
| libgme.c | ||
| libmodplug.c | ||
| libnut.c | ||
| libopenmpt.c | ||
| librtmp.c | ||
| libsmbclient.c | ||
| libssh.c | ||
| lmlm4.c | ||
| loasdec.c | ||
| log2_tab.c | ||
| lrc.c | ||
| lrc.h | ||
| lrcdec.c | ||
| lrcenc.c | ||
| lvfdec.c | ||
| lxfdec.c | ||
| m4vdec.c | ||
| Makefile | ||
| matroska.c | ||
| matroska.h | ||
| matroskadec.c | ||
| matroskaenc.c | ||
| md5proto.c | ||
| metadata.c | ||
| metadata.h | ||
| mgsts.c | ||
| microdvddec.c | ||
| microdvdenc.c | ||
| mkvtimestamp_v2.c | ||
| mlpdec.c | ||
| mlvdec.c | ||
| mm.c | ||
| mmf.c | ||
| mms.c | ||
| mms.h | ||
| mmsh.c | ||
| mmst.c | ||
| mov_chan.c | ||
| mov_chan.h | ||
| mov.c | ||
| movenc.c | ||
| movenc.h | ||
| movenccenc.c | ||
| movenccenc.h | ||
| movenchint.c | ||
| mp3dec.c | ||
| mp3enc.c | ||
| mpc8.c | ||
| mpc.c | ||
| mpeg.c | ||
| mpeg.h | ||
| mpegenc.c | ||
| mpegts.c | ||
| mpegts.h | ||
| mpegtsenc.c | ||
| mpegvideodec.c | ||
| mpjpeg.c | ||
| mpjpegdec.c | ||
| mpl2dec.c | ||
| mpsubdec.c | ||
| msf.c | ||
| msnwc_tcp.c | ||
| mtaf.c | ||
| mtv.c | ||
| musx.c | ||
| mux.c | ||
| mvdec.c | ||
| mvi.c | ||
| mxf.c | ||
| mxf.h | ||
| mxfdec.c | ||
| mxfenc.c | ||
| mxg.c | ||
| ncdec.c | ||
| network.c | ||
| network.h | ||
| nistspheredec.c | ||
| nsvdec.c | ||
| nullenc.c | ||
| nut.c | ||
| nut.h | ||
| nutdec.c | ||
| nutenc.c | ||
| nuv.c | ||
| oggdec.c | ||
| oggdec.h | ||
| oggenc.c | ||
| oggparsecelt.c | ||
| oggparsedaala.c | ||
| oggparsedirac.c | ||
| oggparseflac.c | ||
| oggparseogm.c | ||
| oggparseopus.c | ||
| oggparseskeleton.c | ||
| oggparsespeex.c | ||
| oggparsetheora.c | ||
| oggparsevorbis.c | ||
| oggparsevp8.c | ||
| oma.c | ||
| oma.h | ||
| omadec.c | ||
| omaenc.c | ||
| options_table.h | ||
| options.c | ||
| os_support.c | ||
| os_support.h | ||
| paf.c | ||
| pcm.c | ||
| pcm.h | ||
| pcmdec.c | ||
| pcmenc.c | ||
| pjsdec.c | ||
| pmpdec.c | ||
| protocols.c | ||
| psxstr.c | ||
| pva.c | ||
| pvfdec.c | ||
| qcp.c | ||
| qtpalette.c | ||
| qtpalette.h | ||
| r3d.c | ||
| rawdec.c | ||
| rawdec.h | ||
| rawenc.c | ||
| rawenc.h | ||
| rawutils.c | ||
| rawvideodec.c | ||
| rdt.c | ||
| rdt.h | ||
| realtextdec.c | ||
| redspark.c | ||
| replaygain.c | ||
| replaygain.h | ||
| riff.c | ||
| riff.h | ||
| riffdec.c | ||
| riffenc.c | ||
| rl2.c | ||
| rm.c | ||
| rm.h | ||
| rmdec.c | ||
| rmenc.c | ||
| rmsipr.c | ||
| rmsipr.h | ||
| rpl.c | ||
| rsd.c | ||
| rso.c | ||
| rso.h | ||
| rsodec.c | ||
| rsoenc.c | ||
| rtmp.h | ||
| rtmpcrypt.c | ||
| rtmpcrypt.h | ||
| rtmpdh.c | ||
| rtmpdh.h | ||
| rtmphttp.c | ||
| rtmppkt.c | ||
| rtmppkt.h | ||
| rtmpproto.c | ||
| rtp.c | ||
| rtp.h | ||
| rtpdec_ac3.c | ||
| rtpdec_amr.c | ||
| rtpdec_asf.c | ||
| rtpdec_dv.c | ||
| rtpdec_formats.h | ||
| rtpdec_g726.c | ||
| rtpdec_h261.c | ||
| rtpdec_h263_rfc2190.c | ||
| rtpdec_h263.c | ||
| rtpdec_h264.c | ||
| rtpdec_hevc.c | ||
| rtpdec_ilbc.c | ||
| rtpdec_jpeg.c | ||
| rtpdec_latm.c | ||
| rtpdec_mpa_robust.c | ||
| rtpdec_mpeg4.c | ||
| rtpdec_mpeg12.c | ||
| rtpdec_mpegts.c | ||
| rtpdec_qcelp.c | ||
| rtpdec_qdm2.c | ||
| rtpdec_qt.c | ||
| rtpdec_svq3.c | ||
| rtpdec_vc2hq.c | ||
| rtpdec_vp8.c | ||
| rtpdec_vp9.c | ||
| rtpdec_xiph.c | ||
| rtpdec.c | ||
| rtpdec.h | ||
| rtpenc_aac.c | ||
| rtpenc_amr.c | ||
| rtpenc_chain.c | ||
| rtpenc_chain.h | ||
| rtpenc_h261.c | ||
| rtpenc_h263_rfc2190.c | ||
| rtpenc_h263.c | ||
| rtpenc_h264_hevc.c | ||
| rtpenc_jpeg.c | ||
| rtpenc_latm.c | ||
| rtpenc_mpegts.c | ||
| rtpenc_mpv.c | ||
| rtpenc_vc2hq.c | ||
| rtpenc_vp8.c | ||
| rtpenc_vp9.c | ||
| rtpenc_xiph.c | ||
| rtpenc.c | ||
| rtpenc.h | ||
| rtpproto.c | ||
| rtpproto.h | ||
| rtsp.c | ||
| rtsp.h | ||
| rtspcodes.h | ||
| rtspdec.c | ||
| rtspenc.c | ||
| samidec.c | ||
| sapdec.c | ||
| sapenc.c | ||
| sauce.c | ||
| sauce.h | ||
| sbgdec.c | ||
| sctp.c | ||
| sdp.c | ||
| sdr2.c | ||
| segafilm.c | ||
| segment.c | ||
| shortendec.c | ||
| sierravmd.c | ||
| siff.c | ||
| smacker.c | ||
| smjpeg.c | ||
| smjpeg.h | ||
| smjpegdec.c | ||
| smjpegenc.c | ||
| smoothstreamingenc.c | ||
| smush.c | ||
| sol.c | ||
| sox.h | ||
| soxdec.c | ||
| soxenc.c | ||
| spdif.c | ||
| spdif.h | ||
| spdifdec.c | ||
| spdifenc.c | ||
| srtdec.c | ||
| srtenc.c | ||
| srtp.c | ||
| srtp.h | ||
| srtpproto.c | ||
| stldec.c | ||
| subfile.c | ||
| subtitles.c | ||
| subtitles.h | ||
| subviewer1dec.c | ||
| subviewerdec.c | ||
| supdec.c | ||
| svag.c | ||
| swf.c | ||
| swf.h | ||
| swfdec.c | ||
| swfenc.c | ||
| takdec.c | ||
| tcp.c | ||
| tedcaptionsdec.c | ||
| tee.c | ||
| teeproto.c | ||
| thp.c | ||
| tiertexseq.c | ||
| tls_gnutls.c | ||
| tls_openssl.c | ||
| tls_schannel.c | ||
| tls_securetransport.c | ||
| tls.c | ||
| tls.h | ||
| tmv.c | ||
| tta.c | ||
| tty.c | ||
| txd.c | ||
| udp.c | ||
| uncodedframecrcenc.c | ||
| unix.c | ||
| url.c | ||
| url.h | ||
| urldecode.c | ||
| urldecode.h | ||
| utils.c | ||
| v210.c | ||
| vag.c | ||
| vc1dec.c | ||
| vc1test.c | ||
| vc1testenc.c | ||
| version.h | ||
| vivo.c | ||
| voc_packet.c | ||
| voc.c | ||
| voc.h | ||
| vocdec.c | ||
| vocenc.c | ||
| vorbiscomment.c | ||
| vorbiscomment.h | ||
| vpcc.c | ||
| vpcc.h | ||
| vpk.c | ||
| vplayerdec.c | ||
| vqf.c | ||
| w64.c | ||
| w64.h | ||
| wavdec.c | ||
| wavenc.c | ||
| wc3movie.c | ||
| webm_chunk.c | ||
| webmdashenc.c | ||
| webpenc.c | ||
| webvttdec.c | ||
| webvttenc.c | ||
| westwood_aud.c | ||
| westwood_vqa.c | ||
| wsddec.c | ||
| wtv_common.c | ||
| wtv.h | ||
| wtvdec.c | ||
| wtvenc.c | ||
| wv.c | ||
| wv.h | ||
| wvdec.c | ||
| wvedec.c | ||
| wvenc.c | ||
| xa.c | ||
| xmv.c | ||
| xvag.c | ||
| xwma.c | ||
| yop.c | ||
| yuv4mpeg.h | ||
| yuv4mpegdec.c | ||
| yuv4mpegenc.c | ||