Skip to content

F
ffmpeg.wasm-core
Commit 932db250 authored by Jason Garrett-Glaser's avatar Jason Garrett-Glaser
Browse files
Options

H.264: fix 4:4:4 cropping warning

parent 85a88f9c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
libavcodec/h264_ps.c
View file @ 932db250
...@@ -396,6 +396,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ ...@@ -396,6 +396,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
#endif #endif
sps->crop= get_bits1(&s->gb); sps->crop= get_bits1(&s->gb);
if(sps->crop){ if(sps->crop){
int crop_limit = sps->chroma_format_idc == 3 ? 16 : 8;
sps->crop_left = get_ue_golomb(&s->gb); sps->crop_left = get_ue_golomb(&s->gb);
sps->crop_right = get_ue_golomb(&s->gb); sps->crop_right = get_ue_golomb(&s->gb);
sps->crop_top = get_ue_golomb(&s->gb); sps->crop_top = get_ue_golomb(&s->gb);
...@@ -403,7 +404,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){ ...@@ -403,7 +404,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
if(sps->crop_left || sps->crop_top){ if(sps->crop_left || sps->crop_top){
av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n"); av_log(h->s.avctx, AV_LOG_ERROR, "insane cropping not completely supported, this could look slightly wrong ...\n");
} }
if(sps->crop_right >= (8<<CHROMA444) || sps->crop_bottom >= (8<<CHROMA444)){ if(sps->crop_right >= crop_limit || sps->crop_bottom >= crop_limit){
av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n"); av_log(h->s.avctx, AV_LOG_ERROR, "brainfart cropping not supported, this could look slightly wrong ...\n");
} }
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment