diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 19:54:26 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 19:57:04 +0300 |
commit | 5b0d4c247a3c3ba8a8ece70b31354121645c8320 (patch) | |
tree | 9fe83a0d04bff7be533c99a6774c3ecfd529e50c /libavcodec/ffv1enc.c | |
parent | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (diff) | |
parent | 96c373c7704aeb1cc1d2c275fbb5d71777665589 (diff) |
Merge commit '96c373c7704aeb1cc1d2c275fbb5d71777665589'
* commit '96c373c7704aeb1cc1d2c275fbb5d71777665589':
lavc: Move context_model to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/ffv1enc.c')
-rw-r--r-- | libavcodec/ffv1enc.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 4de29345ec..9ee992144b 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -373,7 +373,7 @@ static int encode_plane(FFV1Context *s, uint8_t *src, int w, int h, int stride, int plane_index, int pixel_stride) { int x, y, i, ret; - const int ring_size = s->avctx->context_model ? 3 : 2; + const int ring_size = s->context_model ? 3 : 2; int16_t *sample[3]; s->run_index = 0; @@ -413,7 +413,7 @@ static int encode_rgb_frame(FFV1Context *s, const uint8_t *src[3], int w, int h, const int stride[3]) { int x, y, p, i; - const int ring_size = s->avctx->context_model ? 3 : 2; + const int ring_size = s->context_model ? 3 : 2; int16_t *sample[4][3]; int lbd = s->bits_per_raw_sample <= 8; int bits = s->bits_per_raw_sample > 0 ? s->bits_per_raw_sample : 8; @@ -535,7 +535,7 @@ static void write_header(FFV1Context *f) 0); for (j = 0; j < f->plane_count; j++) { put_symbol(c, state, f->plane[j].quant_table_index, 0); - av_assert0(f->plane[j].quant_table_index == f->avctx->context_model); + av_assert0(f->plane[j].quant_table_index == f->context_model); } } } @@ -821,10 +821,16 @@ FF_ENABLE_DEPRECATION_WARNINGS if (s->transparency) { av_log(avctx, AV_LOG_WARNING, "Storing alpha plane, this will require a recent FFV1 decoder to playback!\n"); } +#if FF_API_PRIVATE_OPT +FF_DISABLE_DEPRECATION_WARNINGS + if (avctx->context_model) + s->context_model = avctx->context_model; if (avctx->context_model > 1U) { av_log(avctx, AV_LOG_ERROR, "Invalid context model %d, valid values are 0 and 1\n", avctx->context_model); return AVERROR(EINVAL); } +FF_ENABLE_DEPRECATION_WARNINGS +#endif if (s->ac == AC_RANGE_CUSTOM_TAB) { for (i = 1; i < 256; i++) @@ -860,14 +866,14 @@ FF_ENABLE_DEPRECATION_WARNINGS } s->context_count[0] = (11 * 11 * 11 + 1) / 2; s->context_count[1] = (11 * 11 * 5 * 5 * 5 + 1) / 2; - memcpy(s->quant_table, s->quant_tables[avctx->context_model], + memcpy(s->quant_table, s->quant_tables[s->context_model], sizeof(s->quant_table)); for (i = 0; i < s->plane_count; i++) { PlaneContext *const p = &s->plane[i]; memcpy(p->quant_table, s->quant_table, sizeof(p->quant_table)); - p->quant_table_index = avctx->context_model; + p->quant_table_index = s->context_model; p->context_count = s->context_count[p->quant_table_index]; } @@ -1034,7 +1040,7 @@ static void encode_slice_header(FFV1Context *f, FFV1Context *fs) put_symbol(c, state, (fs->slice_height+1)*f->num_v_slices / f->height-1, 0); for (j=0; j<f->plane_count; j++) { put_symbol(c, state, f->plane[j].quant_table_index, 0); - av_assert0(f->plane[j].quant_table_index == f->avctx->context_model); + av_assert0(f->plane[j].quant_table_index == f->context_model); } if (!f->picture.f->interlaced_frame) put_symbol(c, state, 3, 0); @@ -1381,6 +1387,8 @@ static const AVOption options[] = { { .i64 = AC_RANGE_CUSTOM_TAB }, INT_MIN, INT_MAX, VE, "coder" }, { "ac", "Range with custom table (the ac option exists for compatibility and is deprecated)", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "coder" }, + { "context", "Context model", OFFSET(context_model), AV_OPT_TYPE_INT, + { .i64 = 0 }, 0, 1, VE }, { NULL } }; |