8c2045c979
This fixes issues with AVFrame w/h being wrong in some cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
101 lines
3.6 KiB
C
101 lines
3.6 KiB
C
/*
|
|
* 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"
|
|
|
|
int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src)
|
|
{
|
|
dst->pts = src->pts;
|
|
dst->pos = src->pkt_pos;
|
|
dst->format = src->format;
|
|
|
|
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;
|
|
}
|
|
|
|
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;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *samplesref)
|
|
{
|
|
if (!samplesref || !samplesref->audio || !frame)
|
|
return AVERROR(EINVAL);
|
|
|
|
memcpy(frame->data, samplesref->data, sizeof(frame->data));
|
|
frame->pkt_pos = samplesref->pos;
|
|
frame->format = samplesref->format;
|
|
frame->nb_samples = samplesref->audio->nb_samples;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *picref)
|
|
{
|
|
if (!picref || !picref->video || !frame)
|
|
return AVERROR(EINVAL);
|
|
|
|
memcpy(frame->data, picref->data, sizeof(frame->data));
|
|
memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize));
|
|
frame->pkt_pos = picref->pos;
|
|
frame->interlaced_frame = picref->video->interlaced;
|
|
frame->top_field_first = picref->video->top_field_first;
|
|
frame->key_frame = picref->video->key_frame;
|
|
frame->pict_type = picref->video->pict_type;
|
|
frame->sample_aspect_ratio = picref->video->sample_aspect_ratio;
|
|
frame->width = picref->video->w;
|
|
frame->height = picref->video->h;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
|
|
const AVFilterBufferRef *ref)
|
|
{
|
|
if (!ref)
|
|
return AVERROR(EINVAL);
|
|
return ref->video ? avfilter_fill_frame_from_video_buffer_ref(frame, ref)
|
|
: avfilter_fill_frame_from_audio_buffer_ref(frame, ref);
|
|
}
|