Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • videolan/vlc
  • chouquette/vlc
  • bakiewicz.marek122/vlc
  • devnexen/vlc
  • rohanrajpal/vlc
  • blurrrb/vlc
  • gsoc/gsoc2019/darkapex/vlc
  • b1ue/vlc
  • fkuehne/vlc
  • magsoft/vlc
  • chub/vlc
  • cramiro9/vlc
  • robUx4/vlc
  • rom1v/vlc
  • akshayaky/vlc
  • tmk907/vlc
  • akymaster/vlc
  • govind.sharma/vlc
  • psilokos/vlc
  • xjbeta/vlc
  • jahan/vlc
  • 1480c1/vlc
  • amanchande/vlc
  • aaqib/vlc
  • rist/vlc
  • apol/vlc
  • mindfreeze/vlc
  • alexandre-janniaux/vlc
  • sandsmark/vlc
  • jagannatharjun/vlc
  • gsoc/gsoc2020/matiaslgonzalez/vlc
  • gsoc/gsoc2020/jagannatharjun/vlc
  • mstorsjo/vlc
  • gsoc/gsoc2020/vedenta/vlc
  • gsoc/gsoc2020/arnav-ishaan/vlc
  • gsoc/gsoc2020/andreduong/vlc
  • fuzun/vlc
  • gsoc/gsoc2020/vatsin/vlc
  • gsoc/gsoc2020/sagid/vlc
  • yaron/vlc
  • Phoenix/vlc
  • Garf/vlc
  • ePiratWorkarounds/vlc
  • tguillem/vlc
  • jnqnfe/vlc
  • mdc/vlc
  • Vedaa/vlc
  • rasa/vlc
  • quink/vlc
  • yealo/vlc
  • aleksey_ak/vlc
  • ePirat/vlc
  • ilya.yanok/vlc
  • asenat/vlc
  • m/vlc
  • bunjee/vlc
  • BLumia/vlc
  • sagudev/vlc
  • hamedmonji30/vlc
  • nullgemm/vlc
  • DivyamAhuja/vlc
  • thesamesam/vlc
  • dag7/vlc
  • snehil101/vlc
  • haasn/vlc
  • jbk/vlc
  • ValZapod/vlc
  • mfkl/vlc
  • WangChuan/vlc
  • core1024/vlc
  • GhostVaibhav/vlc
  • dfuhrmann/vlc
  • davide.prade/vlc
  • tmatth/vlc
  • Courmisch/vlc
  • zouya/vlc
  • hpi/vlc
  • EwoutH/vlc
  • aleung27/vlc
  • hengwu0/vlc
  • saladin/vlc
  • ashuio/vlc
  • richselwood/vlc
  • verma16Ayush/vlc
  • chemicalflash/vlc
  • PoignardAzur/vlc
  • huangjieNT/vlc
  • Blake-Haydon/vlc
  • AnuthaDev/vlc
  • gsoc/gsoc2021/mpd/vlc
  • nicolas_lequec/vlc
  • sambassaly/vlc
  • thresh/vlc
  • bonniegong/vlc
  • myaashish/vlc
  • stavros.vagionitis/vlc
  • ileoo/vlc
  • louis-santucci/vlc
  • cchristiansen/vlc
  • sabyasachi07/vlc
  • AbduAmeen/vlc
  • ashishb0410/vlc
  • urbanhusky/vlc
  • davidepietrasanta/vlc
  • riksleutelstad/vlc
  • jeremyVignelles/vlc
  • komh/vlc
  • iamjithinjohn/vlc
  • JohannesKauffmann/vlc2
  • kunglao/vlc
  • natzberg/vlc
  • jill/vlc
  • cwendling/vlc
  • adufou/vlc
  • ErwanAirone/vlc
  • HasinduDilshan10/vlc
  • vagrantc/vlc
  • rafiv/macos-bigsur-icon
  • Aymeriic/vlc
  • saranshg20/vlc
  • metzlove24/vlc
  • linkfanel/vlc
  • Ds886/vlc
  • metehan-arslan/vlc
  • Skantes/vlc
  • kgsandundananjaya96/vlc
  • mitchcapper/vlc
  • advaitgupta/vlc
  • StefanBruens/vlc
  • ratajs/vlc
  • T.M.F.B.3761/vlc
  • m222059/vlc
  • casemerrick/vlc
  • joshuaword2alt/vlc
  • sjwaddy/vlc
  • dima/vlc
  • Ybalrid/vlc
  • umxprime/vlc
  • eschmidt/vlc
  • vannieuwenhuysenmichelle/vlc
  • badcf00d/vlc
  • wesinator/vlc
  • louis/vlc
  • xqq/vlc
  • EmperorYP7/vlc
  • NicoLiam/vlc
  • loveleen/vlc
  • rofferom/vlc
  • rbultje/vlc
  • TheUnamed/vlc
  • pratiksharma341/vlc
  • Saurab17/vlc
  • purist.coder/vlc
  • Shuicheng/vlc
  • mdrrubel292/vlc
  • silverbleu00/vlc
  • metif12/vlc
  • asher-m/vlc
  • jeffk/vlc
  • Brandonbr1/vlc
  • beautyyuyanli/vlc
  • rego21/vlc
  • muyangren907/vlc
  • collectionbylawrencejason/vlc
  • evelez/vlc
  • GSMgeeth/vlc
  • Oneric/vlc
  • TJ5/vlc
  • XuanTung95/vlc
  • darrenjenny21/vlc
  • Trenly/vlc
  • RockyTDR/vlc
  • mjakubowski/vlc
  • caprica/vlc
  • ForteFrankie/vlc
  • seannamiller19/vlc
  • junlon2006/vlc
  • kiwiren6666/vlc
  • iuseiphonexs/vlc
  • fenngtun/vlc
  • Rajdutt999/vlc
  • typx/vlc
  • leon.vitanos/vlc
  • robertogarci0938/vlc
  • gsoc/gsoc2022/luc65r/vlc-mpd
  • skeller/vlc
  • MCJack123/vlc
  • luc65r/vlc-mpd
  • popov895/vlc
  • claucambra/vlc
  • brad/vlc
  • matthewmurua88/vlc
  • Tomas8874/vlc
  • philenotfound/vlc
  • makita-do3/vlc
  • LZXCorp/vlc
  • mar0x/vlc
  • senojetkennedy0102/vlc
  • shaneb243/vlc
  • ahmadbader/vlc
  • rajduttcse26/vlc-audio-filters
  • Juniorzito8415/vlc
  • achernyakov/vlc
  • lucasjetgroup/vlc
  • pupdoggy666/vlc
  • gmde9363/vlc
  • alexnwayne/vlc
  • bahareebrahimi781/vlc
  • hamad633666/vlc
  • umghof3112/vlc
  • joe0199771874/vlc
  • Octocats66666666/vlc
  • jjm_223/vlc
  • btech10110.19/vlc
  • sunnykfc028/vlc-audio-filters
  • loic/vlc
  • nguyenminhducmx1/vlc
  • JanekKrueger/vlc
  • bstubbington2/vlc
  • rcombs/vlc
  • Ordissimo/vlc
  • king7532/vlc
  • noobsauce101/vlc
  • schong0525/vlc
  • myQwil/vlc
  • apisbg91/vlc
  • geeboy0101017/vlc
  • kim.faughey/vlc
  • nurupo/vlc
  • yyusea/vlc
  • 0711235879.khco/vlc
  • ialo/vlc
  • iloveyeye2/vlc
  • gdtdftdqtd/vlc
  • leandroconsiglio/vlc
  • AndyHTML2012/vlc
  • ncz/vlc
  • lucenticus/vlc
  • knr1931/vlc
  • kjoonlee/vlc
  • chandrakant100/vlc-qt
  • johge42/vlc
  • polter/vlc
  • hexchain/vlc
  • Tushwrld/vlc
  • mztea928/vlc
  • jbelloncastro/vlc
  • alvinhochun/vlc
  • ghostpiratecrow/vlc
  • ujjwaltwitx/vlc
  • alexsonarin06/vlc
  • adrianbon76/vlc
  • altsod/vlc
  • damien.lucas44/vlc
  • dmytrivtaisa/vlc
  • utk202/vlc
  • aaxhrj/vlc
  • thomas.hermes/vlc
  • structurenewworldorder/vlc
  • slomo/vlc
  • wantlamy/vlc
  • musc.o3cminc/vlc
  • thebarshablog/vlc
  • kerrick/vlc
  • kratos142518/vlc
  • leogps/vlc
  • vacantron/vlc
  • luna_koly/vlc
  • Ratio2/vlc
  • anuoshemohammad/vlc
  • apsun/vlc
  • aaa1115910/vlc
  • alimotmoyo/vlc
  • Ambossmann/vlc
  • Sam-LearnsToCode/vlc
  • Chilledheart/vlc
  • Labnann/vlc
  • ktcoooot1/vlc
  • mohit-marathe/vlc
  • johnddx/vlc
  • manstabuk/vlc
  • Omar-ahmed314/vlc
  • vineethkm/vlc
  • 9Enemi86/vlc
  • radoslav.m.panteleev/vlc
  • ashishami2002/vlc
  • Corbax/vlc
  • firnasahmed/vlc
  • pelayarmalam4/vlc
  • c0ff330k/vlc
  • shikhindahikar/vlc
  • l342723951/vlc
  • christianschwandner/vlc
  • douniwan5788/vlc
  • 7damian7/vlc
  • ferdnyc/vlc
  • f.ales1/vlc
  • pandagby/vlc
  • BaaBaa/vlc
  • jewe37/vlc
  • w00drow/vlc
  • russelltg/vlc
  • ironicallygod/vlc
  • soumyaDghosh/vlc
  • linzihao1999/vlc
  • deyayush6/vlc
  • mibi88/vlc
  • newabdallah10/vlc
  • jhorbincolombia/vlc
  • rimvihaqueshupto/vlc
  • andrewkhon98/vlc
  • fab78/vlc
  • lapaz17/vlc
  • amanna13/vlc
  • mdakram28/vlc
  • 07jw1980/vlc
  • sohamgupta/vlc
  • Eson-Jia1/vlc
  • Sumou/vlc
  • vikram-kangotra/vlc
  • chalice191/vlc
  • olivercalder/vlc
  • aaasg4001/vlc
  • zipdox/vlc
  • kwizart/vlc
  • Dragon-S/vlc
  • jdemeule/vlc
  • gabriel_lt/vlc
  • locutusofborg/vlc
  • sammirata/vlc-librist
  • another/vlc
  • Benjamin_Loison/vlc
  • ahmedmoselhi/vlc
  • petergaal/vlc
  • huynhsontung/vlc
  • dariusmihut/vlc
  • tvermaashutosh/vlc
  • buti/vlc
  • Niram7777/vlc
  • rohan-here/vlc
  • balaji-sivasakthi/vlc
  • rlindner81/vlc
  • Kakadus/vlc
  • djain/vlc
  • ABBurmeister/vlc
  • craighuggins/vlc
  • orbea/vlc
  • maxos/vlc
  • aakarshmj/vlc
  • kblaschke/vlc
  • ankitm/vlc
  • advait-0/vlc
  • mohak2003/vlc
  • yselkowitz/vlc
  • AZM999/vlc-azm
  • andrey.turkin/vlc
  • Disha-Baghel/vlc
  • nowrep/vlc
  • Apeng/vlc
  • Choucroute_melba/vlc
  • autra/vlc
  • eclipseo/vlc
  • fhuber/vlc
  • olafhering/vlc
  • sdasda7777/vlc
  • 1div0/vlc
  • skosnits/vlc-extended-playlist-support
  • dnicolson/vlc
  • Timshel/vlc
  • octopols/vlc
  • MangalK/vlc
  • nima64/vlc
  • misawai/vlc
  • Alexander-Wilms/vlc
  • Maxime2/vlc-fork-for-visualizer
  • ww/vlc
  • jeske/vlc
  • sgross-emlix/vlc
  • morenonatural/vlc
  • freakingLovesVLC/vlc
  • borisgolovnev/vlc
  • mpromonet/vlc
  • diogo.simao-marques/vlc
  • masstock/vlc
  • pratikpatel8982/vlc
  • hugok79/vlc
  • longervision/vlc
  • abhiudaysurya/vlc
  • rishabhgarg/vlc
  • tumic/vlc
  • cart/vlc
  • shubham442/vlc
  • Aditya692005/vlc
  • sammirata/vlc4
  • syrykh/vlc
  • Vvorcun/macos-new-icon
  • AyaanshC/vlc
  • nasso/vlc
  • Quark/vlc
  • sebastinas/vlc
  • rhstone/vlc
  • talregev/vlc
  • Managor/vlc
