[FFmpeg-cvslog] avcodec/cfhd: add more tag names
Paul B Mahol
git at videolan.org
Sun Aug 2 10:48:20 EEST 2020
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Sat Aug 1 11:08:34 2020 +0200| [e2b455f933bb9acac6c220fd1595f2b80ddb5b7c] | committer: Paul B Mahol
avcodec/cfhd: add more tag names
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2b455f933bb9acac6c220fd1595f2b80ddb5b7c
---
libavcodec/cfhd.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index d5d36f3d55..00e15f93a1 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -394,7 +394,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
} else if (tag == ImageHeight) {
av_log(avctx, AV_LOG_DEBUG, "Height %"PRIu16"\n", data);
s->coded_height = data;
- } else if (tag == 101) {
+ } else if (tag == BitsPerComponent) {
av_log(avctx, AV_LOG_DEBUG, "Bits per component: %"PRIu16"\n", data);
if (data < 1 || data > 31) {
av_log(avctx, AV_LOG_ERROR, "Bits per component %d is invalid\n", data);
@@ -441,7 +441,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
ret = AVERROR(EINVAL);
break;
}
- } else if (tag == 51) {
+ } else if (tag == SubbandBand) {
av_log(avctx, AV_LOG_DEBUG, "Subband number actual %"PRIu16"\n", data);
s->subband_num_actual = data;
if (s->subband_num_actual >= 10) {
@@ -524,7 +524,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
break;
}
s->plane[s->channel_num].band[s->level][s->subband_num].height = data;
- } else if (tag == 49) {
+ } else if (tag == BandWidth) {
av_log(avctx, AV_LOG_DEBUG, "Highpass width2 %i\n", data);
if (data < 3) {
av_log(avctx, AV_LOG_ERROR, "Invalid highpass width2\n");
@@ -533,7 +533,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
}
s->plane[s->channel_num].band[s->level][s->subband_num].width = data;
s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8);
- } else if (tag == 50) {
+ } else if (tag == BandHeight) {
av_log(avctx, AV_LOG_DEBUG, "Highpass height2 %i\n", data);
if (data < 3) {
av_log(avctx, AV_LOG_ERROR, "Invalid highpass height2\n");
@@ -544,12 +544,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
} else if (tag == 71) {
s->codebook = data;
av_log(avctx, AV_LOG_DEBUG, "Codebook %i\n", s->codebook);
- } else if (tag == 72) {
+ } else if (tag == BandCodingFlags) {
s->codebook = data & 0xf;
s->difference_coding = (data >> 4) & 1;
av_log(avctx, AV_LOG_DEBUG, "Other codebook? %i\n", s->codebook);
- } else if (tag == 70) {
- av_log(avctx, AV_LOG_DEBUG, "Subsampling or bit-depth flag? %i\n", data);
+ } else if (tag == Precision) {
+ av_log(avctx, AV_LOG_DEBUG, "Precision %i\n", data);
if (!(data == 10 || data == 12)) {
av_log(avctx, AV_LOG_ERROR, "Invalid bits per channel\n");
ret = AVERROR(EINVAL);
More information about the ffmpeg-cvslog
mailing list