| Message ID | 1635344836-23293-1-git-send-email-lance.lmwang@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8dc8c01d6c237546be7d50b9c40a1440f43d8619 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avutil/parseutils: add qhd(Quad HD) or wqhd(Wide Quad HD) for 1440p | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
lance.lmwang@gmail.com: > From: Limin Wang <lance.lmwang@gmail.com> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavutil/parseutils.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c > index 7f678cd..19bbdde 100644 > --- a/libavutil/parseutils.c > +++ b/libavutil/parseutils.c > @@ -102,6 +102,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { > { "wsxga", 1600,1024 }, > { "wuxga", 1920,1200 }, > { "woxga", 2560,1600 }, > + { "wqhd", 2560,1440 }, > { "wqsxga", 3200,2048 }, > { "wquxga", 3840,2400 }, > { "whsxga", 6400,4096 }, > @@ -111,6 +112,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { > { "hd480", 852, 480 }, > { "hd720", 1280, 720 }, > { "hd1080", 1920,1080 }, > + { "qhd", 2560,1440 }, > { "2k", 2048,1080 }, /* Digital Cinema System Specification */ > { "2kdci", 2048,1080 }, > { "2kflat", 1998,1080 }, > This code added a second qhd abbreviation to this list; it precedes and therefore overrides the earlier dimension of 960x540. Ticket #9591 is about this. According to Wikipedia, qHD is 960x540 (q stands for quarter in this case) and QHD is 2560x1440 (Q is quad). So maybe an ad-hoc check for this would be appropriate? - Andreas
On Mon, Jan 10, 2022 at 07:16:50PM +0100, Andreas Rheinhardt wrote: > lance.lmwang@gmail.com: > > From: Limin Wang <lance.lmwang@gmail.com> > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavutil/parseutils.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c > > index 7f678cd..19bbdde 100644 > > --- a/libavutil/parseutils.c > > +++ b/libavutil/parseutils.c > > @@ -102,6 +102,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { > > { "wsxga", 1600,1024 }, > > { "wuxga", 1920,1200 }, > > { "woxga", 2560,1600 }, > > + { "wqhd", 2560,1440 }, > > { "wqsxga", 3200,2048 }, > > { "wquxga", 3840,2400 }, > > { "whsxga", 6400,4096 }, > > @@ -111,6 +112,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { > > { "hd480", 852, 480 }, > > { "hd720", 1280, 720 }, > > { "hd1080", 1920,1080 }, > > + { "qhd", 2560,1440 }, > > { "2k", 2048,1080 }, /* Digital Cinema System Specification */ > > { "2kdci", 2048,1080 }, > > { "2kflat", 1998,1080 }, > > > > This code added a second qhd abbreviation to this list; it precedes and > therefore overrides the earlier dimension of 960x540. Ticket #9591 is > about this. > According to Wikipedia, qHD is 960x540 (q stands for quarter in this > case) and QHD is 2560x1440 (Q is quad). So maybe an ad-hoc check for > this would be appropriate? Sorry, I'll change the qhd to quadhd to avoid the name conflict. > > - Andreas > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 7f678cd..19bbdde 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -102,6 +102,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "wsxga", 1600,1024 }, { "wuxga", 1920,1200 }, { "woxga", 2560,1600 }, + { "wqhd", 2560,1440 }, { "wqsxga", 3200,2048 }, { "wquxga", 3840,2400 }, { "whsxga", 6400,4096 }, @@ -111,6 +112,7 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "hd480", 852, 480 }, { "hd720", 1280, 720 }, { "hd1080", 1920,1080 }, + { "qhd", 2560,1440 }, { "2k", 2048,1080 }, /* Digital Cinema System Specification */ { "2kdci", 2048,1080 }, { "2kflat", 1998,1080 },