libschroedinger: cosmetics: rename variable avccontext to avctx
This is consistent with the rest of libavcodec.
This commit is contained in:
parent
09031b4639
commit
699d02b839
4 changed files with 92 additions and 96 deletions
|
@ -46,7 +46,7 @@ static const SchroVideoFormatInfo ff_schro_video_format_info[] = {
|
|||
{ 4096, 2160, 24, 1 },
|
||||
};
|
||||
|
||||
static unsigned int get_video_format_idx(AVCodecContext *avccontext)
|
||||
static unsigned int get_video_format_idx(AVCodecContext *avctx)
|
||||
{
|
||||
unsigned int ret_idx = 0;
|
||||
unsigned int idx;
|
||||
|
@ -55,11 +55,11 @@ static unsigned int get_video_format_idx(AVCodecContext *avccontext)
|
|||
|
||||
for (idx = 1; idx < num_formats; ++idx) {
|
||||
const SchroVideoFormatInfo *vf = &ff_schro_video_format_info[idx];
|
||||
if (avccontext->width == vf->width &&
|
||||
avccontext->height == vf->height) {
|
||||
if (avctx->width == vf->width &&
|
||||
avctx->height == vf->height) {
|
||||
ret_idx = idx;
|
||||
if (avccontext->time_base.den == vf->frame_rate_num &&
|
||||
avccontext->time_base.num == vf->frame_rate_denom)
|
||||
if (avctx->time_base.den == vf->frame_rate_num &&
|
||||
avctx->time_base.num == vf->frame_rate_denom)
|
||||
return idx;
|
||||
}
|
||||
}
|
||||
|
@ -136,12 +136,12 @@ static const SchroVideoFormatEnum ff_schro_video_formats[]={
|
|||
SCHRO_VIDEO_FORMAT_DC4K_24 ,
|
||||
};
|
||||
|
||||
SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avccontext)
|
||||
SchroVideoFormatEnum ff_get_schro_video_format_preset(AVCodecContext *avctx)
|
||||
{
|
||||
unsigned int num_formats = sizeof(ff_schro_video_formats) /
|
||||
sizeof(ff_schro_video_formats[0]);
|
||||
|
||||
unsigned int idx = get_video_format_idx(avccontext);
|
||||
unsigned int idx = get_video_format_idx(avctx);
|
||||
|
||||
return (idx < num_formats) ? ff_schro_video_formats[idx] :
|
||||
SCHRO_VIDEO_FORMAT_CUSTOM;
|
||||
|
@ -175,7 +175,7 @@ static void free_schro_frame(SchroFrame *frame, void *priv)
|
|||
av_freep(&p_pic);
|
||||
}
|
||||
|
||||
SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
|
||||
SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
|
||||
SchroFrameFormat schro_frame_fmt)
|
||||
{
|
||||
AVPicture *p_pic;
|
||||
|
@ -184,13 +184,13 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext,
|
|||
int y_height, uv_height;
|
||||
int i;
|
||||
|
||||
y_width = avccontext->width;
|
||||
y_height = avccontext->height;
|
||||
y_width = avctx->width;
|
||||
y_height = avctx->height;
|
||||
uv_width = y_width >> (SCHRO_FRAME_FORMAT_H_SHIFT(schro_frame_fmt));
|
||||
uv_height = y_height >> (SCHRO_FRAME_FORMAT_V_SHIFT(schro_frame_fmt));
|
||||
|
||||
p_pic = av_mallocz(sizeof(AVPicture));
|
||||
avpicture_alloc(p_pic, avccontext->pix_fmt, y_width, y_height);
|
||||
avpicture_alloc(p_pic, avctx->pix_fmt, y_width, y_height);
|
||||
|
||||
p_frame = schro_frame_new();
|
||||
p_frame->format = schro_frame_fmt;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue