avcodec/cfhd: read prescale table tag

Currently unused. Remove prescale shift tag as it
is not part of this codec.
pull/345/head^2
Paul B Mahol 4 years ago
parent 3ff7171a85
commit fc3546bece
  1. 9
      libavcodec/cfhd.c
  2. 3
      libavcodec/cfhd.h

@ -517,11 +517,10 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
else if (tag == Quantization) {
s->quantisation = data;
av_log(avctx, AV_LOG_DEBUG, "Quantisation: %"PRIu16"\n", data);
} else if (tag == PrescaleShift) {
s->prescale_shift[0] = (data >> 0) & 0x7;
s->prescale_shift[1] = (data >> 3) & 0x7;
s->prescale_shift[2] = (data >> 6) & 0x7;
av_log(avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %x\n", data);
} else if (tag == PrescaleTable) {
for (i = 0; i < 8; i++)
s->prescale_table[i] = (data >> (14 - i * 2)) & 0x3;
av_log(avctx, AV_LOG_DEBUG, "Prescale table: %x\n", data);
} else if (tag == BandEncoding) {
if (!data || data > 5) {
av_log(avctx, AV_LOG_ERROR, "Invalid band encoding\n");

@ -83,7 +83,6 @@ enum CFHDParam {
EncodedFormat = 84,
ChannelWidth = 104,
ChannelHeight = 105,
PrescaleShift = 109,
};
#define VLC_BITS 9
@ -171,7 +170,7 @@ typedef struct CFHDContext {
int level;
int subband_num_actual;
uint8_t prescale_shift[3];
uint8_t prescale_table[8];
Plane plane[4];
Peak peak;
} CFHDContext;

Loading…
Cancel
Save