Mercurial > libavcodec.hg
diff ituh263enc.c @ 10832:f20726a6d538 libavcodec
Add a function to match a 2 element vector of uint16_t and use it in h263 and svq1
instead of custom and bloated code to find an index into a w/h array.
author | michael |
---|---|
date | Sat, 09 Jan 2010 18:33:21 +0000 |
parents | d0657e337f91 |
children | f6afc7837f83 |
line wrap: on
line diff
--- a/ituh263enc.c Sat Jan 09 18:12:06 2010 +0000 +++ b/ituh263enc.c Sat Jan 09 18:33:21 2010 +0000 @@ -82,22 +82,6 @@ 19, 2, 1, 34, 35, 36 }; -int h263_get_picture_format(int width, int height) -{ - if (width == 128 && height == 96) - return 1; - else if (width == 176 && height == 144) - return 2; - else if (width == 352 && height == 288) - return 3; - else if (width == 704 && height == 576) - return 4; - else if (width == 1408 && height == 1152) - return 5; - else - return 7; -} - /** * Returns the 4 bit value that specifies the given aspect ratio. * This may be one of the standard aspect ratios or it specifies @@ -156,7 +140,7 @@ put_bits(&s->pb, 1, 0); /* camera off */ put_bits(&s->pb, 1, 0); /* freeze picture release off */ - format = h263_get_picture_format(s->width, s->height); + format = ff_match_2uint16(h263_format, FF_ARRAY_ELEMS(h263_format), s->width, s->height); if (!s->h263_plus) { /* H.263v1 */ put_bits(&s->pb, 3, format);