diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-06-17 19:07:23 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-07-25 13:57:01 +0200 |
| commit | 1713d15e2f2644a00be257b5e390ef36271ebc91 (patch) | |
| tree | dce09f25ec7e5a666aa0eaf13b8fbefbee14f8ad | |
| parent | ed3c8ff717a393f2cfa83c826eeac29e9b926c4d (diff) | |
cfhd: Refactor duplicate cases in parse_subband_tag()
| -rw-r--r-- | libavcodec/cfhd.c | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index 657f8caf22..9e4a077d32 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -438,11 +438,13 @@ static int parse_subband_tag(AVCodecContext *avctx, CFHDContext *s, int16_t tag, s->plane[s->channel_num].band[0][0].height = data; break; case 41: + case 49: av_log(avctx, AV_LOG_DEBUG, - "Highpass width %"PRIu16" channel %i level %i subband %i\n", - data, s->channel_num, s->level, s->subband_num); + "Highpass width%s %"PRIu16" channel %i level %i subband %i\n", + tag == 49 ? "2" : "", data, + s->channel_num, s->level, s->subband_num); if (data < 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid highpass width\n"); + av_log(avctx, AV_LOG_ERROR, "Invalid highpass width%s\n", tag == 49 ? "2" : ""); return AVERROR_INVALIDDATA; } @@ -450,28 +452,10 @@ static int parse_subband_tag(AVCodecContext *avctx, CFHDContext *s, int16_t tag, s->plane[s->channel_num].band[s->level][s->subband_num].stride = FFALIGN(data, 8); break; case 42: - av_log(avctx, AV_LOG_DEBUG, "Highpass height %"PRIu16"\n", data); - if (data < 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid highpass height\n"); - return AVERROR_INVALIDDATA; - } - - s->plane[s->channel_num].band[s->level][s->subband_num].height = data; - break; - case 49: - av_log(avctx, AV_LOG_DEBUG, "Highpass width2 %"PRIu16"\n", data); - if (data < 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid highpass width2\n"); - return AVERROR_INVALIDDATA; - } - - 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); - break; case 50: - av_log(avctx, AV_LOG_DEBUG, "Highpass height2 %"PRIu16"\n", data); + av_log(avctx, AV_LOG_DEBUG, "Highpass height%s %"PRIu16"\n", tag == 50 ? "2" : "", data); if (data < 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid highpass height2\n"); + av_log(avctx, AV_LOG_ERROR, "Invalid highpass height%s\n", tag == 50 ? "2" : ""); return AVERROR_INVALIDDATA; } |