| Commit message (Collapse) | Author | Age |
|---|
| | |
|
| |
|
|
|
|
| |
The same information is available from AVStream.codecpar. This will
allow to stop allocating an encoder unless encoding is actually
performed.
|
| | |
|
| |
|
|
|
| |
Return an error instead, as is already done in other places in this
function.
|
| |
|
|
|
| |
Do not call exit_program(), as that would conflict with moving this code
into a separate thread.
|
| |
|
|
|
| |
Do not call exit_program(), as that would conflict with moving this code
into a separate thread.
|
| |
|
|
|
| |
Do not call exit_program(), as that would conflict with moving this code
into a separate thread.
|
| |
|
|
|
| |
Since the muxer will operate in a separate thread in the future, the
muxer context should not be accessed from the outside.
|
| |
|
|
|
|
|
| |
It is unused otherwise.
Rename the field to vsync_frame_number to better reflect its current
purpose.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Same issues apply to it as to -shortest.
Changes the results of the following tests:
- matroska-flac-extradata-update
The test reencodes two input FLAC streams into three output FLAC
streams. The last output stream is limited to 8 frames. The current
code results in the first two output streams having 12 frames, after
this commit all three streams have 8 frames and are the same length.
This new result is better, since it is predictable.
- mkv-1242
The test streamcopies one video and one audio stream, video is limited
to 11 frames. The new result shortens the audio stream so that it is
not longer than the video.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The -shortest option (which finishes the output file at the time the
shortest stream ends) is currently implemented by faking the -t option
when an output stream ends. This approach is fragile, since it depends
on the frames/packets being processed in a specific order. E.g. there
are currently some situations in which the output file length will
depend unpredictably on unrelated factors like encoder delay. More
importantly, the present work aiming at splitting various ffmpeg
components into different threads will make this approach completely
unworkable, since the frames/packets will arrive in effectively random
order.
This commit introduces a "sync queue", which is essentially a collection
of FIFOs, one per stream. Frames/packets are submitted to these FIFOs
and are then released for further processing (encoding or muxing) when
it is ensured that the frame in question will not cause its stream to
get ahead of the other streams (the logic is similar to libavformat's
interleaving queue).
These sync queues are then used for encoding and/or muxing when the
-shortest option is specified.
A new option – -shortest_buf_duration – controls the maximum number of
queued packets, to avoid runaway memory usage.
This commit changes the results of the following tests:
- copy-shortest[12]: the last audio frame is now gone. This is
correct, since it actually outlasts the last video frame.
- shortest-sub: the video packets following the last subtitle packet are
now gone. This is also correct.
|
| |
|
|
|
|
|
|
|
|
| |
The following commits will add a new buffering stage after bitstream
filters, which should not be taken into account for choosing next
output.
OutputStream.last_mux_dts is also used by the muxing code to make up
missing DTS values - that field is now moved to the muxer-private
MuxStream object.
|
| |
|
|
| |
It is private to the muxer, no reason to access it from outside.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It is currently called from two places:
- output_packet() in ffmpeg.c, which submits the newly available output
packet to the muxer
- from of_check_init() in ffmpeg_mux.c after the header has been
written, to flush the muxing queue
Some packets will thus be processed by this function twice, so it
requires an extra parameter to indicate the place it is called from and
avoid modifying some state twice.
This is fragile and hard to follow, so split this function into two.
Also rename of_write_packet() to of_submit_packet() to better reflect
its new purpose.
|
| | |
|
| |
|
|
|
|
|
|
|
| |
The muxing queue currently lives in OutputStream, which is a very large
struct storing the state for both encoding and muxing. The muxing queue
is only used by the code in ffmpeg_mux, so it makes sense to restrict it
to that file.
This makes the first step towards reducing the scope of OutputStream.
|
| |
|
|
|
| |
Avoid accessing the muxer context directly, as this will become
forbidden in future commits.
|
| |
|
|
|
|
| |
The current code postpones closing the files until after printing the
final report, which accesses the output file size. Deal with this by
storing the final file size before closing the file.
|
| |
|
|
|
|
| |
the muxer
There is no reason to delay this.
|
| |
|
|
| |
Allows making the variable local to ffmpeg_mux.
|
| |
|
|
|
|
| |
Move the file size checking code to ffmpeg_mux. Use the recently
introduced of_filesize(), making this code consistent with the size
shown by print_report().
|
| |
|
|
| |
Stop accessing muxer internals from outside of ffmpeg_mux.
|
| |
|
|
|
|
|
|
| |
Move header_written into it, which is not (and should not be) used by
any code outside of ffmpeg_mux.
In the future this context will contain more muxer-private state that
should not be visible to other code.
|
| |
|
|
|
|
|
| |
fps_mode sets video sync per output stream. Overrides vsync for matching
streams.
vsync is deprecated.
|
| |
|
|
|
|
|
|
|
|
| |
This is a more appropriate place for this code, since the values we read
from AV_PKT_DATA_QUALITY_STATS side data are primarily written into
video stats. This ensures that the values written into stats actually
apply to the right packet.
Rename the function to update_video_stats() to better reflect its new
purpose.
|
| | |
|
| | |
|
|
|
This is a first step towards making muxers more independent from the
rest of the code.
|
