diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-13 21:41:53 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-14 08:23:23 +0200 |
| commit | fef89aae98a0f34c6da1ef88b51d32f21f87df08 (patch) | |
| tree | c6506669ebd72d29e4382aa0ea96eb6e392c0187 /libavcodec/h264_sei.c | |
| parent | cab237953ea60963c627df53833513a0764ff8fe (diff) | |
| download | ffmpeg-fef89aae98a0f34c6da1ef88b51d32f21f87df08.tar.gz | |
lavc/h264: move green meta logging out of the sei decoding
This will simplify the next Libav merge where SEI decoding doesn't have
access to the debug level anymore.
Diffstat (limited to 'libavcodec/h264_sei.c')
| -rw-r--r-- | libavcodec/h264_sei.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c index 3c6d988d7f..b23878c8c5 100644 --- a/libavcodec/h264_sei.c +++ b/libavcodec/h264_sei.c @@ -365,33 +365,16 @@ static int decode_display_orientation(H264Context *h) static int decode_GreenMetadata(H264Context *h) { - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "Green Metadata Info SEI message\n"); - h->sei_green_metadata.green_metadata_type=get_bits(&h->gb, 8); - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_type = %d\n", - h->sei_green_metadata.green_metadata_type); - if (h->sei_green_metadata.green_metadata_type==0){ h->sei_green_metadata.period_type=get_bits(&h->gb, 8); - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_period_type = %d\n", - h->sei_green_metadata.period_type); - if (h->sei_green_metadata.period_type==2){ h->sei_green_metadata.num_seconds = get_bits(&h->gb, 16); - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_num_seconds = %d\n", - h->sei_green_metadata.num_seconds); } else if (h->sei_green_metadata.period_type==3){ h->sei_green_metadata.num_pictures = get_bits(&h->gb, 16); - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "green_metadata_num_pictures = %d\n", - h->sei_green_metadata.num_pictures); } h->sei_green_metadata.percent_non_zero_macroblocks=get_bits(&h->gb, 8); @@ -399,25 +382,9 @@ static int decode_GreenMetadata(H264Context *h) h->sei_green_metadata.percent_six_tap_filtering=get_bits(&h->gb, 8); h->sei_green_metadata.percent_alpha_point_deblocking_instance=get_bits(&h->gb, 8); - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "SEI GREEN Complexity Metrics = %f %f %f %f\n", - (float)h->sei_green_metadata.percent_non_zero_macroblocks/255, - (float)h->sei_green_metadata.percent_intra_coded_macroblocks/255, - (float)h->sei_green_metadata.percent_six_tap_filtering/255, - (float)h->sei_green_metadata.percent_alpha_point_deblocking_instance/255); - }else if( h->sei_green_metadata.green_metadata_type==1){ h->sei_green_metadata.xsd_metric_type=get_bits(&h->gb, 8); h->sei_green_metadata.xsd_metric_value=get_bits(&h->gb, 16); - - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "xsd_metric_type = %d\n", - h->sei_green_metadata.xsd_metric_type); - if ( h->sei_green_metadata.xsd_metric_type==0){ - if (h->avctx->debug & FF_DEBUG_GREEN_MD) - av_log(h->avctx, AV_LOG_DEBUG, "xsd_metric_value = %f\n", - (float)h->sei_green_metadata.xsd_metric_value/100); - } } return 0; |