Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f8d10511
Commit
f8d10511
authored
Nov 01, 2015
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cosmetics: msnwc_tcp: Reformat
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
4dfbc7a7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
23 deletions
+24
-23
msnwc_tcp.c
libavformat/msnwc_tcp.c
+24
-23
No files found.
libavformat/msnwc_tcp.c
View file @
f8d10511
...
...
@@ -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,21 +78,21 @@ 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
&&
!
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."
);
return
-
1
;
}
...
...
@@ -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
,
};
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment