History

mtv: make output endian independant

should fix fate-mtv test

Michael Niedermayer committed 14 years ago

Commit b9777791 parent 86709ce2 files · +41 −55Browse files

Unified · Split

2 files
  1. libavformat/mtv.c +1 −15
  2. tests/ref/fate/mtv +40 −40
libavformat/mtv.c+1−15
@@ -136,7 +136,7 @@ static int mtv_read_header(AVFormatContext *s) · 135 unmodified lines
136 avpriv_set_pts_info(st, 64, 1, mtv->video_fps);136 avpriv_set_pts_info(st, 64, 1, mtv->video_fps);
137 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;137 st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
138 st->codec->codec_id = CODEC_ID_RAWVIDEO;138 st->codec->codec_id = CODEC_ID_RAWVIDEO;
139 st->codec->pix_fmt = PIX_FMT_RGB565;139 st->codec->pix_fmt = PIX_FMT_RGB565BE;
140 st->codec->width = mtv->img_width;140 st->codec->width = mtv->img_width;
141 st->codec->height = mtv->img_height;141 st->codec->height = mtv->img_height;
142 st->codec->sample_rate = mtv->video_fps;142 st->codec->sample_rate = mtv->video_fps;
@@ -169,9 +169,6 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) · 26 unmodified lines
169 MTVDemuxContext *mtv = s->priv_data;169 MTVDemuxContext *mtv = s->priv_data;
170 AVIOContext *pb = s->pb;170 AVIOContext *pb = s->pb;
171 int ret;171 int ret;
172#if !HAVE_BIGENDIAN
173 int i;
174#endif
175 172
176 if((avio_tell(pb) - s->data_offset + mtv->img_segment_size) % mtv->full_segment_size)173 if((avio_tell(pb) - s->data_offset + mtv->img_segment_size) % mtv->full_segment_size)
177 {174 {
@@ -190,17 +187,6 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt) · 12 unmodified lines
190 if(ret < 0)187 if(ret < 0)
191 return ret;188 return ret;
192 189
193#if !HAVE_BIGENDIAN
194
195 /* pkt->data is GGGRRRR BBBBBGGG
196 * and we need RRRRRGGG GGGBBBBB
197 * for PIX_FMT_RGB565 so here we
198 * just swap bytes as they come
199 */
200
201 for(i=0;i<ret/2;i++)
202 *((uint16_t *)pkt->data+i) = av_bswap16(*((uint16_t *)pkt->data+i));
203#endif
204 pkt->stream_index = 0;190 pkt->stream_index = 0;
205 }191 }
206 192
tests/ref/fate/mtv+40−40
@@ -1,138 +1,138 @@
1#tb 0: 1/161#tb 0: 1/16
2#tb 1: 1/441002#tb 1: 1/44100
30, 0, 0, 1, 12288, 0x80398ebc30, 0, 0, 1, 12288, 0xc2258ebc
41, 0, 0, 1152, 417, 0xae1cc66a41, 0, 0, 1152, 417, 0xae1cc66a
51, 1152, 1152, 1152, 418, 0xdc3ec85051, 1152, 1152, 1152, 418, 0xdc3ec850
61, 2304, 2304, 1152, 418, 0x4e8ed05f61, 2304, 2304, 1152, 418, 0x4e8ed05f
70, 1, 1, 1, 12288, 0x80398ebc70, 1, 1, 1, 12288, 0xc2258ebc
81, 3456, 3456, 1152, 418, 0xeb43d57481, 3456, 3456, 1152, 418, 0xeb43d574
91, 4608, 4608, 1152, 418, 0x9357c91d91, 4608, 4608, 1152, 418, 0x9357c91d
100, 2, 2, 1, 12288, 0x6678829c100, 2, 2, 1, 12288, 0xb3fe829c
111, 5760, 5760, 1152, 418, 0x5306d16b111, 5760, 5760, 1152, 418, 0x5306d16b
121, 6912, 6912, 1152, 418, 0x46e0d4da121, 6912, 6912, 1152, 418, 0x46e0d4da
131, 8064, 8064, 1152, 418, 0xac11ce79131, 8064, 8064, 1152, 418, 0xac11ce79
140, 3, 3, 1, 12288, 0xda08884a140, 3, 3, 1, 12288, 0x2315884a
151, 9216, 9216, 1152, 418, 0xffdfc4ad151, 9216, 9216, 1152, 418, 0xffdfc4ad
161, 10368, 10368, 1152, 418, 0xf8a8c2ff161, 10368, 10368, 1152, 418, 0xf8a8c2ff
170, 4, 4, 1, 12288, 0x45ae8046170, 4, 4, 1, 12288, 0x95a08046
181, 11520, 11520, 1152, 418, 0x2d66d83f181, 11520, 11520, 1152, 418, 0x2d66d83f
191, 12672, 12672, 1152, 418, 0x65c0da12191, 12672, 12672, 1152, 418, 0x65c0da12
200, 5, 5, 1, 12288, 0x926c886b200, 5, 5, 1, 12288, 0xdb49886b
211, 13824, 13824, 1152, 418, 0x0eafd20f211, 13824, 13824, 1152, 418, 0x0eafd20f
221, 14976, 14976, 1152, 418, 0x8c6dd949221, 14976, 14976, 1152, 418, 0x8c6dd949
231, 16128, 16128, 1152, 418, 0x9094c02d231, 16128, 16128, 1152, 418, 0x9094c02d
240, 6, 6, 1, 12288, 0x926c886b240, 6, 6, 1, 12288, 0xdb49886b
251, 17280, 17280, 1152, 418, 0xb47bd944251, 17280, 17280, 1152, 418, 0xb47bd944
261, 18432, 18432, 1152, 418, 0x935ccce7261, 18432, 18432, 1152, 418, 0x935ccce7
270, 7, 7, 1, 12288, 0x926c886b270, 7, 7, 1, 12288, 0xdb49886b
281, 19584, 19584, 1152, 418, 0x6e3ed020281, 19584, 19584, 1152, 418, 0x6e3ed020
291, 20736, 20736, 1152, 418, 0x8922cd6c291, 20736, 20736, 1152, 418, 0x8922cd6c
301, 21888, 21888, 1152, 418, 0xe811c8f8301, 21888, 21888, 1152, 418, 0xe811c8f8
310, 8, 8, 1, 12288, 0x926c886b310, 8, 8, 1, 12288, 0xdb49886b
321, 23040, 23040, 1152, 418, 0xb84adc72321, 23040, 23040, 1152, 418, 0xb84adc72
331, 24192, 24192, 1152, 418, 0xa2bbc5f4331, 24192, 24192, 1152, 418, 0xa2bbc5f4
340, 9, 9, 1, 12288, 0x926c886b340, 9, 9, 1, 12288, 0xdb49886b
351, 25344, 25344, 1152, 418, 0xec0cb67d351, 25344, 25344, 1152, 418, 0xec0cb67d
361, 26496, 26496, 1152, 418, 0x89d1d014361, 26496, 26496, 1152, 418, 0x89d1d014
370, 10, 10, 1, 12288, 0x926c886b370, 10, 10, 1, 12288, 0xdb49886b
381, 27648, 27648, 1152, 418, 0xfb5bc872381, 27648, 27648, 1152, 418, 0xfb5bc872
391, 28800, 28800, 1152, 417, 0x8bfcc7a0391, 28800, 28800, 1152, 417, 0x8bfcc7a0
401, 29952, 29952, 1152, 418, 0xeb4ac61b401, 29952, 29952, 1152, 418, 0xeb4ac61b
410, 11, 11, 1, 12288, 0x926c886b410, 11, 11, 1, 12288, 0xdb49886b
421, 31104, 31104, 1152, 418, 0xd3cbc3c4421, 31104, 31104, 1152, 418, 0xd3cbc3c4
431, 32256, 32256, 1152, 418, 0xa272d092431, 32256, 32256, 1152, 418, 0xa272d092
440, 12, 12, 1, 12288, 0x926c886b440, 12, 12, 1, 12288, 0xdb49886b
451, 33408, 33408, 1152, 418, 0x611ec37e451, 33408, 33408, 1152, 418, 0x611ec37e
461, 34560, 34560, 1152, 418, 0x70a3d423461, 34560, 34560, 1152, 418, 0x70a3d423
471, 35712, 35712, 1152, 418, 0xeff9ccf4471, 35712, 35712, 1152, 418, 0xeff9ccf4
480, 13, 13, 1, 12288, 0x926c886b480, 13, 13, 1, 12288, 0xdb49886b
491, 36864, 36864, 1152, 418, 0x9788c65b491, 36864, 36864, 1152, 418, 0x9788c65b
501, 38016, 38016, 1152, 418, 0xe9a8cb8c501, 38016, 38016, 1152, 418, 0xe9a8cb8c
510, 14, 14, 1, 12288, 0x926c886b510, 14, 14, 1, 12288, 0xdb49886b
521, 39168, 39168, 1152, 418, 0x5834c300521, 39168, 39168, 1152, 418, 0x5834c300
531, 40320, 40320, 1152, 418, 0xa4b8cd3a531, 40320, 40320, 1152, 418, 0xa4b8cd3a
540, 15, 15, 1, 12288, 0x926c886b540, 15, 15, 1, 12288, 0xdb49886b
551, 41472, 41472, 1152, 418, 0x6de2c7f9551, 41472, 41472, 1152, 418, 0x6de2c7f9
561, 42624, 42624, 1152, 418, 0x961bbbf3561, 42624, 42624, 1152, 418, 0x961bbbf3
571, 43776, 43776, 1152, 418, 0x53edc13a571, 43776, 43776, 1152, 418, 0x53edc13a
580, 16, 16, 1, 12288, 0x45ae8046580, 16, 16, 1, 12288, 0x95a08046
591, 44928, 44928, 1152, 418, 0x2fedc4b0591, 44928, 44928, 1152, 418, 0x2fedc4b0
601, 46080, 46080, 1152, 418, 0xb756c18b601, 46080, 46080, 1152, 418, 0xb756c18b
610, 17, 17, 1, 12288, 0x926c886b610, 17, 17, 1, 12288, 0xdb49886b
621, 47232, 47232, 1152, 418, 0xaf0ed0e4621, 47232, 47232, 1152, 418, 0xaf0ed0e4
631, 48384, 48384, 1152, 418, 0x019fd3f0631, 48384, 48384, 1152, 418, 0x019fd3f0
641, 49536, 49536, 1152, 418, 0x6e29d83e641, 49536, 49536, 1152, 418, 0x6e29d83e
650, 18, 18, 1, 12288, 0x45ae8046650, 18, 18, 1, 12288, 0x95a08046
661, 50688, 50688, 1152, 418, 0x2ddad6bb661, 50688, 50688, 1152, 418, 0x2ddad6bb
671, 51840, 51840, 1152, 418, 0xafefca99671, 51840, 51840, 1152, 418, 0xafefca99
680, 19, 19, 1, 12288, 0x926c886b680, 19, 19, 1, 12288, 0xdb49886b
691, 52992, 52992, 1152, 418, 0x366ed013691, 52992, 52992, 1152, 418, 0x366ed013
701, 54144, 54144, 1152, 418, 0x532ac7e0701, 54144, 54144, 1152, 418, 0x532ac7e0
710, 20, 20, 1, 12288, 0x45ae8046710, 20, 20, 1, 12288, 0x95a08046
721, 55296, 55296, 1152, 418, 0x1d0cd1ce721, 55296, 55296, 1152, 418, 0x1d0cd1ce
731, 56448, 56448, 1152, 417, 0x572ad1e3731, 56448, 56448, 1152, 417, 0x572ad1e3
741, 57600, 57600, 1152, 418, 0x858cd91f741, 57600, 57600, 1152, 418, 0x858cd91f
750, 21, 21, 1, 12288, 0x926c886b750, 21, 21, 1, 12288, 0xdb49886b
761, 58752, 58752, 1152, 418, 0x82cacdfd761, 58752, 58752, 1152, 418, 0x82cacdfd
771, 59904, 59904, 1152, 418, 0xf4dcc6ed771, 59904, 59904, 1152, 418, 0xf4dcc6ed
780, 22, 22, 1, 12288, 0x45ae8046780, 22, 22, 1, 12288, 0x95a08046
791, 61056, 61056, 1152, 418, 0x2cf3ca72791, 61056, 61056, 1152, 418, 0x2cf3ca72
801, 62208, 62208, 1152, 418, 0x5963c859801, 62208, 62208, 1152, 418, 0x5963c859
811, 63360, 63360, 1152, 418, 0xa667c53d811, 63360, 63360, 1152, 418, 0xa667c53d
820, 23, 23, 1, 12288, 0x926c886b820, 23, 23, 1, 12288, 0xdb49886b
831, 64512, 64512, 1152, 418, 0xb2f1d09c831, 64512, 64512, 1152, 418, 0xb2f1d09c
841, 65664, 65664, 1152, 418, 0x2ec1c8d3841, 65664, 65664, 1152, 418, 0x2ec1c8d3
850, 24, 24, 1, 12288, 0x926c886b850, 24, 24, 1, 12288, 0xdb49886b
861, 66816, 66816, 1152, 418, 0x5754d2e8861, 66816, 66816, 1152, 418, 0x5754d2e8
871, 67968, 67968, 1152, 418, 0x1956bdba871, 67968, 67968, 1152, 418, 0x1956bdba
880, 25, 25, 1, 12288, 0x926c886b880, 25, 25, 1, 12288, 0xdb49886b
891, 69120, 69120, 1152, 418, 0x3e18bd55891, 69120, 69120, 1152, 418, 0x3e18bd55
901, 70272, 70272, 1152, 418, 0xe4cfc339901, 70272, 70272, 1152, 418, 0xe4cfc339
911, 71424, 71424, 1152, 418, 0xb426c835911, 71424, 71424, 1152, 418, 0xb426c835
920, 26, 26, 1, 12288, 0x926c886b920, 26, 26, 1, 12288, 0xdb49886b
931, 72576, 72576, 1152, 418, 0xd7b6cbcf931, 72576, 72576, 1152, 418, 0xd7b6cbcf
941, 73728, 73728, 1152, 418, 0x340ec315941, 73728, 73728, 1152, 418, 0x340ec315
950, 27, 27, 1, 12288, 0x926c886b950, 27, 27, 1, 12288, 0xdb49886b
961, 74880, 74880, 1152, 418, 0x23a9baec961, 74880, 74880, 1152, 418, 0x23a9baec
971, 76032, 76032, 1152, 418, 0x9f04cd01971, 76032, 76032, 1152, 418, 0x9f04cd01
980, 28, 28, 1, 12288, 0x926c886b980, 28, 28, 1, 12288, 0xdb49886b
991, 77184, 77184, 1152, 418, 0xa80ec223991, 77184, 77184, 1152, 418, 0xa80ec223
1001, 78336, 78336, 1152, 418, 0x23d6bd5d1001, 78336, 78336, 1152, 418, 0x23d6bd5d
1011, 79488, 79488, 1152, 418, 0xcb25cf5b1011, 79488, 79488, 1152, 418, 0xcb25cf5b
1020, 29, 29, 1, 12288, 0x926c886b1020, 29, 29, 1, 12288, 0xdb49886b
1031, 80640, 80640, 1152, 418, 0xccccc2171031, 80640, 80640, 1152, 418, 0xccccc217
1041, 81792, 81792, 1152, 418, 0x757abbfe1041, 81792, 81792, 1152, 418, 0x757abbfe
1050, 30, 30, 1, 12288, 0x926c886b1050, 30, 30, 1, 12288, 0xdb49886b
1061, 82944, 82944, 1152, 418, 0xa2e6cc681061, 82944, 82944, 1152, 418, 0xa2e6cc68
1071, 84096, 84096, 1152, 418, 0xdf77cc051071, 84096, 84096, 1152, 418, 0xdf77cc05
1081, 85248, 85248, 1152, 417, 0xe9d2c5d51081, 85248, 85248, 1152, 417, 0xe9d2c5d5
1090, 31, 31, 1, 12288, 0x926c886b1090, 31, 31, 1, 12288, 0xdb49886b
1101, 86400, 86400, 1152, 418, 0x50dec1741101, 86400, 86400, 1152, 418, 0x50dec174
1111, 87552, 87552, 1152, 418, 0xf654b27e1111, 87552, 87552, 1152, 418, 0xf654b27e
1120, 32, 32, 1, 12288, 0x45ae80461120, 32, 32, 1, 12288, 0x95a08046
1131, 88704, 88704, 1152, 418, 0x4d8bc26e1131, 88704, 88704, 1152, 418, 0x4d8bc26e
1141, 89856, 89856, 1152, 418, 0xccd2bf371141, 89856, 89856, 1152, 418, 0xccd2bf37
1150, 33, 33, 1, 12288, 0x926c886b1150, 33, 33, 1, 12288, 0xdb49886b
1161, 91008, 91008, 1152, 418, 0x6ce2c18a1161, 91008, 91008, 1152, 418, 0x6ce2c18a
1171, 92160, 92160, 1152, 418, 0xb3cdcf0c1171, 92160, 92160, 1152, 418, 0xb3cdcf0c
1181, 93312, 93312, 1152, 418, 0x55eebe9a1181, 93312, 93312, 1152, 418, 0x55eebe9a
1190, 34, 34, 1, 12288, 0x45ae80461190, 34, 34, 1, 12288, 0x95a08046
1201, 94464, 94464, 1152, 418, 0x9031c9ec1201, 94464, 94464, 1152, 418, 0x9031c9ec
1211, 95616, 95616, 1152, 418, 0xb037c49d1211, 95616, 95616, 1152, 418, 0xb037c49d
1220, 35, 35, 1, 12288, 0x926c886b1220, 35, 35, 1, 12288, 0xdb49886b
1231, 96768, 96768, 1152, 418, 0x377bcc781231, 96768, 96768, 1152, 418, 0x377bcc78
1241, 97920, 97920, 1152, 418, 0x3762c7251241, 97920, 97920, 1152, 418, 0x3762c725
1251, 99072, 99072, 1152, 418, 0x39afbd4d1251, 99072, 99072, 1152, 418, 0x39afbd4d
1260, 36, 36, 1, 12288, 0x45ae80461260, 36, 36, 1, 12288, 0x95a08046
1271, 100224, 100224, 1152, 418, 0x655ed6cd1271, 100224, 100224, 1152, 418, 0x655ed6cd
1281, 101376, 101376, 1152, 418, 0x09aec2021281, 101376, 101376, 1152, 418, 0x09aec202
1290, 37, 37, 1, 12288, 0x926c886b1290, 37, 37, 1, 12288, 0xdb49886b
1301, 102528, 102528, 1152, 418, 0xf2d2ce551301, 102528, 102528, 1152, 418, 0xf2d2ce55
1311, 103680, 103680, 1152, 418, 0x254ebf041311, 103680, 103680, 1152, 418, 0x254ebf04
1320, 38, 38, 1, 12288, 0x45ae80461320, 38, 38, 1, 12288, 0x95a08046
1331, 104832, 104832, 1152, 418, 0xa105cdcc1331, 104832, 104832, 1152, 418, 0xa105cdcc
1341, 105984, 105984, 1152, 418, 0x1477ba581341, 105984, 105984, 1152, 418, 0x1477ba58
1351, 107136, 107136, 1152, 418, 0x8d0dcdb21351, 107136, 107136, 1152, 418, 0x8d0dcdb2
1360, 39, 39, 1, 3584, 0xba46c4351360, 39, 39, 1, 3584, 0x0354c435
1371, 108288, 108288, 1152, 418, 0x0d7cbef41371, 108288, 108288, 1152, 418, 0x0d7cbef4
1381, 109440, 109440, 1152, 294, 0x5e2b87c41381, 109440, 109440, 1152, 294, 0x5e2b87c4

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t