diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-04-30 22:35:30 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-05-02 01:20:45 +0100 |
| commit | 300ef253141fbebf9b201de676db1bb9e4298c40 (patch) | |
| tree | 75f19522392d5b467a2973a2cd587000ecb0eee8 /libavcodec/cbs_mpeg2_syntax_template.c | |
| parent | 315cc8c0988da6e117e4466581bde5480c3abe2a (diff) | |
cbs: Add support for array subscripts in trace output
This makes the trace output for arrays significantly nicer.
Diffstat (limited to 'libavcodec/cbs_mpeg2_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_mpeg2_syntax_template.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/libavcodec/cbs_mpeg2_syntax_template.c b/libavcodec/cbs_mpeg2_syntax_template.c index 51c32cb58d..8b5d35437e 100644 --- a/libavcodec/cbs_mpeg2_syntax_template.c +++ b/libavcodec/cbs_mpeg2_syntax_template.c @@ -44,13 +44,13 @@ static int FUNC(sequence_header)(CodedBitstreamContext *ctx, RWContext *rw, ui(1, load_intra_quantiser_matrix); if (current->load_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, intra_quantiser_matrix[i]); + uis(8, intra_quantiser_matrix[i], 1, i); } ui(1, load_non_intra_quantiser_matrix); if (current->load_non_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, non_intra_quantiser_matrix[i]); + uis(8, non_intra_quantiser_matrix[i], 1, i); } return 0; @@ -79,7 +79,7 @@ static int FUNC(user_data)(CodedBitstreamContext *ctx, RWContext *rw, #endif for (k = 0; k < current->user_data_length; k++) - xui(8, user_data, current->user_data[k]); + xui(8, user_data, current->user_data[k], 0); return 0; } @@ -250,25 +250,25 @@ static int FUNC(quant_matrix_extension)(CodedBitstreamContext *ctx, RWContext *r ui(1, load_intra_quantiser_matrix); if (current->load_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, intra_quantiser_matrix[i]); + uis(8, intra_quantiser_matrix[i], 1, i); } ui(1, load_non_intra_quantiser_matrix); if (current->load_non_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, non_intra_quantiser_matrix[i]); + uis(8, non_intra_quantiser_matrix[i], 1, i); } ui(1, load_chroma_intra_quantiser_matrix); if (current->load_chroma_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, intra_quantiser_matrix[i]); + uis(8, intra_quantiser_matrix[i], 1, i); } ui(1, load_chroma_non_intra_quantiser_matrix); if (current->load_chroma_non_intra_quantiser_matrix) { for (i = 0; i < 64; i++) - ui(8, chroma_non_intra_quantiser_matrix[i]); + uis(8, chroma_non_intra_quantiser_matrix[i], 1, i); } return 0; @@ -366,15 +366,16 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw, if (!current->extra_information) return AVERROR(ENOMEM); for (k = 0; k < current->extra_information_length; k++) { - xui(1, extra_bit_slice, bit); - xui(8, extra_information_slice, - current->extra_information[k]); + xui(1, extra_bit_slice, bit, 0); + xui(8, extra_information_slice[k], + current->extra_information[k], 1, k); } } #else for (k = 0; k < current->extra_information_length; k++) { - xui(1, extra_bit_slice, 1); - xui(8, extra_information_slice, current->extra_information[k]); + xui(1, extra_bit_slice, 1, 0); + xui(8, extra_information_slice[k], + current->extra_information[k], 1, k); } #endif } |