generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: add a sample_aspect_ratio field to AVFrame

Browse Source 
The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.
This commit is contained in:
Stefano Sabatini
2011-04-29 13:04:47 +02:00
parent 1ba5727242
commit 77e9dee8ae
10 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vsrc_buffer.c
View File

@@ -39,7 +39,7 @@ typedef struct {
} BufferSourceContext;
int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
int64_t pts, AVRational pixel_aspect, int width,
int64_t pts, int width,
int height, enum PixelFormat pix_fmt,
const char *sws_param)
{
@@ -104,20 +104,20 @@ int av_vsrc_buffer_add_frame2(AVFilterContext *buffer_filter, AVFrame *frame,
c->frame.top_field_first = frame->top_field_first;
c->frame.key_frame = frame->key_frame;
c->frame.pict_type = frame->pict_type;
c->frame.sample_aspect_ratio = frame->sample_aspect_ratio;
c->pts = pts;
c->pixel_aspect = pixel_aspect;
c->has_frame = 1;
return 0;
}
int av_vsrc_buffer_add_frame(AVFilterContext *buffer_filter, AVFrame *frame,
int64_t pts, AVRational pixel_aspect)
int64_t pts)
{
BufferSourceContext *c = buffer_filter->priv;
return av_vsrc_buffer_add_frame2(buffer_filter, frame,
pts, pixel_aspect, c->w,
pts, c->w,
c->h, c->pix_fmt, "");
}
@@ -190,7 +190,7 @@ static int request_frame(AVFilterLink *link)
picref->format, link->w, link->h);
picref->pts = c->pts;
picref->video->pixel_aspect = c->pixel_aspect;
picref->video->pixel_aspect = c->frame.sample_aspect_ratio;
picref->video->interlaced = c->frame.interlaced_frame;
picref->video->top_field_first = c->frame.top_field_first;
picref->video->key_frame = c->frame.key_frame;