mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
6fb2fd895e
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. Signed-off-by: Thomas Kühnel <kuehnelth@googlemail.com> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
181 lines
6.4 KiB
C
181 lines
6.4 KiB
C
/*
|
|
* Copyright 2011 Stefano Sabatini | stefasab at gmail.com
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/**
|
|
* @file
|
|
* libavcodec/libavfilter gluing utilities
|
|
*/
|
|
|
|
#include "avcodec.h"
|
|
#include "libavutil/avassert.h"
|
|
#include "libavutil/opt.h"
|
|
|
|
int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
|
|
{
|
|
dst->pts = src->pts;
|
|
dst->pos = av_frame_get_pkt_pos(src);
|
|
dst->format = src->format;
|
|
|
|
av_dict_free(&dst->metadata);
|
|
av_dict_copy(&dst->metadata, av_frame_get_metadata(src), 0);
|
|
|
|
switch (dst->type) {
|
|
case AVMEDIA_TYPE_VIDEO:
|
|
dst->video->w = src->width;
|
|
dst->video->h = src->height;
|
|
dst->video->sample_aspect_ratio = src->sample_aspect_ratio;
|
|
dst->video->interlaced = src->interlaced_frame;
|
|
dst->video->top_field_first = src->top_field_first;
|
|
dst->video->key_frame = src->key_frame;
|
|
dst->video->pict_type = src->pict_type;
|
|
av_freep(&dst->video->qp_table);
|
|
dst->video->qp_table_linesize = 0;
|
|
if (src->qscale_table) {
|
|
int qsize = src->qstride ? src->qstride * ((src->height+15)/16) : (src->width+15)/16;
|
|
dst->video->qp_table = av_malloc(qsize);
|
|
if (!dst->video->qp_table)
|
|
return AVERROR(ENOMEM);
|
|
dst->video->qp_table_linesize = src->qstride;
|
|
dst->video->qp_table_size = qsize;
|
|
memcpy(dst->video->qp_table, src->qscale_table, qsize);
|
|
}
|
|
break;
|
|
case AVMEDIA_TYPE_AUDIO:
|
|
dst->audio->sample_rate = src->sample_rate;
|
|
dst->audio->channel_layout = src->channel_layout;
|
|
break;
|
|
default:
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
AVFilterBufferRef *picref =
|
|
avfilter_get_video_buffer_ref_from_arrays(frame->data, frame->linesize, perms,
|
|
frame->width, frame->height,
|
|
frame->format);
|
|
if (!picref)
|
|
return NULL;
|
|
avfilter_copy_frame_props(picref, frame);
|
|
return picref;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
AVFilterBufferRef *samplesref =
|
|
avfilter_get_audio_buffer_ref_from_arrays((uint8_t **)frame->data, frame->linesize[0], perms,
|
|
frame->nb_samples, frame->format,
|
|
av_frame_get_channel_layout(frame));
|
|
if (!samplesref)
|
|
return NULL;
|
|
avfilter_copy_frame_props(samplesref, frame);
|
|
return samplesref;
|
|
}
|
|
|
|
AVFilterBufferRef *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
|
|
const AVFrame *frame,
|
|
int perms)
|
|
{
|
|
switch (type) {
|
|
case AVMEDIA_TYPE_VIDEO:
|
|
return avfilter_get_video_buffer_ref_from_frame(frame, perms);
|
|
case AVMEDIA_TYPE_AUDIO:
|
|
return avfilter_get_audio_buffer_ref_from_frame(frame, perms);
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
|
|
{
|
|
int planes, nb_channels;
|
|
|
|
if (!dst)
|
|
return AVERROR(EINVAL);
|
|
/* abort in case the src is NULL and dst is not, avoid inconsistent state in dst */
|
|
av_assert0(src);
|
|
|
|
memcpy(dst->data, src->data, sizeof(dst->data));
|
|
memcpy(dst->linesize, src->linesize, sizeof(dst->linesize));
|
|
|
|
dst->pts = src->pts;
|
|
dst->format = src->format;
|
|
av_frame_set_pkt_pos(dst, src->pos);
|
|
|
|
switch (src->type) {
|
|
case AVMEDIA_TYPE_VIDEO:
|
|
av_assert0(src->video);
|
|
dst->width = src->video->w;
|
|
dst->height = src->video->h;
|
|
dst->sample_aspect_ratio = src->video->sample_aspect_ratio;
|
|
dst->interlaced_frame = src->video->interlaced;
|
|
dst->top_field_first = src->video->top_field_first;
|
|
dst->key_frame = src->video->key_frame;
|
|
dst->pict_type = src->video->pict_type;
|
|
break;
|
|
case AVMEDIA_TYPE_AUDIO:
|
|
av_assert0(src->audio);
|
|
nb_channels = av_get_channel_layout_nb_channels(src->audio->channel_layout);
|
|
planes = av_sample_fmt_is_planar(src->format) ? nb_channels : 1;
|
|
|
|
if (planes > FF_ARRAY_ELEMS(dst->data)) {
|
|
dst->extended_data = av_mallocz(planes * sizeof(*dst->extended_data));
|
|
if (!dst->extended_data)
|
|
return AVERROR(ENOMEM);
|
|
memcpy(dst->extended_data, src->extended_data,
|
|
planes * sizeof(*dst->extended_data));
|
|
} else
|
|
dst->extended_data = dst->data;
|
|
dst->nb_samples = src->audio->nb_samples;
|
|
av_frame_set_sample_rate (dst, src->audio->sample_rate);
|
|
av_frame_set_channel_layout(dst, src->audio->channel_layout);
|
|
break;
|
|
default:
|
|
return AVERROR(EINVAL);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef FF_API_FILL_FRAME
|
|
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *samplesref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, samplesref);
|
|
}
|
|
|
|
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *picref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, picref);
|
|
}
|
|
|
|
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *ref)
|
|
{
|
|
return avfilter_copy_buf_props(frame, ref);
|
|
}
|
|
#endif
|