RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavfi/avcodec: make avfilter_fill_frame_from*() functions use avfilter_copy_buf_props() 

The code in avfilter_copy_buf_props() is more generic, allow code
factorization.
This commit is contained in:
Stefano Sabatini 2012-06-10 18:08:12 +02:00
parent 8f8d8b9538
commit db142a8395
1 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libavfilter/avcodec.c
View File

@ -134,48 +134,17 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src)
int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame, int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
const AVFilterBufferRef *samplesref) const AVFilterBufferRef *samplesref)
{ {
if (!samplesref || !samplesref->audio || !frame) return avfilter_copy_buf_props(frame, samplesref);
return AVERROR(EINVAL);
memcpy(frame->data, samplesref->data, sizeof(frame->data));
memcpy(frame->linesize, samplesref->linesize, sizeof(frame->linesize));
av_frame_set_pkt_pos(frame, samplesref->pos);
frame->format = samplesref->format;
frame->nb_samples = samplesref->audio->nb_samples;
frame->pts = samplesref->pts;
frame->sample_rate = samplesref->audio->sample_rate;
frame->channel_layout = samplesref->audio->channel_layout;
return 0;
} }
int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame, int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
const AVFilterBufferRef *picref) const AVFilterBufferRef *picref)
{ {
if (!picref || !picref->video || !frame) return avfilter_copy_buf_props(frame, picref);
return AVERROR(EINVAL);
memcpy(frame->data, picref->data, sizeof(frame->data));
memcpy(frame->linesize, picref->linesize, sizeof(frame->linesize));
av_frame_set_pkt_pos(frame, 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;
frame->format = picref->format;
frame->pts = picref->pts;
return 0;
} }
int avfilter_fill_frame_from_buffer_ref(AVFrame *frame, int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
const AVFilterBufferRef *ref) const AVFilterBufferRef *ref)
{ {
if (!ref) return avfilter_copy_buf_props(frame, 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);
} }