Re: [FFmpeg-devel] [PATCH 29/29] all: remove rest of YUVJ pixel formats usage
On Sun, Dec 10, 2017 at 08:22:17PM +0100, Paul B Mahol wrote: > On 12/10/17, Michael Niedermayer wrote: > > On Sun, Dec 10, 2017 at 02:14:36PM +0100, Paul B Mahol wrote: > >> Signed-off-by: Paul B Mahol > >> --- > >> fftools/ffmpeg_filter.c | 4 +-- > >> libavcodec/raw.c | 18 +++--- > >> libavcodec/utils.c | 11 -- > >> libavutil/pixdesc.c | 60 > >> > >> libavutil/pixfmt.h | 5 --- > >> libswscale/utils.c | 20 --- > >> tests/fate/vcodec.mak| 12 +++ > >> tests/lavf-regression.sh | 8 ++--- > >> tests/ref/fate/filter-pixdesc-yuvj411p | 1 - > >> tests/ref/fate/filter-pixdesc-yuvj420p | 1 - > >> tests/ref/fate/filter-pixdesc-yuvj422p | 1 - > >> tests/ref/fate/filter-pixdesc-yuvj440p | 1 - > >> tests/ref/fate/filter-pixdesc-yuvj444p | 1 - > >> tests/ref/fate/filter-pixfmts-copy | 5 --- > >> tests/ref/fate/filter-pixfmts-crop | 5 --- > >> tests/ref/fate/filter-pixfmts-field | 5 --- > >> tests/ref/fate/filter-pixfmts-fieldorder | 3 -- > >> tests/ref/fate/filter-pixfmts-hflip | 5 --- > >> tests/ref/fate/filter-pixfmts-il | 5 --- > >> tests/ref/fate/filter-pixfmts-null | 5 --- > >> tests/ref/fate/filter-pixfmts-pad| 5 --- > >> tests/ref/fate/filter-pixfmts-scale | 5 --- > >> tests/ref/fate/filter-pixfmts-swapuv | 5 --- > >> tests/ref/fate/filter-pixfmts-vflip | 5 --- > >> tests/ref/fate/sws-pixdesc-query | 15 > >> tests/ref/lavf/pixfmt| 8 - > >> 26 files changed, 15 insertions(+), 204 deletions(-) > >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj411p > >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj420p > >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj422p > >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj440p > >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj444p > > > > The documentation should explain how a user should replace > > -pix_fmt yuvj* > > vf format=yuvj* > > (and any similar cases) > > > > when these are removed and no longer work > > Where in documentation? whereever you feel it fits best. > FFmpeg cli already warns that one should use non j format > and set color range via color_range option. if something is printed in all cases thats fine too, i thought it wasnt thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you think the mosad wants you dead since a long time then you are either wrong or dead since a long time. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 29/29] all: remove rest of YUVJ pixel formats usage
On 12/10/17, Michael Niedermayer wrote: > On Sun, Dec 10, 2017 at 02:14:36PM +0100, Paul B Mahol wrote: >> Signed-off-by: Paul B Mahol >> --- >> fftools/ffmpeg_filter.c | 4 +-- >> libavcodec/raw.c | 18 +++--- >> libavcodec/utils.c | 11 -- >> libavutil/pixdesc.c | 60 >> >> libavutil/pixfmt.h | 5 --- >> libswscale/utils.c | 20 --- >> tests/fate/vcodec.mak| 12 +++ >> tests/lavf-regression.sh | 8 ++--- >> tests/ref/fate/filter-pixdesc-yuvj411p | 1 - >> tests/ref/fate/filter-pixdesc-yuvj420p | 1 - >> tests/ref/fate/filter-pixdesc-yuvj422p | 1 - >> tests/ref/fate/filter-pixdesc-yuvj440p | 1 - >> tests/ref/fate/filter-pixdesc-yuvj444p | 1 - >> tests/ref/fate/filter-pixfmts-copy | 5 --- >> tests/ref/fate/filter-pixfmts-crop | 5 --- >> tests/ref/fate/filter-pixfmts-field | 5 --- >> tests/ref/fate/filter-pixfmts-fieldorder | 3 -- >> tests/ref/fate/filter-pixfmts-hflip | 5 --- >> tests/ref/fate/filter-pixfmts-il | 5 --- >> tests/ref/fate/filter-pixfmts-null | 5 --- >> tests/ref/fate/filter-pixfmts-pad| 5 --- >> tests/ref/fate/filter-pixfmts-scale | 5 --- >> tests/ref/fate/filter-pixfmts-swapuv | 5 --- >> tests/ref/fate/filter-pixfmts-vflip | 5 --- >> tests/ref/fate/sws-pixdesc-query | 15 >> tests/ref/lavf/pixfmt| 8 - >> 26 files changed, 15 insertions(+), 204 deletions(-) >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj411p >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj420p >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj422p >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj440p >> delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj444p > > The documentation should explain how a user should replace > -pix_fmt yuvj* > vf format=yuvj* > (and any similar cases) > > when these are removed and no longer work Where in documentation? FFmpeg cli already warns that one should use non j format and set color range via color_range option. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH 29/29] all: remove rest of YUVJ pixel formats usage
On Sun, Dec 10, 2017 at 02:14:36PM +0100, Paul B Mahol wrote: > Signed-off-by: Paul B Mahol > --- > fftools/ffmpeg_filter.c | 4 +-- > libavcodec/raw.c | 18 +++--- > libavcodec/utils.c | 11 -- > libavutil/pixdesc.c | 60 > > libavutil/pixfmt.h | 5 --- > libswscale/utils.c | 20 --- > tests/fate/vcodec.mak| 12 +++ > tests/lavf-regression.sh | 8 ++--- > tests/ref/fate/filter-pixdesc-yuvj411p | 1 - > tests/ref/fate/filter-pixdesc-yuvj420p | 1 - > tests/ref/fate/filter-pixdesc-yuvj422p | 1 - > tests/ref/fate/filter-pixdesc-yuvj440p | 1 - > tests/ref/fate/filter-pixdesc-yuvj444p | 1 - > tests/ref/fate/filter-pixfmts-copy | 5 --- > tests/ref/fate/filter-pixfmts-crop | 5 --- > tests/ref/fate/filter-pixfmts-field | 5 --- > tests/ref/fate/filter-pixfmts-fieldorder | 3 -- > tests/ref/fate/filter-pixfmts-hflip | 5 --- > tests/ref/fate/filter-pixfmts-il | 5 --- > tests/ref/fate/filter-pixfmts-null | 5 --- > tests/ref/fate/filter-pixfmts-pad| 5 --- > tests/ref/fate/filter-pixfmts-scale | 5 --- > tests/ref/fate/filter-pixfmts-swapuv | 5 --- > tests/ref/fate/filter-pixfmts-vflip | 5 --- > tests/ref/fate/sws-pixdesc-query | 15 > tests/ref/lavf/pixfmt| 8 - > 26 files changed, 15 insertions(+), 204 deletions(-) > delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj411p > delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj420p > delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj422p > delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj440p > delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj444p The documentation should explain how a user should replace -pix_fmt yuvj* vf format=yuvj* (and any similar cases) when these are removed and no longer work [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Frequently ignored answer#1 FFmpeg bugs should be sent to our bugtracker. User questions about the command line tools should be sent to the ffmpeg-user ML. And questions about how to use libav* should be sent to the libav-user ML. signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH 29/29] all: remove rest of YUVJ pixel formats usage
Signed-off-by: Paul B Mahol --- fftools/ffmpeg_filter.c | 4 +-- libavcodec/raw.c | 18 +++--- libavcodec/utils.c | 11 -- libavutil/pixdesc.c | 60 libavutil/pixfmt.h | 5 --- libswscale/utils.c | 20 --- tests/fate/vcodec.mak| 12 +++ tests/lavf-regression.sh | 8 ++--- tests/ref/fate/filter-pixdesc-yuvj411p | 1 - tests/ref/fate/filter-pixdesc-yuvj420p | 1 - tests/ref/fate/filter-pixdesc-yuvj422p | 1 - tests/ref/fate/filter-pixdesc-yuvj440p | 1 - tests/ref/fate/filter-pixdesc-yuvj444p | 1 - tests/ref/fate/filter-pixfmts-copy | 5 --- tests/ref/fate/filter-pixfmts-crop | 5 --- tests/ref/fate/filter-pixfmts-field | 5 --- tests/ref/fate/filter-pixfmts-fieldorder | 3 -- tests/ref/fate/filter-pixfmts-hflip | 5 --- tests/ref/fate/filter-pixfmts-il | 5 --- tests/ref/fate/filter-pixfmts-null | 5 --- tests/ref/fate/filter-pixfmts-pad| 5 --- tests/ref/fate/filter-pixfmts-scale | 5 --- tests/ref/fate/filter-pixfmts-swapuv | 5 --- tests/ref/fate/filter-pixfmts-vflip | 5 --- tests/ref/fate/sws-pixdesc-query | 15 tests/ref/lavf/pixfmt| 8 - 26 files changed, 15 insertions(+), 204 deletions(-) delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj411p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj420p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj422p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj440p delete mode 100644 tests/ref/fate/filter-pixdesc-yuvj444p diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index e69bfe295c..3aad564b81 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -42,12 +42,10 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodecID codec_id, const enum AVPixelFormat default_formats[]) { static const enum AVPixelFormat mjpeg_formats[] = -{ AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, - AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, +{ AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }; static const enum AVPixelFormat ljpeg_formats[] = { AV_PIX_FMT_BGR24 , AV_PIX_FMT_BGRA, AV_PIX_FMT_BGR0, - AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUV420P , AV_PIX_FMT_YUV444P , AV_PIX_FMT_YUV422P, AV_PIX_FMT_NONE}; diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 8da2a9735e..e19049b455 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -39,13 +39,6 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, { AV_PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') }, { AV_PIX_FMT_YUV422P, MKTAG('Y', 'V', '1', '6') }, -/* yuvjXXX formats are deprecated hacks specific to libav*, - they are identical to yuvXXX */ -{ AV_PIX_FMT_YUVJ420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ -{ AV_PIX_FMT_YUVJ420P, MKTAG('I', 'Y', 'U', 'V') }, -{ AV_PIX_FMT_YUVJ420P, MKTAG('Y', 'V', '1', '2') }, -{ AV_PIX_FMT_YUVJ422P, MKTAG('Y', '4', '2', 'B') }, -{ AV_PIX_FMT_YUVJ422P, MKTAG('P', '4', '2', '2') }, { AV_PIX_FMT_GRAY8,MKTAG('Y', '8', '0', '0') }, { AV_PIX_FMT_GRAY8,MKTAG('Y', '8', ' ', ' ') }, @@ -102,11 +95,8 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_BGR24,MKTAG('B', 'G', 'R', 24 ) }, { AV_PIX_FMT_YUV411P, MKTAG('4', '1', '1', 'P') }, { AV_PIX_FMT_YUV422P, MKTAG('4', '2', '2', 'P') }, -{ AV_PIX_FMT_YUVJ422P, MKTAG('4', '2', '2', 'P') }, { AV_PIX_FMT_YUV440P, MKTAG('4', '4', '0', 'P') }, -{ AV_PIX_FMT_YUVJ440P, MKTAG('4', '4', '0', 'P') }, { AV_PIX_FMT_YUV444P, MKTAG('4', '4', '4', 'P') }, -{ AV_PIX_FMT_YUVJ444P, MKTAG('4', '4', '4', 'P') }, { AV_PIX_FMT_MONOWHITE,MKTAG('B', '1', 'W', '0') }, { AV_PIX_FMT_MONOBLACK,MKTAG('B', '0', 'W', '1') }, { AV_PIX_FMT_BGR8, MKTAG('B', 'G', 'R', 8 ) }, @@ -247,10 +237,10 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = { { AV_PIX_FMT_YUV422P, MKTAG('I', '4', '2', '2') }, { AV_PIX_FMT_YUV440P, MKTAG('I', '4', '4', '0') }, { AV_PIX_FMT_YUV444P, MKTAG('I', '4', '4', '4') }, -{ AV_PIX_FMT_YUVJ420P,MKTAG('J', '4', '2', '0') }, -{ AV_PIX_FMT_YUVJ422P,MKTAG('J', '4', '2', '2') }, -{ AV_PIX_FMT_YUVJ440P,MKTAG('J', '4', '4', '0') }, -{ AV_PIX_FMT_YUVJ444P,MKTAG('J', '4', '4', '4') }, +{ AV_PIX_FMT_YUV420P, MKTAG('J', '4', '2', '0') }, +{ AV_PIX_FMT_YUV422P, MKTAG('J', '4', '2', '2') }, +{ AV_PIX_FMT_YUV440P, MKTAG('J', '4', '4', '0') }, +{ AV_PIX_FMT_YUV444P, MKTAG('J', '4', '4', '4')