vlc | branch: master | Filip Roséen <[email protected]> | Thu Apr 13 16:05:18 2017 +0200| [24d0c8d22a6a558ce653e82aceed59cdc11b8c74] | committer: Jean-Baptiste Kempf
vlc_es: typo fix video_format_t: "ligthing" => "lighting" Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=24d0c8d22a6a558ce653e82aceed59cdc11b8c74 --- include/vlc_es.h | 2 +- modules/codec/avcodec/video.c | 14 +++++++------- modules/packetizer/hevc.c | 4 ++-- modules/video_output/win32/direct3d11.c | 4 ++-- src/input/decoder.c | 8 ++++---- src/input/es_out.c | 8 ++++---- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/vlc_es.h b/include/vlc_es.h index 9b5afb792e..57610dd661 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -356,7 +356,7 @@ struct video_format_t /* similar to CTA-861.3 content light level */ uint16_t MaxCLL; /* max content light level */ uint16_t MaxFALL; /* max frame average light level */ - } ligthing; + } lighting; uint32_t i_cubemap_padding; /**< padding in pixels of the cube map faces */ }; diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 5dc1fe779d..632b317b2f 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -310,7 +310,7 @@ static int lavc_UpdateVideoFormat(decoder_t *dec, AVCodecContext *ctx, dec->fmt_out.video.pose = dec->fmt_in.video.pose; if ( dec->fmt_in.video.mastering.max_luminance ) dec->fmt_out.video.mastering = dec->fmt_in.video.mastering; - dec->fmt_out.video.ligthing = dec->fmt_in.video.ligthing; + dec->fmt_out.video.lighting = dec->fmt_in.video.lighting; return decoder_UpdateVideoFormat(dec); } @@ -1113,13 +1113,13 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block, bool *error { const AVContentLightMetadata *light_meta = (const AVContentLightMetadata *) metadata_lt->data; - p_pic->format.ligthing.MaxCLL = light_meta->MaxCLL; - p_pic->format.ligthing.MaxFALL = light_meta->MaxFALL; - if ( memcmp( &p_dec->fmt_out.video.ligthing, - &p_pic->format.ligthing, - sizeof(p_pic->format.ligthing) ) ) + p_pic->format.lighting.MaxCLL = light_meta->MaxCLL; + p_pic->format.lighting.MaxFALL = light_meta->MaxFALL; + if ( memcmp( &p_dec->fmt_out.video.lighting, + &p_pic->format.lighting, + sizeof(p_pic->format.lighting) ) ) { - p_dec->fmt_out.video.ligthing = p_pic->format.ligthing; + p_dec->fmt_out.video.lighting = p_pic->format.lighting; format_changed = true; } } diff --git a/modules/packetizer/hevc.c b/modules/packetizer/hevc.c index 923f67a214..31192813fc 100644 --- a/modules/packetizer/hevc.c +++ b/modules/packetizer/hevc.c @@ -856,8 +856,8 @@ static bool ParseSEICallback( const hxxx_sei_data_t *p_sei_data, void *cbdata ) case HXXX_SEI_CONTENT_LIGHT_LEVEL: { video_format_t *p_fmt = &p_dec->fmt_out.video; - p_fmt->ligthing.MaxCLL = p_sei_data->content_light_lvl.MaxCLL; - p_fmt->ligthing.MaxFALL = p_sei_data->content_light_lvl.MaxFALL; + p_fmt->lighting.MaxCLL = p_sei_data->content_light_lvl.MaxCLL; + p_fmt->lighting.MaxFALL = p_sei_data->content_light_lvl.MaxFALL; } break; } diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index dc690bfaa7..d84b251871 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -1319,8 +1319,8 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic hdr10.WhitePoint[1] = picture->format.mastering.white_point[1]; hdr10.MinMasteringLuminance = picture->format.mastering.min_luminance; hdr10.MaxMasteringLuminance = picture->format.mastering.max_luminance; - hdr10.MaxContentLightLevel = picture->format.ligthing.MaxCLL; - hdr10.MaxFrameAverageLightLevel = picture->format.ligthing.MaxFALL; + hdr10.MaxContentLightLevel = picture->format.lighting.MaxCLL; + hdr10.MaxFrameAverageLightLevel = picture->format.lighting.MaxFALL; IDXGISwapChain4_SetHDRMetaData(sys->dxgiswapChain4, DXGI_HDR_METADATA_TYPE_HDR10, sizeof(hdr10), &hdr10); } diff --git a/src/input/decoder.c b/src/input/decoder.c index 2aa7852a4f..c213d35ff9 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -500,10 +500,10 @@ static int vout_update_format( decoder_t *p_dec ) if ( memcmp( &p_dec->fmt_out.video.mastering, &p_owner->fmt.video.mastering, sizeof(p_owner->fmt.video.mastering)) || - p_dec->fmt_out.video.ligthing.MaxCLL != - p_owner->fmt.video.ligthing.MaxCLL || - p_dec->fmt_out.video.ligthing.MaxFALL != - p_owner->fmt.video.ligthing.MaxFALL) + p_dec->fmt_out.video.lighting.MaxCLL != + p_owner->fmt.video.lighting.MaxCLL || + p_dec->fmt_out.video.lighting.MaxFALL != + p_owner->fmt.video.lighting.MaxFALL) { /* the format has changed but we don't need a new vout */ vlc_mutex_lock( &p_owner->lock ); diff --git a/src/input/es_out.c b/src/input/es_out.c index f0b74b3206..697452a807 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -3230,15 +3230,15 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * float y = (float)fmt->video.mastering.white_point[1] / 50000.f; info_category_AddInfo( p_cat, _("White point"), "x=%.4f y=%.4f", x, y ); } - if ( fmt->video.ligthing.MaxCLL ) + if ( fmt->video.lighting.MaxCLL ) { info_category_AddInfo( p_cat, _("MaxCLL"), "%d cd/m²", - fmt->video.ligthing.MaxCLL ); + fmt->video.lighting.MaxCLL ); } - if ( fmt->video.ligthing.MaxFALL ) + if ( fmt->video.lighting.MaxFALL ) { info_category_AddInfo( p_cat, _("MaxFALL"), "%d cd/m²", - fmt->video.ligthing.MaxFALL ); + fmt->video.lighting.MaxFALL ); } break; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
