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

lavc/dv: do not pass DVVideoContext to ff_dv_init_dynamic_tables() 

It only needs work_chunks from it, so pass that directly.

This is done in preparation to splitting DVVideoContext.
This commit is contained in:
Anton Khirnov 2022-08-23 11:09:09 +02:00
parent d1ba5d883e
commit 91c51dac6d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dv.c
View File

@ -162,7 +162,7 @@ static inline void dv_calc_mb_coordinates(const AVDVProfile *d, int chan,
}
}
int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const AVDVProfile *d)
int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d)
{
int j, i, c, s, p;
@ -174,8 +174,8 @@ int ff_dv_init_dynamic_tables(DVVideoContext *ctx, const AVDVProfile *d)
p += !(j % 3);
if (!(DV_PROFILE_IS_1080i50(d) && c != 0 && s == 11) &&
!(DV_PROFILE_IS_720p50(d) && s > 9)) {
dv_calc_mb_coordinates(d, c, s, j, &ctx->work_chunks[i].mb_coordinates[0]);
ctx->work_chunks[i++].buf_offset = p;
dv_calc_mb_coordinates(d, c, s, j, &work_chunks[i].mb_coordinates[0]);
work_chunks[i++].buf_offset = p;
}
p += 5;
}

2
libavcodec/dv.h
View File

@ -95,7 +95,7 @@ enum dv_pack_type {
*/
#define DV_MAX_BPM 8
int ff_dv_init_dynamic_tables(DVVideoContext *s, const AVDVProfile *d);
int ff_dv_init_dynamic_tables(DVwork_chunk *work_chunks, const AVDVProfile *d);
static inline int dv_work_pool_size(const AVDVProfile *d)
{

2
libavcodec/dvdec.c
View File

@ -624,7 +624,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame,
}
if (sys != s->sys) {
ret = ff_dv_init_dynamic_tables(s, sys);
ret = ff_dv_init_dynamic_tables(s->work_chunks, sys);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error initializing the work tables.\n");
return ret;

2
libavcodec/dvenc.c
View File

@ -74,7 +74,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx)
return AVERROR(EINVAL);
}
ret = ff_dv_init_dynamic_tables(s, s->sys);
ret = ff_dv_init_dynamic_tables(s->work_chunks, s->sys);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Error initializing work tables.\n");
return ret;