Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(323)

Side by Side Diff: patched-ffmpeg-mt/libavformat/iv8.c

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2009 Michael Niedermayer 2 * Copyright (c) 2009 Michael Niedermayer
3 * 3 *
4 * This file is part of FFmpeg. 4 * This file is part of FFmpeg.
5 * 5 *
6 * FFmpeg is free software; you can redistribute it and/or 6 * FFmpeg is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Lesser General Public 7 * modify it under the terms of the GNU Lesser General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2.1 of the License, or (at your option) any later version. 9 * version 2.1 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 st->codec->codec_id = CODEC_ID_MPEG4; 48 st->codec->codec_id = CODEC_ID_MPEG4;
49 st->need_parsing = AVSTREAM_PARSE_FULL; 49 st->need_parsing = AVSTREAM_PARSE_FULL;
50 av_set_pts_info(st, 64, 1, 90000); 50 av_set_pts_info(st, 64, 1, 90000);
51 51
52 return 0; 52 return 0;
53 53
54 } 54 }
55 55
56 static int read_packet(AVFormatContext *s, AVPacket *pkt) 56 static int read_packet(AVFormatContext *s, AVPacket *pkt)
57 { 57 {
58 int ret, size, pts; 58 int ret, size, pts, type;
59 59 retry:
60 get_be16(s->pb); // 257 60 type= get_be16(s->pb); // 257 or 258
61 size= get_be16(s->pb); 61 size= get_be16(s->pb);
62 62
63 get_be16(s->pb); //some flags, 0x80 indicates end of frame 63 get_be16(s->pb); //some flags, 0x80 indicates end of frame
64 get_be16(s->pb); //packet number 64 get_be16(s->pb); //packet number
65 pts=get_be32(s->pb); 65 pts=get_be32(s->pb);
66 get_be32(s->pb); //6A 13 E3 88 66 get_be32(s->pb); //6A 13 E3 88
67 67
68 size -= 12; 68 size -= 12;
69 if(size<1) 69 if(size<1)
70 return -1; 70 return -1;
71 71
72 if(type==258){
73 url_fskip(s->pb, size);
74 goto retry;
75 }
76
72 ret= av_get_packet(s->pb, pkt, size); 77 ret= av_get_packet(s->pb, pkt, size);
73 78
74 pkt->pts= pkt->dts= pts; 79 pkt->pts= pts;
75 pkt->pos-=16; 80 pkt->pos-=16;
76 81
77 pkt->stream_index = 0; 82 pkt->stream_index = 0;
78 83
79 return ret; 84 return ret;
80 } 85 }
81 86
82 AVInputFormat iv8_demuxer = { 87 AVInputFormat iv8_demuxer = {
83 "iv8", 88 "iv8",
84 NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server") , 89 NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server") ,
85 0, 90 0,
86 probe, 91 probe,
87 read_header, 92 read_header,
88 read_packet, 93 read_packet,
89 .flags= AVFMT_GENERIC_INDEX, 94 .flags= AVFMT_GENERIC_INDEX,
90 .value = CODEC_ID_MPEG4, 95 .value = CODEC_ID_MPEG4,
91 }; 96 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698