From 47af51ec5838c721f62affd649530838d238eb2d Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 8 Sep 2023 11:26:45 +0200 Subject: [PATCH] vlc_es: remove always 0 video_format_t RGB mask --- include/vlc_es.h | 1 - modules/access/v4l2/video.c | 3 --- modules/codec/arib/libaribcaption.c | 3 --- modules/codec/avcodec/chroma.c | 17 +---------------- modules/codec/avcodec/encoder.c | 3 --- modules/codec/avcodec/video.c | 6 ------ modules/codec/cdg.c | 3 --- modules/codec/jpeg.c | 3 --- modules/codec/mft.cpp | 3 --- modules/codec/oggspots.c | 6 ------ modules/codec/png.c | 3 --- modules/codec/qsv.c | 3 --- modules/codec/rtp-rawvid.c | 3 --- modules/codec/svg.c | 3 --- modules/demux/avi/bitmapinfoheader.h | 13 ------------- modules/demux/mp4/essetup.c | 6 ------ modules/hw/d3d9/dxa9.c | 4 ---- modules/hw/nvdec/nvdec.c | 3 --- modules/hw/nvdec/nvdec_gl.c | 3 --- modules/stream_out/mosaic_bridge.c | 1 - modules/stream_out/renderer_common.cpp | 1 - modules/video_chroma/chain.c | 6 ------ modules/video_output/caca.c | 1 - modules/video_output/flaschen.c | 1 - modules/video_output/kva.c | 4 ---- modules/video_output/opengl/filters.c | 6 ------ modules/video_output/opengl/interop_sw.c | 3 --- modules/video_output/vmem.c | 10 ---------- modules/video_output/wayland/shm.c | 3 --- modules/video_output/win32/direct3d11.cpp | 8 -------- modules/video_output/win32/direct3d9.c | 1 - modules/video_output/win32/wingdi.c | 12 ------------ modules/video_output/xcb/pictures.c | 3 --- modules/video_output/xcb/render.c | 6 ------ src/misc/es_format.c | 5 ++--- src/misc/filter.c | 3 --- src/video_output/vout_subpictures.c | 14 +------------- 37 files changed, 4 insertions(+), 173 deletions(-) diff --git a/include/vlc_es.h b/include/vlc_es.h index e69d4dd14a..37966fbef7 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -368,7 +368,6 @@ struct video_format_t unsigned int i_frame_rate; /**< frame rate numerator */ unsigned int i_frame_rate_base; /**< frame rate denominator */ - uint32_t i_rmask, i_gmask, i_bmask; /**< color masks for RGB chroma */ video_palette_t *p_palette; /**< video palette from demuxer */ video_orientation_t orientation; /**< picture orientation */ video_color_primaries_t primaries; /**< color primaries */ diff --git a/modules/access/v4l2/video.c b/modules/access/v4l2/video.c index c7680c642a..0dc87064d8 100644 --- a/modules/access/v4l2/video.c +++ b/modules/access/v4l2/video.c @@ -840,9 +840,6 @@ int SetupVideo(vlc_object_t *obj, int fd, uint32_t caps, /* Setup our unique elementary (video) stream format */ es_format_Init(es_fmt, VIDEO_ES, selected->vlc); es_fmt->video.i_chroma = selected->vlc; - es_fmt->video.i_rmask = 0; - es_fmt->video.i_gmask = 0; - es_fmt->video.i_bmask = 0; es_fmt->video.i_visible_width = fmt.fmt.pix.width; if (fmt.fmt.pix.bytesperline != 0 && selected->bpp != 0) es_fmt->video.i_width = fmt.fmt.pix.bytesperline / selected->bpp; diff --git a/modules/codec/arib/libaribcaption.c b/modules/codec/arib/libaribcaption.c index 1281fc550c..0c87939a65 100644 --- a/modules/codec/arib/libaribcaption.c +++ b/modules/codec/arib/libaribcaption.c @@ -166,9 +166,6 @@ static void SubpictureUpdate(subpicture_t *p_subpic, video_format_t fmt = *p_dst_format; fmt.i_chroma = VLC_CODEC_RGBA; - fmt.i_rmask = 0; - fmt.i_gmask = 0; - fmt.i_bmask = 0; fmt.i_x_offset = 0; fmt.i_y_offset = 0; diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c index 2ebd39c42f..7fbfc9a742 100644 --- a/modules/codec/avcodec/chroma.c +++ b/modules/codec/avcodec/chroma.c @@ -225,25 +225,11 @@ enum AVPixelFormat GetFfmpegChroma( const video_format_t *fmt ) { for( int i = 0; chroma_table[i].i_chroma != 0; i++ ) { - if( chroma_table[i].i_chroma == fmt->i_chroma && - 0 == fmt->i_rmask && - 0 == fmt->i_gmask && - 0 == fmt->i_bmask ) + if( chroma_table[i].i_chroma == fmt->i_chroma ) { return chroma_table[i].i_chroma_id; } } - // try again without the mask as they may not correspond exactly - if (fmt->i_rmask || fmt->i_gmask || fmt->i_bmask) - { - for( int i = 0; chroma_table[i].i_chroma != 0; i++ ) - { - if( chroma_table[i].i_chroma == fmt->i_chroma ) - { - return chroma_table[i].i_chroma_id; - } - } - } return AV_PIX_FMT_NONE; } @@ -261,7 +247,6 @@ int GetVlcChroma( video_format_t *fmt, enum AVPixelFormat i_ffmpeg_chroma ) { if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma ) { - fmt->i_rmask = fmt->i_gmask = fmt->i_bmask = 0; fmt->i_chroma = chroma_table[i].i_chroma; return VLC_SUCCESS; } diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index e57e49f11a..8bc41344c3 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -561,9 +561,6 @@ int InitVideoEnc( vlc_object_t *p_this ) p_enc->fmt_in.i_codec = p_enc->fmt_in.video.i_chroma = VLC_CODEC_I420; - p_enc->fmt_in.video.i_rmask = 0; - p_enc->fmt_in.video.i_gmask = 0; - p_enc->fmt_in.video.i_bmask = 0; /* Very few application support YUV in TIFF, not even VLC */ if( p_enc->fmt_out.i_codec == VLC_CODEC_TIFF ) diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 67a7e22e30..4874350b62 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -652,9 +652,6 @@ static int ffmpeg_OpenVa(decoder_t *p_dec, AVCodecContext *p_context, vlc_mutex_unlock(open_lock); p_dec->fmt_out.video.i_chroma = 0; // make sure the va sets its output chroma - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; vlc_video_context *vctx_out; vlc_va_t *va = vlc_va_New(VLC_OBJECT(p_dec), p_context, hwfmt, src_desc, p_dec->fmt_in, init_device, @@ -1466,9 +1463,6 @@ static int DecodeBlock( decoder_t *p_dec, block_t **pp_block ) assert( frame->data[1] != NULL ); lavc_Frame8PaletteCopy( p_palette, frame->data[1] ); p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGBP; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; if( decoder_UpdateVideoFormat( p_dec ) ) { vlc_mutex_unlock(&p_sys->lock); diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c index 40143f7a76..c549db6754 100644 --- a/modules/codec/cdg.c +++ b/modules/codec/cdg.c @@ -116,9 +116,6 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_out.video.i_height = CDG_DISPLAY_HEIGHT; p_dec->fmt_out.video.i_sar_num = 1; p_dec->fmt_out.video.i_sar_den = 1; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; /* Set callbacks */ p_dec->pf_decode = Decode; diff --git a/modules/codec/jpeg.c b/modules/codec/jpeg.c index fe3d0a8371..67d21df574 100644 --- a/modules/codec/jpeg.c +++ b/modules/codec/jpeg.c @@ -188,9 +188,6 @@ static int OpenDecoder(vlc_object_t *p_this) p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma = VLC_CODEC_RGB24; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; p_dec->fmt_out.video.transfer = TRANSFER_FUNC_SRGB; p_dec->fmt_out.video.space = COLOR_SPACE_SRGB; p_dec->fmt_out.video.primaries = COLOR_PRIMARIES_SRGB; diff --git a/modules/codec/mft.cpp b/modules/codec/mft.cpp index 5f7d96312c..e389629081 100644 --- a/modules/codec/mft.cpp +++ b/modules/codec/mft.cpp @@ -930,9 +930,6 @@ static int ProcessOutputStream(decoder_t *p_dec, DWORD stream_id, bool & keep_re p_dec->fmt_out.i_codec = p_sys->cfg->fourcc; p_dec->fmt_out.video.i_chroma = p_sys->cfg->fourcc; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; // pre allocate all the SRV for that texture for (size_t slice=0; slice < desc.ArraySize; slice++) diff --git a/modules/codec/oggspots.c b/modules/codec/oggspots.c index 945d88f45a..c842dd5d09 100644 --- a/modules/codec/oggspots.c +++ b/modules/codec/oggspots.c @@ -354,15 +354,9 @@ static picture_t* DecodePacket(decoder_t* p_dec, block_t* p_block) es_format_t fmt_in = *p_dec->fmt_in; if ( !memcmp(&p_block->p_buffer[4], "PNG", 3) ) { fmt_in.video.i_chroma = VLC_CODEC_PNG; - fmt_in.video.i_rmask = 0; - fmt_in.video.i_gmask = 0; - fmt_in.video.i_bmask = 0; } else if ( !memcmp(&p_block->p_buffer[4], "JPEG", 4) ) { fmt_in.video.i_chroma = VLC_CODEC_JPEG; - fmt_in.video.i_rmask = 0; - fmt_in.video.i_gmask = 0; - fmt_in.video.i_bmask = 0; } else { char psz_image_type[8+1]; diff --git a/modules/codec/png.c b/modules/codec/png.c index 23d8dba253..6bad86aa60 100644 --- a/modules/codec/png.c +++ b/modules/codec/png.c @@ -430,9 +430,6 @@ static int OpenEncoder(vlc_object_t *p_this) p_enc->fmt_in.i_codec = p_enc->fmt_in.video.i_chroma = VLC_CODEC_RGB24; - p_enc->fmt_in.video.i_rmask = 0; - p_enc->fmt_in.video.i_gmask = 0; - p_enc->fmt_in.video.i_bmask = 0; static const struct vlc_encoder_operations ops = { .encode_video = EncodeBlock }; diff --git a/modules/codec/qsv.c b/modules/codec/qsv.c index c4042617de..6d268c2f47 100644 --- a/modules/codec/qsv.c +++ b/modules/codec/qsv.c @@ -619,9 +619,6 @@ static int Open(vlc_object_t *this) /* Vlc module configuration */ enc->fmt_in.i_codec = enc->fmt_in.video.i_chroma = VLC_CODEC_NV12; // Intel Media SDK requirement - enc->fmt_in.video.i_rmask = 0; - enc->fmt_in.video.i_gmask = 0; - enc->fmt_in.video.i_bmask = 0; // require aligned pictures on input, a filter may be added before the encoder enc->fmt_in.video.i_width = sys->params.mfx.FrameInfo.Width; enc->fmt_in.video.i_height = sys->params.mfx.FrameInfo.Height; diff --git a/modules/codec/rtp-rawvid.c b/modules/codec/rtp-rawvid.c index 073ee6af7b..b7d93dbca0 100644 --- a/modules/codec/rtp-rawvid.c +++ b/modules/codec/rtp-rawvid.c @@ -839,9 +839,6 @@ static int Open(vlc_object_t *obj) es_format_Copy(&dec->fmt_out, dec->fmt_in); dec->fmt_out.i_codec = format->fourcc; dec->fmt_out.video.i_chroma = format->fourcc; - dec->fmt_out.video.i_rmask = 0; - dec->fmt_out.video.i_gmask = 0; - dec->fmt_out.video.i_bmask = 0; int ret = decoder_UpdateVideoFormat(dec); if (ret != VLC_SUCCESS) diff --git a/modules/codec/svg.c b/modules/codec/svg.c index e2dc4701ad..31f33055bf 100644 --- a/modules/codec/svg.c +++ b/modules/codec/svg.c @@ -192,9 +192,6 @@ static int DecodeBlock( decoder_t *p_dec, block_t *p_block ) p_dec->fmt_out.video.i_visible_height = i_height; p_dec->fmt_out.video.i_sar_num = 1; p_dec->fmt_out.video.i_sar_den = 1; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; /* Get a new picture */ if( decoder_UpdateVideoFormat( p_dec ) ) diff --git a/modules/demux/avi/bitmapinfoheader.h b/modules/demux/avi/bitmapinfoheader.h index fb5c19f5b9..fee05b8fd1 100644 --- a/modules/demux/avi/bitmapinfoheader.h +++ b/modules/demux/avi/bitmapinfoheader.h @@ -177,9 +177,6 @@ static inline int ParseBitmapInfoHeader( const VLC_BITMAPINFOHEADER *p_bih, size if (known_chroma != 0) { fmt->video.i_chroma = fmt->i_codec = known_chroma; - fmt->video.i_rmask = 0; - fmt->video.i_gmask = 0; - fmt->video.i_bmask = 0; } else { @@ -220,9 +217,6 @@ static inline int ParseBitmapInfoHeader( const VLC_BITMAPINFOHEADER *p_bih, size default: return VLC_EINVAL; } fmt->video.i_chroma = fmt->i_codec = bi_rgb_chroma; - fmt->video.i_rmask = 0; - fmt->video.i_gmask = 0; - fmt->video.i_bmask = 0; } p_props->i_stride = p_bih->biWidth * (p_bih->biBitCount >> 3); @@ -345,13 +339,6 @@ static inline int CreateBitmapInfoHeader( const es_format_t *fmt, break; } } - if (i_rmask == 0) - { - i_rmask = fmt->video.i_rmask; - i_gmask = fmt->video.i_gmask; - i_bmask = fmt->video.i_bmask; - i_amask = 0; - } SetDWLE( &p_bmiColors[0], i_rmask ); SetDWLE( &p_bmiColors[4], i_gmask ); SetDWLE( &p_bmiColors[8], i_bmask ); diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c index 9a6abe5244..4763545374 100644 --- a/modules/demux/mp4/essetup.c +++ b/modules/demux/mp4/essetup.c @@ -426,15 +426,9 @@ int SetupVideoES( demux_t *p_demux, const mp4_track_t *p_track, const MP4_Box_t break; case VLC_FOURCC('A','B','G','R'): p_fmt->i_codec = VLC_CODEC_ARGB; - p_fmt->video.i_rmask = 0; - p_fmt->video.i_gmask = 0; - p_fmt->video.i_bmask = 0; break; case VLC_FOURCC('2','4','B','G'): p_fmt->i_codec = VLC_CODEC_BGR24; - p_fmt->video.i_rmask = 0; - p_fmt->video.i_gmask = 0; - p_fmt->video.i_bmask = 0; break; case VLC_FOURCC('r','a','w',' '): switch( p_vide->i_depth ) { diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c index 529fa060f7..3331402db7 100644 --- a/modules/hw/d3d9/dxa9.c +++ b/modules/hw/d3d9/dxa9.c @@ -212,9 +212,6 @@ static filter_t *CreateFilter( filter_t *p_this, const es_format_t *p_fmt_in, es_format_InitFromVideo( &p_filter->fmt_in, &p_fmt_in->video ); es_format_InitFromVideo( &p_filter->fmt_out, &p_fmt_in->video ); p_filter->fmt_out.i_codec = p_filter->fmt_out.video.i_chroma = dst_chroma; - p_filter->fmt_out.video.i_rmask = 0; - p_filter->fmt_out.video.i_gmask = 0; - p_filter->fmt_out.video.i_bmask = 0; p_filter->p_module = module_need( p_filter, "video converter", NULL, false ); if( !p_filter->p_module ) @@ -353,7 +350,6 @@ static picture_t *AllocateCPUtoGPUTexture(filter_t *p_filter) video_format_Copy(&fmt_staging, &p_filter->fmt_out.video); fmt_staging.i_chroma = format; - fmt_staging.i_rmask = fmt_staging.i_gmask = fmt_staging.i_bmask = 0; picture_resource_t dummy_res = { .p_sys = NULL }; picture_t *p_dst = picture_NewFromResource(&fmt_staging, &dummy_res); diff --git a/modules/hw/nvdec/nvdec.c b/modules/hw/nvdec/nvdec.c index 93498e001d..0cd6ec2436 100644 --- a/modules/hw/nvdec/nvdec.c +++ b/modules/hw/nvdec/nvdec.c @@ -1001,9 +1001,6 @@ static int OpenDecoder(vlc_object_t *p_this) for (chroma_idx = 0; output_chromas[chroma_idx] != 0; chroma_idx++) { p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma = output_chromas[chroma_idx]; - p_dec->fmt_out.video.i_rmask = 0; - p_dec->fmt_out.video.i_gmask = 0; - p_dec->fmt_out.video.i_bmask = 0; result = decoder_UpdateVideoOutput(p_dec, p_sys->vctx_out); if (result == 0) { diff --git a/modules/hw/nvdec/nvdec_gl.c b/modules/hw/nvdec/nvdec_gl.c index 6eb1d757e2..26db267f95 100644 --- a/modules/hw/nvdec/nvdec_gl.c +++ b/modules/hw/nvdec/nvdec_gl.c @@ -290,9 +290,6 @@ static int Open(vlc_object_t *obj) } interop->fmt_out.i_chroma = render_chroma; - interop->fmt_out.i_rmask = 0; - interop->fmt_out.i_gmask = 0; - interop->fmt_out.i_bmask = 0; interop->fmt_out.space = interop->fmt_in.space; static const struct vlc_gl_interop_ops ops = { diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c index 86b6834080..c75c8bc2e0 100644 --- a/modules/stream_out/mosaic_bridge.c +++ b/modules/stream_out/mosaic_bridge.c @@ -641,7 +641,6 @@ static int video_update_format_decoder( decoder_t *p_dec, vlc_video_context *vct if( p_sys->i_chroma ) { fmt.video.i_chroma = p_sys->i_chroma; - fmt.video.i_rmask = fmt.video.i_gmask = fmt.video.i_bmask = 0; vctx = NULL; // CPU chroma, no video context } filter_chain_Reset( p_sys->p_vf2, &fmt, vctx, &fmt ); diff --git a/modules/stream_out/renderer_common.cpp b/modules/stream_out/renderer_common.cpp index c2ab31bced..bb8bd3b84d 100644 --- a/modules/stream_out/renderer_common.cpp +++ b/modules/stream_out/renderer_common.cpp @@ -114,7 +114,6 @@ GetVencOption( sout_stream_t *p_stream, std::vector codecs, es_format_InitFromVideo( &fmt, p_vid ); fmt.i_codec = fmt.video.i_chroma = VLC_CODEC_I420; - fmt.video.i_rmask = fmt.video.i_gmask = fmt.video.i_bmask = 0; /* Test the maximum size/fps we will encode */ fmt.video.i_visible_width = fmt.video.i_width = 1920; diff --git a/modules/video_chroma/chain.c b/modules/video_chroma/chain.c index 99370727d9..eb76bf936f 100644 --- a/modules/video_chroma/chain.c +++ b/modules/video_chroma/chain.c @@ -376,9 +376,6 @@ static int BuildChromaChain( filter_t *p_filter ) es_format_Copy( &fmt_mid, &p_filter->fmt_in ); fmt_mid.i_codec = fmt_mid.video.i_chroma = i_chroma; - fmt_mid.video.i_rmask = 0; - fmt_mid.video.i_gmask = 0; - fmt_mid.video.i_bmask = 0; i_ret = CreateChain( p_filter, &fmt_mid ); es_format_Clean( &fmt_mid ); @@ -423,9 +420,6 @@ static int BuildFilterChain( filter_t *p_filter ) es_format_Copy( &fmt_mid, &p_filter->fmt_in ); fmt_mid.i_codec = fmt_mid.video.i_chroma = i_chroma; - fmt_mid.video.i_rmask = 0; - fmt_mid.video.i_gmask = 0; - fmt_mid.video.i_bmask = 0; if( filter_chain_AppendConverter( p_sys->p_chain, &fmt_mid ) != VLC_SUCCESS ) diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c index f288a7a60d..54ee988de3 100644 --- a/modules/video_output/caca.c +++ b/modules/video_output/caca.c @@ -488,7 +488,6 @@ static int Open(vout_display_t *vd, sys->cursor_deadline = INVALID_DEADLINE; fmtp->i_chroma = VLC_CODEC_XRGB; - fmtp->i_rmask = fmtp->i_gmask = fmtp->i_bmask = 0; /* Setup vout_display now that everything is fine */ vd->ops = &ops; diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c index 8b491c61ab..5e3e7c3427 100644 --- a/modules/video_output/flaschen.c +++ b/modules/video_output/flaschen.c @@ -117,7 +117,6 @@ static int Open(vout_display_t *vd, video_format_t fmt = *fmtp; /* TODO: check if this works on big-endian systems */ fmt.i_chroma = VLC_CODEC_RGB24; - fmt.i_rmask = fmt.i_gmask = fmt.i_bmask = 0; fmt.i_width = var_InheritInteger(vd, "flaschen-width"); fmt.i_height = var_InheritInteger(vd, "flaschen-height"); fmt.i_visible_width = fmt.i_width; diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c index 4f6db094c2..3a8b361982 100644 --- a/modules/video_output/kva.c +++ b/modules/video_output/kva.c @@ -602,10 +602,6 @@ static int OpenDisplay( vout_display_t *vd, video_format_t *fmt ) return VLC_EGENERIC; } - fmt->i_rmask = 0; - fmt->i_gmask = 0; - fmt->i_bmask = 0; - msg_Dbg( vd, "output chroma = %4.4s", ( const char * )&fmt->i_chroma ); msg_Dbg( vd, "KVA chroma = %4.4s", ( const char * )&i_kva_fourcc ); diff --git a/modules/video_output/opengl/filters.c b/modules/video_output/opengl/filters.c index 3d81e2e9b4..8931ce803b 100644 --- a/modules/video_output/opengl/filters.c +++ b/modules/video_output/opengl/filters.c @@ -243,12 +243,6 @@ vlc_gl_filters_Append(struct vlc_gl_filters *filters, const char *name, video_format_t *fmt = &glfmt->fmt; video_format_Init(fmt, chroma); - if (prev_filter->filter.config.filter_planes) - { - fmt->i_rmask = prev_filter->glfmt_in.fmt.i_rmask; - fmt->i_gmask = prev_filter->glfmt_in.fmt.i_gmask; - fmt->i_bmask = prev_filter->glfmt_in.fmt.i_bmask; - } fmt->i_width = fmt->i_visible_width = prev_filter->size_out.width; fmt->i_height = fmt->i_visible_height = prev_filter->size_out.height; diff --git a/modules/video_output/opengl/interop_sw.c b/modules/video_output/opengl/interop_sw.c index 60fdc9f71f..8e35654307 100644 --- a/modules/video_output/opengl/interop_sw.c +++ b/modules/video_output/opengl/interop_sw.c @@ -782,9 +782,6 @@ interop_init: * be created. */ interop->fmt_in.i_chroma = i_chroma; - interop->fmt_in.i_rmask = 0; - interop->fmt_in.i_gmask = 0; - interop->fmt_in.i_bmask = 0; static const struct vlc_gl_interop_ops ops = { .allocate_textures = tc_common_allocate_textures, diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c index 1847938b82..1972641245 100644 --- a/modules/video_output/vmem.c +++ b/modules/video_output/vmem.c @@ -189,16 +189,6 @@ static int Open(vout_display_t *vd, return VLC_EGENERIC; } - /* Define the bitmasks */ - switch (fmt.i_chroma) - { - default: - break; - } - fmt.i_rmask = 0; - fmt.i_gmask = 0; - fmt.i_bmask = 0; - /* */ *fmtp = fmt; diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c index 2915b5c06c..751cd79f49 100644 --- a/modules/video_output/wayland/shm.c +++ b/modules/video_output/wayland/shm.c @@ -337,9 +337,6 @@ static int Open(vout_display_t *vd, } fmtp->i_chroma = VLC_CODEC_BGRX; - fmtp->i_rmask = 0; - fmtp->i_gmask = 0; - fmtp->i_bmask = 0; vd->ops = &ops; diff --git a/modules/video_output/win32/direct3d11.cpp b/modules/video_output/win32/direct3d11.cpp index 6af5b5a86a..b68b89b1d7 100644 --- a/modules/video_output/win32/direct3d11.cpp +++ b/modules/video_output/win32/direct3d11.cpp @@ -326,9 +326,6 @@ static int UpdateStaging(vout_display_t *vd, const video_format_t *fmt) if (!is_d3d11_opaque(fmt->i_chroma)) { texture_fmt.i_chroma = sys->picQuad.generic.textureFormat->fourcc; - texture_fmt.i_rmask = 0; - texture_fmt.i_gmask = 0; - texture_fmt.i_bmask = 0; } if (AllocateTextures(vd, sys->d3d_dev, sys->picQuad.generic.textureFormat, &texture_fmt, @@ -813,7 +810,6 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_co const vlc_fourcc_t *list = vlc_fourcc_GetFallback(vd->source->i_chroma); for (unsigned i = 0; list[i] != 0; i++) { fmt.i_chroma = list[i]; - fmt.i_rmask = fmt.i_gmask = fmt.i_bmask = 0; if (fmt.i_chroma == vd->source->i_chroma) continue; err = SetupOutputFormat(vd, &fmt, NULL); @@ -835,9 +831,6 @@ static int Direct3D11Open(vout_display_t *vd, video_format_t *fmtp, vlc_video_co if (!is_d3d11_opaque(fmt.i_chroma)) { sys->picQuad.quad_fmt.i_chroma = sys->picQuad.generic.textureFormat->fourcc; - sys->picQuad.quad_fmt.i_rmask = 0; - sys->picQuad.quad_fmt.i_gmask = 0; - sys->picQuad.quad_fmt.i_bmask = 0; } /* adjust the decoder sizes to have proper padding */ @@ -998,7 +991,6 @@ static int SetupOutputFormat(vout_display_t *vd, video_format_t *fmt, vlc_video_ (char *)&fmt->i_chroma ); fmt->i_chroma = decoder_format ? decoder_format->fourcc : sys->picQuad.generic.textureFormat->fourcc; - fmt->i_rmask = fmt->i_gmask = fmt->i_bmask = 0; /* check the region pixel format */ sys->regionQuad.generic.textureFormat = GetBlendableFormat(vd, VLC_CODEC_RGBA); diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c index 48ed498019..43fa98af93 100644 --- a/modules/video_output/win32/direct3d9.c +++ b/modules/video_output/win32/direct3d9.c @@ -1657,7 +1657,6 @@ static int Direct3D9Open(vout_display_t *vd, video_format_t *fmt, vlc_video_cont /* */ *fmt = *vd->source; fmt->i_chroma = d3dfmt->fourcc; - fmt->i_rmask = fmt->i_gmask = fmt->i_bmask = 0; sys->sw_texture_fmt = d3dfmt; if (Direct3D9CreateResources(vd, fmt)) { diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c index 77d294f005..cca4baa08b 100644 --- a/modules/video_output/win32/wingdi.c +++ b/modules/video_output/win32/wingdi.c @@ -256,30 +256,18 @@ static int Init(vout_display_t *vd, video_format_t *fmt) switch (i_depth) { case 8: fmt->i_chroma = VLC_CODEC_RGB233; - fmt->i_rmask = 0; - fmt->i_gmask = 0; - fmt->i_bmask = 0; break; case 16: fmt->i_chroma = VLC_CODEC_RGB555LE; - fmt->i_rmask = 0; - fmt->i_gmask = 0; - fmt->i_bmask = 0; break; case 24: fmt->i_chroma = VLC_CODEC_RGB24; - fmt->i_rmask = 0; - fmt->i_gmask = 0; - fmt->i_bmask = 0; break; case 32: if (vd->source->i_chroma == VLC_CODEC_BGRA) fmt->i_chroma = VLC_CODEC_BGRA; else fmt->i_chroma = VLC_CODEC_BGRX; - fmt->i_rmask = 0; - fmt->i_gmask = 0; - fmt->i_bmask = 0; break; default: msg_Err(vd, "screen depth %i not supported", i_depth); diff --git a/modules/video_output/xcb/pictures.c b/modules/video_output/xcb/pictures.c index 874f82252c..c5e66e80a8 100644 --- a/modules/video_output/xcb/pictures.c +++ b/modules/video_output/xcb/pictures.c @@ -211,9 +211,6 @@ bool vlc_xcb_VisualToFormat(const xcb_setup_t *setup, uint_fast8_t depth, vlc_assert_unreachable(); } - f->i_rmask = 0; - f->i_gmask = 0; - f->i_bmask = 0; return true; } diff --git a/modules/video_output/xcb/render.c b/modules/video_output/xcb/render.c index 598624aaac..9a67c14823 100644 --- a/modules/video_output/xcb/render.c +++ b/modules/video_output/xcb/render.c @@ -625,12 +625,6 @@ static int Open(vout_display_t *vd, continue; fmtp->i_chroma = chroma; - fmtp->i_rmask = fmtp->i_gmask = fmtp->i_bmask = 0; -#if 0 - fmtp->i_rmask = ((uint32_t)d->red_mask) << d->red_shift; - fmtp->i_gmask = ((uint32_t)d->green_mask) << d->green_shift; - fmtp->i_bmask = ((uint32_t)d->blue_mask) << d->blue_shift; -#endif sys->format.argb = pic_fmt->id; visual = vid; } diff --git a/src/misc/es_format.c b/src/misc/es_format.c index 11ca652eec..d05cfd35a2 100644 --- a/src/misc/es_format.c +++ b/src/misc/es_format.c @@ -260,14 +260,13 @@ void video_format_Print( vlc_object_t *p_this, else orient = "error"; msg_Dbg( p_this, - "%s sz %ux%u, of (%u,%u), vsz %ux%u, 4cc %4.4s, sar %u:%u, orient: %s, msk r0x%" PRIx32 " g0x%" PRIx32 " b0x%" PRIx32, + "%s sz %ux%u, of (%u,%u), vsz %ux%u, 4cc %4.4s, sar %u:%u, orient: %s", psz_text, fmt->i_width, fmt->i_height, fmt->i_x_offset, fmt->i_y_offset, fmt->i_visible_width, fmt->i_visible_height, (char*)&fmt->i_chroma, fmt->i_sar_num, fmt->i_sar_den, - orient, - fmt->i_rmask, fmt->i_gmask, fmt->i_bmask ); + orient ); } void es_format_Init( es_format_t *fmt, diff --git a/src/misc/filter.c b/src/misc/filter.c index 20f2ae2d93..9ed671a169 100644 --- a/src/misc/filter.c +++ b/src/misc/filter.c @@ -115,9 +115,6 @@ vlc_blender_t *filter_NewBlend( vlc_object_t *p_this, p_blend->fmt_out.i_codec = p_blend->fmt_out.video.i_chroma = p_dst_chroma->i_chroma; - p_blend->fmt_out.video.i_rmask = p_dst_chroma->i_rmask; - p_blend->fmt_out.video.i_gmask = p_dst_chroma->i_gmask; - p_blend->fmt_out.video.i_bmask = p_dst_chroma->i_bmask; /* The blend module will be loaded when needed with the real * input format */ diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c index 410774d725..3496edee7a 100644 --- a/src/video_output/vout_subpictures.c +++ b/src/video_output/vout_subpictures.c @@ -948,10 +948,7 @@ static void SpuRenderRegion(spu_t *spu, bool convert_chroma = true; for (int i = 0; chroma_list[i] && convert_chroma; i++) { - if (region_fmt.i_chroma == chroma_list[i] && - region_fmt.i_rmask == 0 && - region_fmt.i_gmask == 0 && - region_fmt.i_bmask == 0) + if (region_fmt.i_chroma == chroma_list[i]) convert_chroma = false; } @@ -999,9 +996,6 @@ static void SpuRenderRegion(spu_t *spu, scale_yuvp->fmt_out.video = region->fmt; scale_yuvp->fmt_out.video.i_chroma = chroma_list[0]; - scale_yuvp->fmt_out.video.i_rmask = - scale_yuvp->fmt_out.video.i_gmask = - scale_yuvp->fmt_out.video.i_bmask = 0; scale_yuvp->fmt_out.video.p_palette = NULL; picture = scale_yuvp->ops->filter_video(scale_yuvp, picture); @@ -1027,17 +1021,11 @@ static void SpuRenderRegion(spu_t *spu, if (using_palette) { scale->fmt_in.video.i_chroma = chroma_list[0]; - scale->fmt_in.video.i_rmask = - scale->fmt_in.video.i_gmask = - scale->fmt_in.video.i_bmask = 0; } if (convert_chroma) { scale->fmt_out.i_codec = scale->fmt_out.video.i_chroma = chroma_list[0]; - scale->fmt_out.video.i_rmask = - scale->fmt_out.video.i_gmask = - scale->fmt_out.video.i_bmask = 0; } scale->fmt_out.video.i_width = dst_width;