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
5603df39
Commit
5603df39
authored
Jan 31, 2011
by
Reimar Döffinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always use av_set_pts_info to set the stream time base.
parent
d947bce1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
16 deletions
+12
-16
c93.c
libavformat/c93.c
+1
-1
oggparsedirac.c
libavformat/oggparsedirac.c
+2
-3
oggparseflac.c
libavformat/oggparseflac.c
+1
-2
oggparseogm.c
libavformat/oggparseogm.c
+2
-3
oggparseskeleton.c
libavformat/oggparseskeleton.c
+3
-2
oggparsespeex.c
libavformat/oggparsespeex.c
+1
-2
oggparsetheora.c
libavformat/oggparsetheora.c
+1
-1
oggparsevorbis.c
libavformat/oggparsevorbis.c
+1
-2
No files found.
libavformat/c93.c
View file @
5603df39
...
...
@@ -89,7 +89,7 @@ static int read_header(AVFormatContext *s,
video
->
codec
->
height
=
192
;
/* 4:3 320x200 with 8 empty lines */
video
->
sample_aspect_ratio
=
(
AVRational
)
{
5
,
6
};
video
->
time_base
=
(
AVRational
)
{
2
,
25
}
;
av_set_pts_info
(
video
,
64
,
2
,
25
)
;
video
->
nb_frames
=
framecount
;
video
->
duration
=
framecount
;
video
->
start_time
=
0
;
...
...
libavformat/oggparsedirac.c
View file @
5603df39
...
...
@@ -42,7 +42,7 @@ static int dirac_header(AVFormatContext *s, int idx)
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
CODEC_ID_DIRAC
;
// dirac in ogg always stores timestamps as though the video were interlaced
st
->
time_base
=
(
AVRational
){
st
->
codec
->
time_base
.
num
,
2
*
st
->
codec
->
time_base
.
den
}
;
av_set_pts_info
(
st
,
64
,
st
->
codec
->
time_base
.
num
,
2
*
st
->
codec
->
time_base
.
den
)
;
return
1
;
}
...
...
@@ -79,8 +79,7 @@ static int old_dirac_header(AVFormatContext *s, int idx)
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
st
->
codec
->
codec_id
=
CODEC_ID_DIRAC
;
st
->
time_base
.
den
=
AV_RB32
(
buf
+
8
);
st
->
time_base
.
num
=
AV_RB32
(
buf
+
12
);
av_set_pts_info
(
st
,
64
,
AV_RB32
(
buf
+
12
),
AV_RB32
(
buf
+
8
));
return
1
;
}
...
...
libavformat/oggparseflac.c
View file @
5603df39
...
...
@@ -65,8 +65,7 @@ flac_header (AVFormatContext * s, int idx)
memcpy
(
st
->
codec
->
extradata
,
streaminfo_start
,
FLAC_STREAMINFO_SIZE
);
st
->
codec
->
extradata_size
=
FLAC_STREAMINFO_SIZE
;
st
->
time_base
.
num
=
1
;
st
->
time_base
.
den
=
st
->
codec
->
sample_rate
;
av_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
}
else
if
(
mdt
==
FLAC_METADATA_TYPE_VORBIS_COMMENT
)
{
ff_vorbis_comment
(
s
,
&
st
->
metadata
,
os
->
buf
+
os
->
pstart
+
4
,
os
->
psize
-
4
);
}
...
...
libavformat/oggparseogm.c
View file @
5603df39
...
...
@@ -83,14 +83,13 @@ ogm_header(AVFormatContext *s, int idx)
st
->
codec
->
height
=
bytestream_get_le32
(
&
p
);
st
->
codec
->
time_base
.
den
=
spu
*
10000000
;
st
->
codec
->
time_base
.
num
=
time_unit
;
st
->
time_base
=
st
->
codec
->
time_base
;
av_set_pts_info
(
st
,
64
,
st
->
codec
->
time_base
.
num
,
st
->
codec
->
time_base
.
den
)
;
}
else
{
st
->
codec
->
channels
=
bytestream_get_le16
(
&
p
);
p
+=
2
;
/* block_align */
st
->
codec
->
bit_rate
=
bytestream_get_le32
(
&
p
)
*
8
;
st
->
codec
->
sample_rate
=
spu
*
10000000
/
time_unit
;
st
->
time_base
.
num
=
1
;
st
->
time_base
.
den
=
st
->
codec
->
sample_rate
;
av_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
}
}
else
if
(
*
p
==
3
)
{
if
(
os
->
psize
>
8
)
...
...
libavformat/oggparseskeleton.c
View file @
5603df39
...
...
@@ -60,8 +60,9 @@ static int skeleton_header(AVFormatContext *s, int idx)
start_den
=
AV_RL64
(
buf
+
20
);
if
(
start_den
)
{
av_reduce
(
&
start_time
,
&
st
->
time_base
.
den
,
start_num
,
start_den
,
INT_MAX
);
st
->
time_base
.
num
=
1
;
int64_t
base_den
;
av_reduce
(
&
start_time
,
&
base_den
,
start_num
,
start_den
,
INT_MAX
);
av_set_pts_info
(
st
,
64
,
1
,
base_den
);
os
->
lastpts
=
st
->
start_time
=
start_time
;
}
...
...
libavformat/oggparsespeex.c
View file @
5603df39
...
...
@@ -72,8 +72,7 @@ static int speex_header(AVFormatContext *s, int idx) {
+
FF_INPUT_BUFFER_PADDING_SIZE
);
memcpy
(
st
->
codec
->
extradata
,
p
,
st
->
codec
->
extradata_size
);
st
->
time_base
.
num
=
1
;
st
->
time_base
.
den
=
st
->
codec
->
sample_rate
;
av_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
}
else
ff_vorbis_comment
(
s
,
&
st
->
metadata
,
p
,
os
->
psize
);
...
...
libavformat/oggparsetheora.c
View file @
5603df39
...
...
@@ -91,7 +91,7 @@ theora_header (AVFormatContext * s, int idx)
st
->
codec
->
time_base
.
num
=
1
;
st
->
codec
->
time_base
.
den
=
25
;
}
st
->
time_base
=
st
->
codec
->
time_base
;
av_set_pts_info
(
st
,
64
,
st
->
codec
->
time_base
.
num
,
st
->
codec
->
time_base
.
den
)
;
st
->
sample_aspect_ratio
.
num
=
get_bits_long
(
&
gb
,
24
);
st
->
sample_aspect_ratio
.
den
=
get_bits_long
(
&
gb
,
24
);
...
...
libavformat/oggparsevorbis.c
View file @
5603df39
...
...
@@ -252,8 +252,7 @@ vorbis_header (AVFormatContext * s, int idx)
if
(
srate
>
0
)
{
st
->
codec
->
sample_rate
=
srate
;
st
->
time_base
.
num
=
1
;
st
->
time_base
.
den
=
srate
;
av_set_pts_info
(
st
,
64
,
1
,
srate
);
}
}
else
if
(
os
->
buf
[
os
->
pstart
]
==
3
)
{
if
(
os
->
psize
>
8
&&
...
...
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