dnxhd 36mbit support
Originally committed as revision 10689 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
		
							parent
							
								
									68bc33fa9f
								
							
						
					
					
						commit
						2e85b344f7
					
				@ -281,6 +281,12 @@ const CIDEntry ff_dnxhd_cid_table[] = {
 | 
			
		||||
      dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level,
 | 
			
		||||
      dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag,
 | 
			
		||||
      dnxhd_1238_run_codes, dnxhd_1238_run_bits, dnxhd_1238_run },
 | 
			
		||||
    { 1253, 1920, 1080, 0, 188416, 188416, 4, 8,
 | 
			
		||||
      dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight,
 | 
			
		||||
      dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
 | 
			
		||||
      dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level,
 | 
			
		||||
      dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag,
 | 
			
		||||
      dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run },
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
int ff_dnxhd_get_cid_table(int cid)
 | 
			
		||||
 | 
			
		||||
@ -181,6 +181,8 @@ static int dnxhd_encode_init(AVCodecContext *avctx)
 | 
			
		||||
            ctx->cid = 1237;
 | 
			
		||||
        else if (avctx->bit_rate == 185000000)
 | 
			
		||||
            ctx->cid = 1238;
 | 
			
		||||
        else if (avctx->bit_rate ==  36000000)
 | 
			
		||||
            ctx->cid = 1253;
 | 
			
		||||
    }
 | 
			
		||||
    if (!ctx->cid || avctx->width != 1920 || avctx->height != 1080 || avctx->pix_fmt != PIX_FMT_YUV422P) {
 | 
			
		||||
        av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD\n");
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user