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
f13ea4e0
Commit
f13ea4e0
authored
Aug 09, 2007
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move lsb2full to common file
Originally committed as revision 10025 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
9031aeb1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
nut.c
libavformat/nut.c
+7
-0
nut.h
libavformat/nut.h
+1
-0
nutdec.c
libavformat/nutdec.c
+1
-7
No files found.
libavformat/nut.c
View file @
f13ea4e0
...
...
@@ -35,3 +35,10 @@ void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
AV_ROUND_DOWN
);
}
}
int64_t
ff_lsb2full
(
StreamContext
*
stream
,
int64_t
lsb
){
int64_t
mask
=
(
1
<<
stream
->
msb_pts_shift
)
-
1
;
int64_t
delta
=
stream
->
last_pts
-
mask
/
2
;
return
((
lsb
-
delta
)
&
mask
)
+
delta
;
}
libavformat/nut.h
View file @
f13ea4e0
...
...
@@ -94,5 +94,6 @@ typedef struct {
unsigned
long
av_crc04C11DB7_update
(
unsigned
long
checksum
,
const
uint8_t
*
buf
,
unsigned
int
len
);
void
ff_nut_reset_ts
(
NUTContext
*
nut
,
AVRational
time_base
,
int64_t
val
);
int64_t
ff_lsb2full
(
StreamContext
*
stream
,
int64_t
lsb
);
#endif
/* AVFORMAT_NUT_H */
libavformat/nutdec.c
View file @
f13ea4e0
...
...
@@ -155,12 +155,6 @@ static int64_t find_startcode(ByteIOContext *bc, uint64_t code, int64_t pos){
}
}
static
int64_t
lsb2full
(
StreamContext
*
stream
,
int64_t
lsb
){
int64_t
mask
=
(
1
<<
stream
->
msb_pts_shift
)
-
1
;
int64_t
delta
=
stream
->
last_pts
-
mask
/
2
;
return
((
lsb
-
delta
)
&
mask
)
+
delta
;
}
static
int
nut_probe
(
AVProbeData
*
p
){
int
i
;
uint64_t
code
=
0
;
...
...
@@ -655,7 +649,7 @@ static int decode_frame_header(NUTContext *nut, int64_t *pts, int *stream_id, in
int
coded_pts
=
get_v
(
bc
);
//FIXME check last_pts validity?
if
(
coded_pts
<
(
1
<<
stc
->
msb_pts_shift
)){
*
pts
=
lsb2full
(
stc
,
coded_pts
);
*
pts
=
ff_
lsb2full
(
stc
,
coded_pts
);
}
else
*
pts
=
coded_pts
-
(
1
<<
stc
->
msb_pts_shift
);
}
else
...
...
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