virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

cosmetics: msnwc_tcp: Reformat

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato
2015-11-01 04:07:44 +01:00
parent 4dfbc7a755
commit f8d10511fe
1 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavformat/msnwc_tcp.c
View File

@@ -40,25 +40,26 @@ static int msnwc_tcp_probe(AVProbeData *p)
{ {
int i; int i;
for(i = 0 ; i + HEADER_SIZE <= p->buf_size ; i++) { for (i = 0; i + HEADER_SIZE <= p->buf_size; i++) {
uint16_t width, height; uint16_t width, height;
uint32_t fourcc; uint32_t fourcc;
const uint8_t *bytestream = p->buf+i; const uint8_t *bytestream = p->buf + i;
if(bytestream_get_le16(&bytestream) != HEADER_SIZE) if (bytestream_get_le16(&bytestream) != HEADER_SIZE)
continue; continue;
width = bytestream_get_le16(&bytestream); width = bytestream_get_le16(&bytestream);
height = bytestream_get_le16(&bytestream); height = bytestream_get_le16(&bytestream);
if(!(width==320 && height==240) && !(width==160 && height==120)) if (!(width == 320 &&
height == 240) && !(width == 160 && height == 120))
continue; continue;
bytestream += 2; // keyframe bytestream += 2; // keyframe
bytestream += 4; // size bytestream += 4; // size
fourcc = bytestream_get_le32(&bytestream); fourcc = bytestream_get_le32(&bytestream);
if(fourcc != MKTAG('M', 'L', '2', '0')) if (fourcc != MKTAG('M', 'L', '2', '0'))
continue; continue;
if(i) { if (i) {
if(i < 14) /* starts with SwitchBoard connection info */ if (i < 14) /* starts with SwitchBoard connection info */
return AVPROBE_SCORE_MAX / 2; return AVPROBE_SCORE_MAX / 2;
else /* starts in the middle of stream */ else /* starts in the middle of stream */
return AVPROBE_SCORE_MAX / 3; return AVPROBE_SCORE_MAX / 3;
@@ -77,7 +78,7 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx)
AVStream *st; AVStream *st;
st = avformat_new_stream(ctx, NULL); st = avformat_new_stream(ctx, NULL);
if(!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
codec = st->codec; codec = st->codec;
@@ -89,9 +90,9 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx)
/* Some files start with "connected\r\n\r\n". /* Some files start with "connected\r\n\r\n".
* So skip until we find the first byte of struct size */ * So skip until we find the first byte of struct size */
while(avio_r8(pb) != HEADER_SIZE && !pb->eof_reached); while (avio_r8(pb) != HEADER_SIZE && !pb->eof_reached) ;
if(pb->eof_reached) { if (pb->eof_reached) {
av_log(ctx, AV_LOG_ERROR, "Could not find valid start."); av_log(ctx, AV_LOG_ERROR, "Could not find valid start.");
return -1; return -1;
} }
@@ -129,7 +130,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt)
/* Some aMsn generated videos (or was it Mercury Messenger?) don't set /* Some aMsn generated videos (or was it Mercury Messenger?) don't set
* this bit and rely on the codec to get keyframe information */ * this bit and rely on the codec to get keyframe information */
if(keyframe&1) if (keyframe & 1)
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
return HEADER_SIZE + size; return HEADER_SIZE + size;