History

lavc: add lavfi metadata support.

This commit introduces a new AVPacket side data type: AV_PKT_DATA_STRINGS_METADATA. Its main goal is to provide a way to transmit the metadata from the AVFilterBufferRef up to the AVFrame. This is at the moment "only" useful for lavfi input from libavdevice: lavd/lavfi only outputs packets, and the metadata from the buffer ref kept in its context needs to be transmitted from the packet to the frame by the decoders. The buffer ref can be destroyed at any time (along with the metadata), and a duplication of the AVPacket needs to duplicate the metadata as well, so the choice of using the side data to store them was selected. Making sure lavd/lavfi raises the metadata is useful to allow tools like ffprobe to access the filters metadata (it is at the moment the only way); ffprobe will now automatically show the AVFrame metadata in any customizable output format for users. API users will also be able to access the AVFrame->metadata pointer the same way ffprobe does (av_frame_get_metadata). All the changes are done in this single commit to avoid some memory leaks: for instances, the changes in lavfi/avcodec.c are meant to duplicate the metadata from the buffer ref into the AVFrame. Unless we have an internal way of freeing the AVFrame->metadata automatically, it will leak in most of the user apps. To fix this problem, we introduce AVCodecContext->metadata and link avctx->metadata to the current frame->metadata and free it at each decode frame call (and in the codec closing callback for the last one). But doing this also means to update the way the tiff decoder already handles the AVFrame->metadata (it's the only one decoder with frame metadata at the moment), by making sure it is not trying to free a pointer already freed by the lavc internals. The lavfi/avcodec.c buffer ref code is based on an old Thomas Kühnel work, the rest of the code belongs to the commit author.

Clément Bœsch committed 14 years ago

Commit 6fb2fd81 parent d7b8a9a10 files · +90 −7Browse files

Showing the changes to doc/APIchanges (1 of 10 files). Show all

Unified · Split

doc/APIchanges+7−0
@@ -15,6 +15,13 @@ libavutil: 2011-04-18 · 14 unmodified lines
15 15
16API changes, most recent first:16API changes, most recent first:
17 17
182012-10-21 - xxxxxxx - lavc 54.68.100 - avcodec.h
19 lavfi 3.20.100 - avfilter.h
20 Add AV_PKT_DATA_STRINGS_METADATA side data type, used to transmit key/value
21 strings between AVPacket and AVFrame, and add metadata field to
22 AVCodecContext (which shall not be accessed by users; see AVFrame metadata
23 instead).
24
182012-09-27 - a70b493 - lavd 54.3.100 - version.h252012-09-27 - a70b493 - lavd 54.3.100 - version.h
19 Add LIBAVDEVICE_IDENT symbol.26 Add LIBAVDEVICE_IDENT symbol.
20 27

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t