403 results
Show changes
Commits on Source (8)
Showing
with 106 additions and 231 deletions
......@@ -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 */
......@@ -672,11 +671,6 @@ struct es_format_t
};
/**
* This function will fill all RGB shift from RGB masks.
*/
VLC_API void video_format_FixRgb( video_format_t * );
/**
* This function will initialize a es_format_t structure.
*/
......
......@@ -343,10 +343,6 @@
/* Palettized RGB with palette element R:G:B */
#define VLC_CODEC_RGBP VLC_FOURCC('R','G','B','P')
/* 15-bit RGB padded to 16 bits (using explicit masks) */
#define VLC_CODEC_RGB15 VLC_FOURCC('R','V','1','5')
/* 16-bit RGB (using explicit masks) */
#define VLC_CODEC_RGB16 VLC_FOURCC('R','V','1','6')
/* 32-bit RGB, in memory address order: "XRGB" ignoring the x component */
#define VLC_CODEC_XRGB VLC_FOURCC('R','V','3','2')
......@@ -365,7 +361,7 @@
/* 16-bit RGB Big-Endian: "R5G6B5" */
#define VLC_CODEC_RGB565BE VLC_FOURCC('R','B','1','6')
/* 16-bit RGB Little-Endian: "g3B5 R5G3" */
#define VLC_CODEC_RGB565LE VLC_FOURCC('R','L','1','6')
#define VLC_CODEC_RGB565LE VLC_FOURCC('R','V','1','6')
/* 16-bit BGR Big-Endian: "B5G6R5" */
#define VLC_CODEC_BGR565BE VLC_FOURCC('B','B','1','6')
/* 16-bit BGR Little-Endian: "g3R5 B5G3" */
......@@ -386,7 +382,7 @@
/* 15-bit RGB Big-Endian: "0R5G5B5" */
#define VLC_CODEC_RGB555BE VLC_FOURCC('R','B','1','5')
/* 15-bit RGB Little-Endian: "g3B5 0R5G2" */
#define VLC_CODEC_RGB555LE VLC_FOURCC('R','L','1','5')
#define VLC_CODEC_RGB555LE VLC_FOURCC('R','V','1','5')
/* 15-bit BGR Big-Endian: "0B5G5R5" */
#define VLC_CODEC_BGR555BE VLC_FOURCC('B','B','1','5')
/* 15-bit BGR Little-Endian: "g3R5 0B5G2" */
......
......@@ -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;
......
......@@ -220,7 +220,6 @@ static rfbBool mallocFrameBufferHandler( rfbClient* p_client )
/* Fill input format */
fmt.video.i_chroma = i_chroma;
video_format_FixRgb(&fmt.video);
fmt.video.i_visible_width =
fmt.video.i_width = i_width;
......
......@@ -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;
......
......@@ -41,10 +41,10 @@
*****************************************************************************/
#if defined(WORDS_BIGENDIAN)
# define VLC_RGB_ES( fcc, leid, beid ) \
{ fcc, beid, 0, 0, 0 },
{ fcc, beid },
#else
# define VLC_RGB_ES( fcc, leid, beid ) \
{ fcc, leid, 0, 0, 0 },
{ fcc, leid },
#endif
#define VLC_RGB( fcc, leid, beid, rmask, gmask, bmask ) \
......@@ -57,173 +57,167 @@ static const struct
{
vlc_fourcc_t i_chroma;
enum AVPixelFormat i_chroma_id;
uint32_t i_rmask;
uint32_t i_gmask;
uint32_t i_bmask;
} chroma_table[] =
{
/* Planar YUV formats */
{VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 },
{VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 },
{VLC_CODEC_I444, AV_PIX_FMT_YUV444P },
{VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P },
{VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 },
{VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 },
{VLC_CODEC_I440, AV_PIX_FMT_YUV440P },
{VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P },
{VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 },
{VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 },
{VLC_CODEC_I422, AV_PIX_FMT_YUV422P },
{VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P },
{VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 },
{VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 },
{VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 },
{VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_CODEC_YV9, AV_PIX_FMT_YUV410P, 0, 0, 0 },
{VLC_CODEC_I420, AV_PIX_FMT_YUV420P },
{VLC_CODEC_YV12, AV_PIX_FMT_YUV420P },
{VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P },
{VLC_CODEC_I411, AV_PIX_FMT_YUV411P },
{VLC_CODEC_I410, AV_PIX_FMT_YUV410P },
{VLC_CODEC_YV9, AV_PIX_FMT_YUV410P },
{VLC_CODEC_NV12, AV_PIX_FMT_NV12, 0, 0, 0 },
{VLC_CODEC_NV21, AV_PIX_FMT_NV21, 0, 0, 0 },
{VLC_CODEC_NV12, AV_PIX_FMT_NV12 },
{VLC_CODEC_NV21, AV_PIX_FMT_NV21 },
{VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 },
{VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 },
{VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 },
{VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 },
{VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE },
{VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE },
{VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE },
{VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE },
#ifdef AV_PIX_FMT_YUV420P12 /* 54, 17, 100 */
{VLC_CODEC_I420_12L, AV_PIX_FMT_YUV420P12LE, 0, 0, 0 },
{VLC_CODEC_I420_12B, AV_PIX_FMT_YUV420P12BE, 0, 0, 0 },
{VLC_CODEC_I420_12L, AV_PIX_FMT_YUV420P12LE },
{VLC_CODEC_I420_12B, AV_PIX_FMT_YUV420P12BE },
#endif
{VLC_CODEC_I420_16L, AV_PIX_FMT_YUV420P16LE, 0, 0, 0 },
{VLC_CODEC_I420_16B, AV_PIX_FMT_YUV420P16BE, 0, 0, 0 },
{VLC_CODEC_I420_16L, AV_PIX_FMT_YUV420P16LE },
{VLC_CODEC_I420_16B, AV_PIX_FMT_YUV420P16BE },
#ifdef AV_PIX_FMT_P010LE
{VLC_CODEC_P010, AV_PIX_FMT_P010LE, 0, 0, 0 },
{VLC_CODEC_P010, AV_PIX_FMT_P010LE },
#endif
#ifdef AV_PIX_FMT_P016LE
{VLC_CODEC_P016, AV_PIX_FMT_P016LE, 0, 0, 0 },
{VLC_CODEC_P016, AV_PIX_FMT_P016LE },
#endif
{VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 },
{VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 },
{VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 },
{VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 },
{VLC_CODEC_I422_16L, AV_PIX_FMT_YUV422P16LE, 0, 0, 0 },
{VLC_CODEC_I422_16B, AV_PIX_FMT_YUV422P16BE, 0, 0, 0 },
{VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE },
{VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE },
{VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE },
{VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE },
{VLC_CODEC_I422_16L, AV_PIX_FMT_YUV422P16LE },
{VLC_CODEC_I422_16B, AV_PIX_FMT_YUV422P16BE },
#ifdef AV_PIX_FMT_YUV422P12 /* 54, 17, 100 */
{VLC_CODEC_I422_12L, AV_PIX_FMT_YUV422P12LE, 0, 0, 0 },
{VLC_CODEC_I422_12B, AV_PIX_FMT_YUV422P12BE, 0, 0, 0 },
{VLC_CODEC_I422_12L, AV_PIX_FMT_YUV422P12LE },
{VLC_CODEC_I422_12B, AV_PIX_FMT_YUV422P12BE },
#endif
{VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 },
{VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 },
{VLC_CODEC_YUVA, AV_PIX_FMT_YUVA444P, 0, 0, 0 },
{VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P },
{VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P },
{VLC_CODEC_YUVA, AV_PIX_FMT_YUVA444P },
{VLC_CODEC_YUVA_444_10L, AV_PIX_FMT_YUVA444P10LE, 0, 0, 0 },
{VLC_CODEC_YUVA_444_10B, AV_PIX_FMT_YUVA444P10BE, 0, 0, 0 },
{VLC_CODEC_YUVA_444_10L, AV_PIX_FMT_YUVA444P10LE },
{VLC_CODEC_YUVA_444_10B, AV_PIX_FMT_YUVA444P10BE },
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(56, 24, 101)
{VLC_CODEC_YUVA_444_12L, AV_PIX_FMT_YUVA444P12LE, 0, 0, 0 },
{VLC_CODEC_YUVA_444_12B, AV_PIX_FMT_YUVA444P12BE, 0, 0, 0 },
{VLC_CODEC_YUVA_444_12L, AV_PIX_FMT_YUVA444P12LE },
{VLC_CODEC_YUVA_444_12B, AV_PIX_FMT_YUVA444P12BE },
#endif
{VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 },
{VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 },
{VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 },
{VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 },
{VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE },
{VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE },
{VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE },
{VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE },
#ifdef AV_PIX_FMT_YUV444P12 /* 54, 17, 100 */
{VLC_CODEC_I444_12L, AV_PIX_FMT_YUV444P12LE, 0, 0, 0 },
{VLC_CODEC_I444_12B, AV_PIX_FMT_YUV444P12BE, 0, 0, 0 },
{VLC_CODEC_I444_12L, AV_PIX_FMT_YUV444P12LE },
{VLC_CODEC_I444_12B, AV_PIX_FMT_YUV444P12BE },
#endif
{VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 },
{VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 },
{VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE },
{VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE },
/* Packed YUV formats */
{VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422, 0, 0, 0 },
{VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, 0, 0, 0 },
{VLC_CODEC_YVYU, AV_PIX_FMT_YVYU422, 0, 0, 0 },
{VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422 },
{VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422 },
{VLC_CODEC_YVYU, AV_PIX_FMT_YVYU422 },
/* Packed RGB formats */
{VLC_CODEC_RGB233, AV_PIX_FMT_RGB8, 0, 0, 0 },
{VLC_CODEC_BGR233, AV_PIX_FMT_BGR8, 0, 0, 0 },
{VLC_CODEC_RGB233, AV_PIX_FMT_RGB8 },
{VLC_CODEC_BGR233, AV_PIX_FMT_BGR8 },
{VLC_CODEC_RGB565BE, AV_PIX_FMT_RGB565BE, 0, 0, 0 },
{VLC_CODEC_RGB565LE, AV_PIX_FMT_RGB565LE, 0, 0, 0 },
{VLC_CODEC_BGR565BE, AV_PIX_FMT_BGR565BE, 0, 0, 0 },
{VLC_CODEC_BGR565LE, AV_PIX_FMT_BGR565LE, 0, 0, 0 },
{VLC_CODEC_RGB565BE, AV_PIX_FMT_RGB565BE },
{VLC_CODEC_RGB565LE, AV_PIX_FMT_RGB565LE },
{VLC_CODEC_BGR565BE, AV_PIX_FMT_BGR565BE },
{VLC_CODEC_BGR565LE, AV_PIX_FMT_BGR565LE },
{VLC_CODEC_RGB555BE, AV_PIX_FMT_RGB555BE, 0, 0, 0 },
{VLC_CODEC_RGB555LE, AV_PIX_FMT_RGB555LE, 0, 0, 0 },
{VLC_CODEC_BGR555BE, AV_PIX_FMT_BGR555BE, 0, 0, 0 },
{VLC_CODEC_BGR555LE, AV_PIX_FMT_BGR555LE, 0, 0, 0 },
{VLC_CODEC_RGB555BE, AV_PIX_FMT_RGB555BE },
{VLC_CODEC_RGB555LE, AV_PIX_FMT_RGB555LE },
{VLC_CODEC_BGR555BE, AV_PIX_FMT_BGR555BE },
{VLC_CODEC_BGR555LE, AV_PIX_FMT_BGR555LE },
VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f )
VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f )
{VLC_CODEC_RGB24, AV_PIX_FMT_RGB24 },
{VLC_CODEC_BGR24, AV_PIX_FMT_BGR24 },
{VLC_CODEC_RGB24, AV_PIX_FMT_RGB24, 0, 0, 0 },
{VLC_CODEC_BGR24, AV_PIX_FMT_BGR24, 0, 0, 0 },
{VLC_CODEC_RGBX, AV_PIX_FMT_RGB0 },
{VLC_CODEC_XRGB, AV_PIX_FMT_0RGB },
{VLC_CODEC_BGRX, AV_PIX_FMT_BGR0 },
{VLC_CODEC_XBGR, AV_PIX_FMT_0BGR },
{VLC_CODEC_RGBX, AV_PIX_FMT_RGB0, 0, 0, 0 },
{VLC_CODEC_XRGB, AV_PIX_FMT_0RGB, 0, 0, 0 },
{VLC_CODEC_BGRX, AV_PIX_FMT_BGR0, 0, 0, 0 },
{VLC_CODEC_XBGR, AV_PIX_FMT_0BGR, 0, 0, 0 },
{VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 },
{VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 },
{VLC_CODEC_BGRA, AV_PIX_FMT_BGRA, 0, 0, 0 },
{VLC_CODEC_ABGR, AV_PIX_FMT_ABGR, 0, 0, 0 },
{VLC_CODEC_RGBA, AV_PIX_FMT_RGBA },
{VLC_CODEC_ARGB, AV_PIX_FMT_ARGB },
{VLC_CODEC_BGRA, AV_PIX_FMT_BGRA },
{VLC_CODEC_ABGR, AV_PIX_FMT_ABGR },
#ifdef WORDS_BIGENDIAN
{VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64BE, 0, 0, 0 },
{VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64BE },
#else /* !WORDS_BIGENDIAN */
{VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64LE, 0, 0, 0 },
{VLC_CODEC_RGBA64, AV_PIX_FMT_RGBA64LE },
#endif /* !WORDS_BIGENDIAN */
#ifdef AV_PIX_FMT_X2BGR10
{VLC_CODEC_RGBA10, AV_PIX_FMT_X2BGR10, 0, 0, 0 },
{VLC_CODEC_RGBA10, AV_PIX_FMT_X2BGR10 },
#endif
{VLC_CODEC_GREY, AV_PIX_FMT_GRAY8, 0, 0, 0},
{VLC_CODEC_GREY, AV_PIX_FMT_GRAY8 },
#ifdef AV_PIX_FMT_GRAY10
{VLC_CODEC_GREY_10L, AV_PIX_FMT_GRAY10LE, 0, 0, 0},
{VLC_CODEC_GREY_10B, AV_PIX_FMT_GRAY10BE, 0, 0, 0},
{VLC_CODEC_GREY_10L, AV_PIX_FMT_GRAY10LE },
{VLC_CODEC_GREY_10B, AV_PIX_FMT_GRAY10BE },
#endif
#ifdef AV_PIX_FMT_GRAY12
{VLC_CODEC_GREY_12L, AV_PIX_FMT_GRAY12LE, 0, 0, 0},
{VLC_CODEC_GREY_12B, AV_PIX_FMT_GRAY12BE, 0, 0, 0},
{VLC_CODEC_GREY_12L, AV_PIX_FMT_GRAY12LE },
{VLC_CODEC_GREY_12B, AV_PIX_FMT_GRAY12BE },
#endif
{VLC_CODEC_GREY_16L, AV_PIX_FMT_GRAY16LE, 0, 0, 0},
{VLC_CODEC_GREY_16B, AV_PIX_FMT_GRAY16BE, 0, 0, 0},
{VLC_CODEC_GREY_16L, AV_PIX_FMT_GRAY16LE },
{VLC_CODEC_GREY_16B, AV_PIX_FMT_GRAY16BE },
/* Paletized RGB */
{VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0},
{VLC_CODEC_RGBP, AV_PIX_FMT_PAL8 },
{VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_9L, AV_PIX_FMT_GBRP9LE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_9B, AV_PIX_FMT_GBRP9BE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_10L, AV_PIX_FMT_GBRP10LE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_10B, AV_PIX_FMT_GBRP10BE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP },
{VLC_CODEC_GBR_PLANAR_9L, AV_PIX_FMT_GBRP9LE },
{VLC_CODEC_GBR_PLANAR_9B, AV_PIX_FMT_GBRP9BE },
{VLC_CODEC_GBR_PLANAR_10L, AV_PIX_FMT_GBRP10LE },
{VLC_CODEC_GBR_PLANAR_10B, AV_PIX_FMT_GBRP10BE },
#ifdef AV_PIX_FMT_GBRP12 /* 55, 24, 0 / 51, 74, 100 */
{VLC_CODEC_GBR_PLANAR_12L, AV_PIX_FMT_GBRP12LE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_12B, AV_PIX_FMT_GBRP12BE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_12L, AV_PIX_FMT_GBRP12LE },
{VLC_CODEC_GBR_PLANAR_12B, AV_PIX_FMT_GBRP12BE },
#endif
#ifdef AV_PIX_FMT_GBRP14 /* ffmpeg only */
{VLC_CODEC_GBR_PLANAR_14L, AV_PIX_FMT_GBRP14LE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_14B, AV_PIX_FMT_GBRP14BE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_14L, AV_PIX_FMT_GBRP14LE },
{VLC_CODEC_GBR_PLANAR_14B, AV_PIX_FMT_GBRP14BE },
#endif
{VLC_CODEC_GBR_PLANAR_16L, AV_PIX_FMT_GBRP16LE, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_16B, AV_PIX_FMT_GBRP16BE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR, AV_PIX_FMT_GBRAP, 0, 0, 0 },
{VLC_CODEC_GBR_PLANAR_16L, AV_PIX_FMT_GBRP16LE },
{VLC_CODEC_GBR_PLANAR_16B, AV_PIX_FMT_GBRP16BE },
{VLC_CODEC_GBRA_PLANAR, AV_PIX_FMT_GBRAP },
#ifdef AV_PIX_FMT_GBRAP10 /* 56, 1, 0 / 55, 25, 100 */
{VLC_CODEC_GBRA_PLANAR_10L, AV_PIX_FMT_GBRAP10LE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_10B, AV_PIX_FMT_GBRAP10BE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_10L, AV_PIX_FMT_GBRAP10LE },
{VLC_CODEC_GBRA_PLANAR_10B, AV_PIX_FMT_GBRAP10BE },
#endif
#ifdef AV_PIX_FMT_GBRAP12 /* 55, 25, 0, 19, 100 */
{VLC_CODEC_GBRA_PLANAR_12L, AV_PIX_FMT_GBRAP12LE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_12B, AV_PIX_FMT_GBRAP12BE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_12L, AV_PIX_FMT_GBRAP12LE },
{VLC_CODEC_GBRA_PLANAR_12B, AV_PIX_FMT_GBRAP12BE },
#endif
{VLC_CODEC_GBRA_PLANAR_16L, AV_PIX_FMT_GBRAP16LE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_16B, AV_PIX_FMT_GBRAP16BE, 0, 0, 0 },
{VLC_CODEC_GBRA_PLANAR_16L, AV_PIX_FMT_GBRAP16LE },
{VLC_CODEC_GBRA_PLANAR_16B, AV_PIX_FMT_GBRAP16BE },
/* XYZ */
{VLC_CODEC_XYZ12, AV_PIX_FMT_XYZ12BE, 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
{VLC_CODEC_XYZ12, AV_PIX_FMT_XYZ12BE },
{ 0, 0 }
};
/* FIXME special case the RGB formats */
......@@ -231,28 +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 &&
chroma_table[i].i_rmask == fmt->i_rmask &&
chroma_table[i].i_gmask == fmt->i_gmask &&
chroma_table[i].i_bmask == 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 &&
chroma_table[i].i_rmask == 0 &&
chroma_table[i].i_gmask == 0 &&
chroma_table[i].i_bmask == 0 )
{
return chroma_table[i].i_chroma_id;
}
}
}
return AV_PIX_FMT_NONE;
}
......@@ -270,11 +247,7 @@ int GetVlcChroma( video_format_t *fmt, enum AVPixelFormat i_ffmpeg_chroma )
{
if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma )
{
fmt->i_rmask = chroma_table[i].i_rmask;
fmt->i_gmask = chroma_table[i].i_gmask;
fmt->i_bmask = chroma_table[i].i_bmask;
fmt->i_chroma = chroma_table[i].i_chroma;
video_format_FixRgb( fmt );
return VLC_SUCCESS;
}
}
......
......@@ -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 )
......
......@@ -63,7 +63,6 @@ static const struct vlc_avcodec_fourcc video_codecs[] =
{ VLC_CODEC_MP4V, AV_CODEC_ID_MPEG4 },
{ VLC_CODEC_RGB24, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_BGR24, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB16, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB332, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_RGB233, AV_CODEC_ID_RAWVIDEO },
{ VLC_CODEC_BGR233, AV_CODEC_ID_RAWVIDEO },
......
......@@ -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);
......
......@@ -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;
......
......@@ -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;
......
......@@ -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++)
......
......@@ -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];
......
......@@ -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 };
......
......@@ -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;
......
......@@ -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)
......
......@@ -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 ) )
......
......@@ -320,7 +320,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
{
video_format_t vfmt;
video_format_Copy(&vfmt, &fmt->video);
video_format_FixRgb(&vfmt);
enum AVPixelFormat avformat = GetFfmpegChroma(&vfmt);
if(avformat == AV_PIX_FMT_NONE)
msg_Warn(p_mux, "can't match format RAW video %4.4s",
......
......@@ -45,12 +45,6 @@ static const struct
uint32_t i_rmask, i_gmask, i_bmask, i_amask;
uint8_t depth;
} bitmap_rgb_masks[] = {
{ VLC_CODEC_RGB15, 0x7c00, /* FIXME it should be B5G5R5LE */
0x03e0,
0x001f, 0x0000, 15 },
{ VLC_CODEC_RGB16, 0xf800, /* FIXME it should be B5G6R5LE */
0x07e0,
0x001f, 0x0000, 16 },
{ VLC_CODEC_XRGB, 0x00ff0000,
0x0000ff00,
0x000000ff,
......@@ -112,22 +106,6 @@ static const struct
0x0000, 15 },
};
static inline void SetBitmapRGBMasks( vlc_fourcc_t i_fourcc, video_format_t *fmt )
{
for( size_t i=0; i<ARRAY_SIZE(bitmap_rgb_masks); i++ )
{
if( bitmap_rgb_masks[i].codec == i_fourcc )
{
fmt->i_rmask = bitmap_rgb_masks[i].i_rmask;
fmt->i_gmask = bitmap_rgb_masks[i].i_gmask;
fmt->i_bmask = bitmap_rgb_masks[i].i_bmask;
fmt->i_chroma = i_fourcc;
video_format_FixRgb( fmt );
break;
}
}
}
struct bitmapinfoheader_properties
{
bool b_flipped;
......@@ -199,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
{
......@@ -242,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);
......@@ -268,8 +240,6 @@ static inline int ParseBitmapInfoHeader( const VLC_BITMAPINFOHEADER *p_bih, size
fmt->i_extra = i_bihextra;
memcpy( fmt->p_extra, p_bihextra, i_bihextra );
}
SetBitmapRGBMasks( fmt->i_codec, &fmt->video );
}
video_format_Setup( &fmt->video, fmt->i_codec,
......@@ -327,11 +297,6 @@ static inline int CreateBitmapInfoHeader( const es_format_t *fmt,
case VLC_CODEC_BGR555LE:
biBitCount = 16;
break;
case VLC_CODEC_RGB16:
case VLC_CODEC_RGB15:
biBitCount = 16;
biCompression = BI_BITFIELDS;
break;
case VLC_CODEC_RGBP:
case VLC_CODEC_GREY:
biBitCount = 8;
......@@ -374,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 );
......
......@@ -782,7 +782,6 @@ ConfigureVideoTrack(demux_t *demux,
fmt->i_codec = chroma;
fmt->video.i_chroma = chroma;
video_format_FixRgb( &fmt->video );
fmt->video.i_width = fmt->video.i_visible_width = options->width;
fmt->video.i_height = fmt->video.i_visible_height = options->height;
fmt->video.i_frame_rate = options->frame_rate;
......