diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:55:25 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:55:25 +0100 |
commit | 618817b6a8f29b4f24fd53c7bf916f070e182136 (patch) | |
tree | 88ba5b1677356cbcbe9870254448854dda6652c3 /libavformat/msnwc_tcp.c | |
parent | 2e82d51714c74a20bd5e3440836c16d608e3df7a (diff) | |
parent | f8d10511fef0bb3265f2d7bdfd38f90f60731d80 (diff) | |
download | ffmpeg-618817b6a8f29b4f24fd53c7bf916f070e182136.tar.gz |
Merge commit 'f8d10511fef0bb3265f2d7bdfd38f90f60731d80'
* commit 'f8d10511fef0bb3265f2d7bdfd38f90f60731d80':
cosmetics: msnwc_tcp: Reformat
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/msnwc_tcp.c')
-rw-r--r-- | libavformat/msnwc_tcp.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/libavformat/msnwc_tcp.c b/libavformat/msnwc_tcp.c index e79f9a8a45..4b2a1a2709 100644 --- a/libavformat/msnwc_tcp.c +++ b/libavformat/msnwc_tcp.c @@ -40,25 +40,26 @@ static int msnwc_tcp_probe(AVProbeData *p) { 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; 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; width = 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; bytestream += 2; // keyframe bytestream += 4; // size - fourcc = bytestream_get_le32(&bytestream); - if(fourcc != MKTAG('M', 'L', '2', '0')) + fourcc = bytestream_get_le32(&bytestream); + if (fourcc != MKTAG('M', 'L', '2', '0')) continue; - if(i) { - if(i < 14) /* starts with SwitchBoard connection info */ + if (i) { + if (i < 14) /* starts with SwitchBoard connection info */ return AVPROBE_SCORE_MAX / 2; else /* starts in the middle of stream */ return AVPROBE_SCORE_MAX / 3; @@ -77,19 +78,19 @@ static int msnwc_tcp_read_header(AVFormatContext *ctx) AVStream *st; st = avformat_new_stream(ctx, NULL); - if(!st) + if (!st) return AVERROR(ENOMEM); - codec = st->codec; + codec = st->codec; codec->codec_type = AVMEDIA_TYPE_VIDEO; - codec->codec_id = AV_CODEC_ID_MIMIC; - codec->codec_tag = MKTAG('M', 'L', '2', '0'); + codec->codec_id = AV_CODEC_ID_MIMIC; + codec->codec_tag = MKTAG('M', 'L', '2', '0'); avpriv_set_pts_info(st, 32, 1, 1000); /* Some files start with "connected\r\n\r\n". * So skip until we find the first byte of struct size */ - while(avio_r8(pb) != HEADER_SIZE && !avio_feof(pb)); + while(avio_r8(pb) != HEADER_SIZE && !avio_feof(pb)) ; if(avio_feof(pb)) { av_log(ctx, AV_LOG_ERROR, "Could not find valid start.\n"); @@ -110,7 +111,7 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt) avio_skip(pb, 2); avio_skip(pb, 2); keyframe = avio_rl16(pb); - size = avio_rl32(pb); + size = avio_rl32(pb); avio_skip(pb, 4); avio_skip(pb, 4); timestamp = avio_rl32(pb); @@ -123,22 +124,22 @@ static int msnwc_tcp_read_packet(AVFormatContext *ctx, AVPacket *pkt) avio_skip(pb, 1); /* Read ahead one byte of struct size like read_header */ - pkt->pts = timestamp; - pkt->dts = timestamp; + pkt->pts = timestamp; + pkt->dts = timestamp; pkt->stream_index = 0; /* Some aMsn generated videos (or was it Mercury Messenger?) don't set * this bit and rely on the codec to get keyframe information */ - if(keyframe&1) + if (keyframe & 1) pkt->flags |= AV_PKT_FLAG_KEY; return HEADER_SIZE + size; } AVInputFormat ff_msnwc_tcp_demuxer = { - .name = "msnwctcp", - .long_name = NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"), - .read_probe = msnwc_tcp_probe, - .read_header = msnwc_tcp_read_header, - .read_packet = msnwc_tcp_read_packet, + .name = "msnwctcp", + .long_name = NULL_IF_CONFIG_SMALL("MSN TCP Webcam stream"), + .read_probe = msnwc_tcp_probe, + .read_header = msnwc_tcp_read_header, + .read_packet = msnwc_tcp_read_packet, }; |