dnxhddec: Introduce DNXHD_VARIABLE

Currently not used, but will be used to indicate that a CIDEntry field is not set, because it is variable, and that checks should be adapted. Signed-off-by: Michael Niedermayer <[email protected]>
zhengxj91 · Oct 5, 2015 · 1f4ff53 · 1f4ff53
1 parent 5225686
commit 1f4ff53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/libavcodec/dnxhddata.h b/libavcodec/dnxhddata.h
@@ -30,6 +30,9 @@
 #define DNXHD_INTERLACED (1<<0)
 #define DNXHD_444 (1<<1)
 
+/** Indicate that a CIDEntry value must be read in the bitstream */
+#define DNXHD_VARIABLE 0
+
 typedef struct CIDEntry {
  int cid;
  unsigned int width, height;

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
@@ -106,7 +106,8 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid)
  av_log(ctx->avctx, AV_LOG_ERROR, "unsupported cid %d\n", cid);
  return AVERROR(ENOSYS);
  }
- if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth) {
+ if (ff_dnxhd_cid_table[index].bit_depth != ctx->bit_depth &&
+ ff_dnxhd_cid_table[index].bit_depth != DNXHD_VARIABLE) {
  av_log(ctx->avctx, AV_LOG_ERROR, "bit depth mismatches %d %d\n", ff_dnxhd_cid_table[index].bit_depth, ctx->bit_depth);
  return AVERROR_INVALIDDATA;
  }
@@ -228,7 +229,8 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
 
  // make sure profile size constraints are respected
  // DNx100 allows 1920->1440 and 1280->960 subsampling
- if (ctx->width != ctx->cid_table->width) {
+ if (ctx->width != ctx->cid_table->width &&
+ ctx->cid_table->width != DNXHD_VARIABLE) {
  av_reduce(&ctx->avctx->sample_aspect_ratio.num,
  &ctx->avctx->sample_aspect_ratio.den,
  ctx->width, ctx->cid_table->width, 255);